diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java index da0109a..ce3d624 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java @@ -39,16 +39,17 @@ public class MkvFileProcessor implements FileProcessor { Map jsonMap; List fileAttributes = new ArrayList<>(); try { - String command = format("\"%s\"", Config.getInstance().getPathFor(MkvToolNix.MKV_MERGE)); - String[] arguments = new String[]{ - command, + String[] command = new String[]{ + Config.getInstance().getPathFor(MkvToolNix.MKV_MERGE), "--identify", "--identification-format", "json", - file.getAbsoluteFile().toString() + file.getAbsolutePath() }; - InputStream inputStream = Runtime.getRuntime().exec(arguments).getInputStream(); + log.debug("{}", String.join(" ", command)); + InputStream inputStream = Runtime.getRuntime().exec(command) + .getInputStream(); jsonMap = mapper.readValue(inputStream, Map.class); List> tracks = (List>) jsonMap.get("tracks"); if (tracks == null) { @@ -154,7 +155,7 @@ public class MkvFileProcessor implements FileProcessor { if (fileInfo.isAudioDifferent()) { if (fileInfo.getExistingDefaultAudioLanes() != null && !fileInfo.getExistingDefaultAudioLanes().isEmpty()) { - for (FileAttribute track: fileInfo.getExistingDefaultAudioLanes()) { + for (FileAttribute track : fileInfo.getExistingDefaultAudioLanes()) { sb.append(format(DISABLE_DEFAULT_TRACK, track.getId())); } } @@ -162,14 +163,14 @@ public class MkvFileProcessor implements FileProcessor { } if (!fileInfo.getExistingForcedAudioLanes().isEmpty()) { - for (FileAttribute track: fileInfo.getExistingForcedAudioLanes()) { + for (FileAttribute track : fileInfo.getExistingForcedAudioLanes()) { sb.append(format(DISABLE_FORCED_TRACK, track.getId())); } } if (fileInfo.isSubtitleDifferent()) { if (fileInfo.getExistingDefaultSubtitleLanes() != null && !fileInfo.getExistingDefaultSubtitleLanes().isEmpty()) { - for (FileAttribute track: fileInfo.getExistingDefaultSubtitleLanes()) { + for (FileAttribute track : fileInfo.getExistingDefaultSubtitleLanes()) { sb.append(format(DISABLE_DEFAULT_TRACK, track.getId())); } } diff --git a/src/main/resources/log4j2-debian.yaml b/src/main/resources/log4j2-debian.yaml index a57c2be..b589ec0 100644 --- a/src/main/resources/log4j2-debian.yaml +++ b/src/main/resources/log4j2-debian.yaml @@ -3,8 +3,8 @@ Configuration: Appenders: RollingFile: name: FileAppender - fileName: /var/log/MKVAudioSubtitleChanger/application.log - filePattern: /var/log/MKVAudioSubtitleChanger/archive/application-%d{yyyy-MM-dd}-%i.log.gz + fileName: ${sys:user.home}/.local/mkvaudiosubtitlechanger/logs/application.log + filePattern: ${sys:user.home}/.local/mkvaudiosubtitlechanger/logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz PatternLayout: Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable" ThresholdFilter: