Fashionscape/discord-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #49 from Fashionscape/dev

Browse Source 
Dev
This commit is contained in:
Aleksei Gryczewski 2021-06-09 22:34:30 -04:00 committed by GitHub
commit d3c63e2150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -9,4 +9,5 @@ docker:
docker build -t ${BUILD} . docker build -t ${BUILD} .
docker tag ${BUILD} ${LATEST} docker tag ${BUILD} ${LATEST}
docker push ${BUILD} docker push ${BUILD}
docker push ${LATEST} docker push ${LATEST}

4
src/main/java/dev/salmonllama/fsbot/Main.java
View File

@ -17,14 +17,14 @@ import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication @SpringBootApplication
public class Main { public class Main {
private final static Logger logger = LoggerFactory.getLogger(Main.class); private final static Logger logger = LoggerFactory.getLogger(Main.class);
public static void main(String[] args) { public static void main(String[] args) {
String configLocation = Constants.BOT_FOLDER.concat(Constants.CONFIG_NAME); BotConfig.initConfig(Constants.BOT_FOLDER, false);
BotConfig.initConfig(configLocation, false);
FSDB.init(); FSDB.init();

7
src/main/java/dev/salmonllama/fsbot/config/BotConfig.java
View File

@ -8,8 +8,11 @@ package dev.salmonllama.fsbot.config;
import com.kaaz.configuration.ConfigurationBuilder; import com.kaaz.configuration.ConfigurationBuilder;
import com.kaaz.configuration.ConfigurationOption; import com.kaaz.configuration.ConfigurationOption;
import dev.salmonllama.fsbot.utilities.Constants;
import java.io.File; import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
public class BotConfig { public class BotConfig {
@ConfigurationOption @ConfigurationOption
@ -78,9 +81,9 @@ public class BotConfig {
@ConfigurationOption @ConfigurationOption
public static String HOME_SERVER = "Home server here"; public static String HOME_SERVER = "Home server here";
public static void initConfig(String filePath, boolean cleanfile) { public static void initConfig(Path filePath, boolean cleanfile) {
try { try {
new ConfigurationBuilder(BotConfig.class, new File(filePath)).build(cleanfile); new ConfigurationBuilder(BotConfig.class, Paths.get(filePath.toString(), Constants.CONFIG_NAME) .toFile()).build(cleanfile);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
System.exit(1); System.exit(1);

2
src/main/java/dev/salmonllama/fsbot/database/DatabaseProvider.java
View File

@ -20,7 +20,7 @@ public class DatabaseProvider {
public DatabaseProvider(String dbName) { public DatabaseProvider(String dbName) {
DB_NAME = dbName; DB_NAME = dbName;
DB_ADDR = "jdbc:sqlite:".concat(Constants.BOT_FOLDER).concat(BotConfig.DB_ADDR); DB_ADDR = "jdbc:sqlite:".concat(Constants.BOT_FOLDER.toString()).concat(BotConfig.DB_ADDR);
} }
private Connection createConnection() { private Connection createConnection() {

7
src/main/java/dev/salmonllama/fsbot/utilities/Constants.java
View File

@ -5,11 +5,14 @@
package dev.salmonllama.fsbot.utilities; package dev.salmonllama.fsbot.utilities;
public class Constants { import java.nio.file.Path;
public static final String BOT_FOLDER = System.getenv("HOME").concat("/.fsbot/"); import java.nio.file.Paths;
public class Constants {
public static final String CONFIG_NAME = "bot.config"; public static final String CONFIG_NAME = "bot.config";
public static final Path BOT_FOLDER = Paths.get(System.getProperty("user.home"), ".fsbot");
public static final String DB_NAME = "fsbot"; public static final String DB_NAME = "fsbot";
public static final String OUTFIT_TABLE = "outfits"; public static final String OUTFIT_TABLE = "outfits";