Merge pull request #57 from RatzzFatzz/dev

Fix execution on linux

.github/workflows/release.yml

@@ -92,11 +92,11 @@ jobs:
         with:
           timezoneWindows: "Berlin Standard Time"
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4.7.0
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Setup workspace
         run: mkdir artifacts

config-template.yaml

@@ -1,34 +0,0 @@
-mkvtoolnix: C:\Program Files\MKVToolNix
-library: X:/Files
-
-attribute-config:
-  1:
-    audio: ger
-    subtitle: OFF
-  2:
-    audio: eng
-    subtitle: ger
-
-# Recommendations for data stored on HDDs, increase when using SSDs
-#threads: 2
-
-#forced-keywords: ["forced", "signs"]
-#commentary-keywords: ["commentary", "director"]
-#preferred-subtitles: ["unstyled"]
-
-#exclude-directories:
-#  - "D:/Path/To/File.mkv"
-#  - "D:/Path/To/Directory"
-
-# If pattern is negated, can be used to exclude files
-#include-pattern: "regex"
-
-# Only files newer than
-#filter-date: 20.03.2021-10:11:12
-
-safe-mode:
-#coherent:
-#force-coherent:
-#only-new-files:
-
-

maven/assembly.xml

@@ -14,10 +14,6 @@
             <destName>${project.artifactId}.jar</destName>
             <outputDirectory>/</outputDirectory>
         </file>
-        <file>
-            <source>${project.basedir}/config-template.yaml</source>
-            <outputDirectory>/</outputDirectory>
-        </file>
         <file>
             <source></source>
         </file>

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java

@@ -39,16 +39,17 @@ public class MkvFileProcessor implements FileProcessor {
         Map<String, Object> jsonMap;
         List<FileAttribute> 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<Map<String, Object>> tracks = (List<Map<String, Object>>) 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()));
                 }
             }
@@ -184,7 +185,7 @@ public class MkvFileProcessor implements FileProcessor {
             }
         }
 
-        log.info(sb.toString());
+        log.debug(sb.toString());
         InputStream inputstream = Runtime.getRuntime().exec(sb.toString()).getInputStream();
         String output = IOUtils.toString(new InputStreamReader(inputstream));
         log.debug(output);

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/kernel/AttributeUpdaterKernel.java

@@ -19,7 +19,6 @@ import me.tongfei.progressbar.ProgressBar;
 import me.tongfei.progressbar.ProgressBarBuilder;
 import me.tongfei.progressbar.ProgressBarStyle;
 import net.harawata.appdirs.AppDirsFactory;
-import picocli.CommandLine;
 
 import java.io.File;
 import java.io.IOException;
@@ -100,6 +99,12 @@ public abstract class AttributeUpdaterKernel {
         FileInfoDto fileInfo = new FileInfoDto(file);
         List<FileAttribute> attributes = processor.loadAttributes(file);
 
+        if (attributes == null || attributes.isEmpty()) {
+            statistic.total();
+            statistic.failure();
+            return;
+        }
+
         List<FileAttribute> nonForcedTracks = processor.retrieveNonForcedTracks(attributes);
         List<FileAttribute> nonCommentaryTracks = processor.retrieveNonCommentaryTracks(attributes);
 
@@ -122,7 +127,7 @@ public abstract class AttributeUpdaterKernel {
                 statistic.shouldChange();
                 commitChange(fileInfoDto);
                 break;
-            case UNABLE_TO_APPLY:
+            case NO_SUITABLE_CONFIG:
                 statistic.noSuitableConfigFound();
                 break;
             case ALREADY_SUITED:

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java

@@ -40,8 +40,9 @@ public class FileInfoDto {
     }
 
     private boolean isSubtitleOFF() {
-        return desiredDefaultSubtitleLane == null && "OFF".equals(matchedConfig.getSubtitleLanguage()) &&
-                (existingDefaultSubtitleLanes != null && !existingDefaultSubtitleLanes.isEmpty());
+        return desiredDefaultSubtitleLane == null
+                && (matchedConfig != null && "OFF".equals(matchedConfig.getSubtitleLanguage()))
+                && (existingDefaultSubtitleLanes != null && !existingDefaultSubtitleLanes.isEmpty());
     }
 
     public boolean areForcedTracksDifferent() {
@@ -50,7 +51,7 @@ public class FileInfoDto {
 
     public FileStatus getStatus() {
         if (isChangeNecessary()) return FileStatus.CHANGE_NECESSARY;
-        if (isUnableToApplyConfig()) return FileStatus.UNABLE_TO_APPLY;
+        if (isUnableToApplyConfig()) return FileStatus.NO_SUITABLE_CONFIG;
         if (isAlreadySuitable()) return FileStatus.ALREADY_SUITED;
         return FileStatus.UNKNOWN;
     }

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileStatus.java

@@ -2,7 +2,7 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
 public enum FileStatus {
     CHANGE_NECESSARY,
-    UNABLE_TO_APPLY,
+    NO_SUITABLE_CONFIG,
     ALREADY_SUITED,
     UNKNOWN;
 }

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: