Merge pull request #57 from RatzzFatzz/dev

Fix execution on linux

.github/workflows/release.yml

@@ -20,11 +20,11 @@ jobs:
         with:
           timezoneLinux: "Europe/Berlin"
 
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v4.7.0
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 17
 
       - name: Setup workspace
         run: mkdir artifacts
@@ -41,6 +41,41 @@ jobs:
         with:
           args: 'artifacts/M*'
 
+  debian-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install mkvtoolnix
+        run: sudo apt-get install -y mkvtoolnix
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set timezone
+        uses: szenius/set-timezone@v2.0
+        with:
+          timezoneLinux: "Europe/Berlin"
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.7.0
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Setup workspace
+        run: mkdir artifacts
+
+      - name: Build with Maven
+        run: |
+          mvn clean package --file pom.xml -P linux
+          cp target/M*.deb artifacts/
+
+      - name: Upload artifacts
+        uses: skx/github-action-publish-binaries@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: 'artifacts/M*'
+
   windows-installer-build:
     runs-on: windows-latest
     steps:

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>

pom.xml

@@ -11,6 +11,11 @@
     <properties>
         <mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
 
+        <project.maintainer>RatzzFatzz</project.maintainer>
+        <project.maintainer.mail>github.contact@ratzloeffel.de</project.maintainer.mail>
+        <project.description>Command-line utility for batch-managing default audio and subtitle tracks in MKV files.</project.description>
+
+        <java-version>17</java-version>
         <lombok-version>1.18.36</lombok-version>
     </properties>
 
@@ -66,24 +71,70 @@
                     <plugin>
                         <artifactId>maven-resources-plugin</artifactId>
                         <version>3.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>copy-jpackage-input</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/jpackage-input</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.build.directory}</directory>
+                                            <includes>
+                                                <include>${project.artifactId}-${project.version}.jar</include>
+                                            </includes>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>filter-windows-installer-info</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/wix-resources</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.basedir}/src/wix/resources</directory>
+                                            <filtering>true</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
                     </plugin>
                     <plugin>
                         <groupId>org.panteleyev</groupId>
                         <artifactId>jpackage-maven-plugin</artifactId>
                         <version>1.6.5</version>
+                        <configuration>
+                            <name>${project.artifactId}</name>
+                            <vendor>RatzzFatzz</vendor>
+                            <appVersion>${project.version}</appVersion>
+
+                            <destination>target/installer</destination>
+
+                            <input>target/jpackage-input</input>
+                            <mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
+                            <mainJar>${project.artifactId}-${project.version}.jar</mainJar>
+
+                            <resourceDir>${project.build.directory}/wix-resources/</resourceDir>
+                            <type>EXE</type>
+                            <winConsole>true</winConsole>
+                            <winShortcut>false</winShortcut>
+                            <winMenu>false</winMenu>
+                            <javaOptions>
+                                <javaOption>-Dlog4j.configurationFile=log4j2-windows.yaml</javaOption>
+                            </javaOptions>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>windows</id>
-                                <configuration>
-                                    <resourceDir>${project.basedir}/src/main/resources/</resourceDir>
-                                    <type>EXE</type>
-                                    <winConsole>true</winConsole>
-                                    <winShortcut>false</winShortcut>
-                                    <winMenu>false</winMenu>
-                                    <javaOptions>
-                                        <javaOption>-Dlog4j.configurationFile=log4j2-installed.yaml</javaOption>
-                                    </javaOptions>
-                                </configuration>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>jpackage</goal>
@@ -97,25 +148,71 @@
         <profile>
             <id>linux</id>
             <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <includes>
+                            <include>log4j2-debian.yaml</include>
+                        </includes>
+                    </resource>
+                </resources>
                 <plugins>
                     <plugin>
-                        <groupId>org.panteleyev</groupId>
-                        <artifactId>jpackage-maven-plugin</artifactId>
-                        <version>1.4.0</version>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>3.3.1</version>
                         <executions>
                             <execution>
-                                <id>linux-deb</id>
-                                <configuration>
-                                    <type>DEB</type>
-                                    <installDir>/usr/local/bin</installDir>
-                                    <linuxShortcut>false</linuxShortcut>
-                                    <linuxPackageName>mkvasc</linuxPackageName>
-                                    <linuxDebMaintainer>your@email.com</linuxDebMaintainer>
-                                </configuration>
+                                <id>filter-linux-package-info</id>
                                 <phase>package</phase>
                                 <goals>
-                                    <goal>jpackage</goal>
+                                    <goal>copy-resources</goal>
                                 </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/debian-package-info</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.basedir}/src/deb</directory>
