Restructure files & remove unused code & simplify few statements

This commit is contained in:
2022-03-23 21:02:28 +01:00
parent 1df06e8a08
commit a1e9031cbc
7 changed files with 46 additions and 66 deletions

View File

@@ -1,43 +1,17 @@
package at.pcgamingfreaks.mkvaudiosubtitlechanger;
import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ConfigUtil;
import at.pcgamingfreaks.yaml.YAML;
import at.pcgamingfreaks.yaml.YamlInvalidContentException;
import at.pcgamingfreaks.yaml.YamlKeyNotFoundException;
import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.cli.*;
import java.io.File;
import java.io.IOException;
import static java.lang.Integer.parseInt;
@Log4j2
public class Main {
public static void main(String[] args) {
System.out.println(String.join(", ", args));
initConfig(args);
AttributeUpdaterKernel kernel = new AttributeUpdaterKernel();
kernel.execute(ConfigUtil.getInstance().getLibraryPath());
}
private static boolean checkIfMKVToolNixIsValid() {
try {
String path = new YAML(new File("config.yaml")).getString("mkvtoolnixPath");
if (!path.endsWith(File.separator)) {
path += File.separator;
}
if (System.getProperty("os.name").toLowerCase().contains("windows")) {
MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge.exe");
MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvpropedit.exe");
} else {
MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge");
MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvpropedit");
}
} catch (YamlKeyNotFoundException | IOException | YamlInvalidContentException e) {
e.printStackTrace();
}
return new File(MKVToolProperties.getInstance().getMkvmergePath()).isFile() && new File(MKVToolProperties.getInstance().getMkvpropeditPath()).isFile();
kernel.execute();
}
private static void initConfig(String[] args) {
@@ -53,12 +27,17 @@ public class Main {
try {
CommandLine cmd = parser.parse(options, args);
ConfigUtil configUtil = ConfigUtil.getInstance();
configUtil.loadConfig(cmd.getOptionValue("config", "config.yaml")); // use cmd input
configUtil.setLibraryPath(cmd.getOptionValue("library"));
if (cmd.hasOption("threads")) configUtil.setThreadCount(parseInt(cmd.getOptionValue("threads")));
configUtil.setSafeMode(cmd.hasOption("safe-mode"));
configUtil.isValid();
if (cmd.hasOption("help")) {
formatter.printHelp("java -jar MKVAudioSubtitlesChanger.jar -p <path_to_library>", options);
System.exit(0);
}
Config config = Config.getInstance();
config.loadConfig(cmd.getOptionValue("config", "config.yaml")); // use cmd input
config.setLibraryPath(cmd.getOptionValue("library"));
if (cmd.hasOption("threads")) config.setThreadCount(parseInt(cmd.getOptionValue("threads")));
config.setSafeMode(cmd.hasOption("safe-mode"));
config.isValid();
} catch (ParseException e) {
log.error(e);
formatter.printHelp("java -jar MKVAudioSubtitlesChanger.jar -p <path_to_library>", options);