Michael/MKVAudioSubtitleChanger
1
0
Fork 0
mirror of https://github.com/RatzzFatzz/MKVAudioSubtitleChanger.git synced 2026-02-12 02:25:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restructure files & remove unused code & simplify few statements

Browse Source
This commit is contained in:
Michael Ratz
2022-03-23 21:02:28 +01:00
parent 1df06e8a08
commit a1e9031cbc
7 changed files with 46 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java
View File

@@ -1,102 +0,0 @@
package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.AttributeConfig;
import at.pcgamingfreaks.yaml.YAML;
import at.pcgamingfreaks.yaml.YamlInvalidContentException;
import at.pcgamingfreaks.yaml.YamlKeyNotFoundException;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.log4j.Log4j2;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
@Log4j2
@Getter
@Setter
public class ConfigUtil {
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
private static ConfigUtil configUtil = null;
private List<AttributeConfig> attributeConfig;
private int threadCount;
@Getter(AccessLevel.NONE)
private String mkvtoolnixPath;
private String libraryPath;
private boolean isSafeMode;
public static ConfigUtil getInstance() {
if(configUtil == null) {
configUtil = new ConfigUtil();
}
return configUtil;
}
public void isValid() throws RuntimeException{
System.out.println(attributeConfig);
System.out.println(threadCount);
System.out.println(mkvtoolnixPath);
System.out.println(libraryPath);
if (attributeConfig != null && !attributeConfig.isEmpty()
&& threadCount > 0 && !mkvtoolnixPath.isEmpty()
&& new File(getPathFor(MkvToolNix.MKV_MERGER)).isFile()
&& new File(getPathFor(MkvToolNix.MKV_PROP_EDIT)).isFile()) {
return;
}
throw new RuntimeException("Invalid configuration");
}
public void loadConfig(String configPath) {
try(YAML config = new YAML(new File(configPath))){
setAttributeConfig(loadAttributeConfig(config));
setThreadCount(loadThreadCount(config));
setMkvtoolnixPath(loadMkvToolNixPath(config));
}catch(YamlInvalidContentException | YamlKeyNotFoundException | IOException e){
log.fatal("Config could not be loaded: {}", e.getMessage());
}
}
private List<AttributeConfig> loadAttributeConfig(YAML config) {
return config.getKeysFiltered(".*audio.*").stream()
.sorted()
.map(elem -> elem.replace(".audio", ""))
.map(elem -> createAttributeConfig(elem, config))
.collect(Collectors.toList());
}
private AttributeConfig createAttributeConfig(String key, YAML config) {
try{
return new AttributeConfig(
config.getStringList(key + ".audio"),
config.getStringList(key + ".subtitle"));
}catch(YamlKeyNotFoundException e){
e.printStackTrace();
return null;
}
}
private int loadThreadCount(YAML config) throws YamlKeyNotFoundException{
return config.isSet("threadCount")
? Integer.parseInt(config.getString("threadCount"))
: 1;
}
private String loadMkvToolNixPath(YAML config) throws YamlKeyNotFoundException {
return config.isSet("mkvtoolnixPath") ? config.getString("mkvtoolnixPath") : defaultMkvToolNixPath();
}
private String defaultMkvToolNixPath() {
return System.getProperty("os.name").toLowerCase().contains("windows")
? "C:/Program Files/MKVToolNix/"
: "/usr/bin/";
}
public String getPathFor(MkvToolNix exe) {
return mkvtoolnixPath.endsWith("/") ? mkvtoolnixPath + exe : mkvtoolnixPath + "/" + exe;
}
}

17
src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/MkvToolNix.java
View File

@@ -1,17 +0,0 @@
package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
public enum MkvToolNix {
MKV_MERGER("mkvmerge.exe"),
MKV_PROP_EDIT("mkvpropedit.exe");
private final String file;
MkvToolNix(String file) {
this.file = file;
}
@Override
public String toString() {
return file;
}
}