[FIX] jar

This commit is contained in:
RatzzFatzz
2020-05-10 19:36:21 +02:00
parent 0da07297ea
commit 401840e554
10 changed files with 18 additions and 29 deletions

View File

@@ -40,7 +40,7 @@
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>
<Main-Class>Main</Main-Class> <Main-Class>at/pcgamingfreaks/mkvaudiosubtitlechanger/Main</Main-Class>
</manifestEntries> </manifestEntries>
</archive> </archive>
</configuration> </configuration>

View File

@@ -1,16 +0,0 @@
import at.pcgamingfreaks.mkvaudiosubtitlechanger.AttributeUpdaterKernel;
import lombok.extern.log4j.Log4j2;
@Log4j2
public class Main {
public static void main(String[] args) {
// MKVToolProperties.getInstance().defineMKVToolNixPath();
// GUI gui = new GUI();
AttributeUpdaterKernel kernel = new AttributeUpdaterKernel();
kernel.execute();
}
}

View File

@@ -1,4 +1,4 @@
package config; package at.pcgamingfreaks.mkvaudiosubtitlechanger;
import lombok.Getter; import lombok.Getter;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;

View File

@@ -1,7 +1,5 @@
package at.pcgamingfreaks.mkvaudiosubtitlechanger; package at.pcgamingfreaks.mkvaudiosubtitlechanger;
import config.MKVToolProperties;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
MKVToolProperties.getInstance().defineMKVToolNixPath(); MKVToolProperties.getInstance().defineMKVToolNixPath();

View File

@@ -1,7 +1,7 @@
package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties;
import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
import config.MKVToolProperties;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
@@ -13,8 +13,8 @@ import java.util.List;
@Log4j2 @Log4j2
public class ConfigProcessor { public class ConfigProcessor {
private int audioDefault = 0; private int audioDefault = - 1;
private int subtitleDefault = 0; private int subtitleDefault = - 1;
private final AttributeConfig config; private final AttributeConfig config;
public ConfigProcessor(AttributeConfig config) { public ConfigProcessor(AttributeConfig config) {
@@ -87,8 +87,12 @@ public class ConfigProcessor {
StringBuilder stringBuffer = new StringBuilder("\""); StringBuilder stringBuffer = new StringBuilder("\"");
stringBuffer.append(MKVToolProperties.getInstance().getMkvpropeditPath()); stringBuffer.append(MKVToolProperties.getInstance().getMkvpropeditPath());
stringBuffer.append("\" \"").append(file.getAbsolutePath()).append("\" "); stringBuffer.append("\" \"").append(file.getAbsolutePath()).append("\" ");
stringBuffer.append("--edit track:=").append(subtitleDefault).append(" --set flag-default=0 "); if(audioDefault != - 1){
stringBuffer.append("--edit track:=").append(audioDefault).append(" --set flag-default=0 "); stringBuffer.append("--edit track:=").append(audioDefault).append(" --set flag-default=0 ");
}
if(subtitleDefault != - 1){
stringBuffer.append("--edit track:=").append(subtitleDefault).append(" --set flag-default=0 ");
}
collectLines(attributes, transfer); collectLines(attributes, transfer);
if(transfer.isValid){ if(transfer.isValid){
if(transfer.isAudioOn){ if(transfer.isAudioOn){

View File

@@ -1,8 +1,8 @@
package at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl; package at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl;
import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties;
import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import config.MKVToolProperties;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import java.io.File; import java.io.File;
@@ -56,6 +56,8 @@ public class MkvFileCollector implements FileCollector {
public List<FileAttribute> loadAttributes(File file) { public List<FileAttribute> loadAttributes(File file) {
Map<String, Object> jsonMap; Map<String, Object> jsonMap;
List<FileAttribute> fileAttributes = new ArrayList<>(); List<FileAttribute> fileAttributes = new ArrayList<>();
System.out.println("\"" + MKVToolProperties.getInstance().getMkvmergePath()
+ "\" --identify --identification-format json \"" + file.getAbsolutePath() + "\"");
try(InputStream inputStream = try(InputStream inputStream =
Runtime.getRuntime().exec("\"" + MKVToolProperties.getInstance().getMkvmergePath() Runtime.getRuntime().exec("\"" + MKVToolProperties.getInstance().getMkvmergePath()
+ "\" --identify --identification-format json \"" + file.getAbsolutePath() + "\"").getInputStream()){ + "\" --identify --identification-format json \"" + file.getAbsolutePath() + "\"").getInputStream()){

View File

@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
@Log4j2 @Log4j2
public class ConfigUtil { public class ConfigUtil {
public static List<AttributeConfig> loadConfig() { public static List<AttributeConfig> loadConfig() {
try(YAML yaml = new YAML(new File("./src/main/resources/config.yaml"))){ try(YAML yaml = new YAML(new File("config.yaml"))){
return yaml.getKeysFiltered(".*audio.*").stream() return yaml.getKeysFiltered(".*audio.*").stream()
.sorted() .sorted()
.map(elem -> elem.replace(".audio", "")) .map(elem -> elem.replace(".audio", ""))

View File

@@ -1,10 +1,10 @@
package query; package query;
import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties;
import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
import at.pcgamingfreaks.yaml.YAML; import at.pcgamingfreaks.yaml.YAML;
import at.pcgamingfreaks.yaml.YamlInvalidContentException; import at.pcgamingfreaks.yaml.YamlInvalidContentException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import config.MKVToolProperties;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import java.io.File; import java.io.File;
@@ -21,7 +21,7 @@ import java.util.stream.Stream;
@Log4j2 @Log4j2
public class QueryBuilder { public class QueryBuilder {
private ObjectMapper mapper = new ObjectMapper(); private final ObjectMapper mapper = new ObjectMapper();
public QueryBuilder() { public QueryBuilder() {
} }

View File

@@ -1,5 +1,6 @@
package config; package config;
import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;