+                                            <filtering>true</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>jdeb</artifactId>
+                        <groupId>org.vafer</groupId>
+                        <version>1.13</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jdeb</goal>
+                                </goals>
+                                <configuration>
+                                    <dataSet>
+                                        <!-- JAR file -->
+                                        <data>
+                                            <src>${project.build.directory}/${project.build.finalName}.jar</src>
+                                            <type>file</type>
+                                            <mapper>
+                                                <type>perm</type>
+                                                <prefix>/usr/lib/${project.artifactId}</prefix>
+                                            </mapper>
+                                        </data>
+                                        <!-- Launcher script -->
+                                        <data>
+                                            <src>${project.build.directory}/debian-package-info/bin/mkvaudiosubtitlechanger</src>
+                                            <type>file</type>
+                                            <mapper>
+                                                <type>perm</type>
+                                                <prefix>/usr/bin</prefix>
+                                                <filemode>755</filemode>
+                                            </mapper>
+                                        </data>
+                                    </dataSet>
+                                    <controlDir>${project.build.directory}/debian-package-info/control</controlDir>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
@@ -197,8 +294,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <source>21</source>
-                    <target>21</target>
+                    <source>${java-version}</source>
+                    <target>${java-version}</target>
                     <compilerArgs>
                         <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
                     </compilerArgs>
@@ -218,51 +315,6 @@
             </plugin>
 
         </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.3.1</version>
-                    <executions>
-                        <execution>
-                            <id>copy-jpackage-input</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>copy-resources</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${project.build.directory}/jpackage-input</outputDirectory>
-                                <resources>
-                                    <resource>
-                                        <directory>${project.build.directory}</directory>
-                                        <includes>
-                                            <include>${project.artifactId}-${project.version}.jar</include>
-                                        </includes>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.panteleyev</groupId>
-                    <artifactId>jpackage-maven-plugin</artifactId>
-                    <version>1.4.0</version>
-                    <configuration>
-                        <name>${project.artifactId}</name>
-                        <vendor>RatzzFatzz</vendor>
-                        <appVersion>${project.version}</appVersion>
-
-                        <destination>target/installer</destination>
-
-                        <input>target/jpackage-input</input>
-                        <mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
-                        <mainJar>${project.artifactId}-${project.version}.jar</mainJar>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
     <repositories>

src/deb/bin/mkvaudiosubtitlechanger

@@ -0,0 +1 @@
+java -Dlog4j.configurationFile=log4j2-debian.yaml -jar /usr/lib/${project.artifactId}/${project.artifactId}-${project.version}.jar "$@"

src/deb/control/control

@@ -0,0 +1,8 @@
+Package: ${project.artifactId}
+Version: ${project.version}
+Section: misc
+Priority: optional
+Architecture: all
+Depends: java-runtime (>=${java-version}), mkvtoolnix
+Maintainer: ${project.maintainer} <${project.maintainer.mail}>
+Description: ${project.description}

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

@@ -0,0 +1,34 @@
+Configuration:
+  name: DefaultLogger
+  Appenders:
+    RollingFile:
+      name: FileAppender
+      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:
+        level: info
+      Policies:
+        OnStartupTriggeringPolicy:
+          minSize: 0
+      DefaultRolloverStrategy:
+        max: 30
+        Delete:
+          basePath: archive
+          maxDepth: 1
+          IfLastModified:
+            age: 30d
+          IfAccumulatedFileSize:
+            exceeds: 1GB
+
+  Loggers:
+    Root:
+      level: info
+      AppenderRef:
+        - ref: FileAppender
+    Logger:
+      name: "com.zaxxer.hikari.HikariConfig"
+      level: info
+      AppenderRef:
+        - ref: FileAppender

src/wix/resources/main.wxs

@@ -24,12 +24,12 @@
   <?endif?>
 
   <?define JpProductCode="*"?>
-  <?define JpAppName="MKVAudioSubtitleChanger"?>
-  <?define JpAppVersion="4.0.0"?>
-  <?define JpAppVendor="RatzzFatzz"?>
+  <?define JpAppName="${project.artifactId}"?>
+  <?define JpAppVersion="${project.version}"?>
+  <?define JpAppVendor="${project.maintainer}"?>
   <?define JpProductUpgradeCode="a9527300-d364-4cc3-a392-94035065d8c9"?>
-  <?define JpAppDescription="Change audio and subtitle tracks for .mkv files"?>
-  <?define JpHelpURL="github.com/RatzzFatzz"?>
+  <?define JpAppDescription="${project.description}"?>
+  <?define JpHelpURL="github.com/${project.maintainer}/${project.artifactId}"?>
 
   <Product
     Id="$(var.JpProductCode)"