17 Commits

Author SHA1 Message Date
Michael
7dd01234b6 Merge pull request #57 from RatzzFatzz/dev
Fix execution on linux
2025-02-18 19:23:08 +01:00
RatzzFatzz
8f38abcf3a Fix execution on linux 2025-02-18 19:15:02 +01:00
Michael
fc4e80ead0 Merge pull request #55 from RatzzFatzz/dev
Release v4.0
2025-02-06 22:27:06 +01:00
RatzzFatzz
e81b06f6fa Improve logging 2025-02-06 00:18:49 +01:00
RatzzFatzz
dc770c9325 Fix file count if no info was found 2025-02-06 00:00:28 +01:00
RatzzFatzz
471255a09b Fix windows installer build 2025-02-05 23:32:01 +01:00
RatzzFatzz
9c8315aec7 Remove config-template 2025-02-05 23:13:54 +01:00
RatzzFatzz
c33777b038 Add debian build to github action 2025-02-05 23:02:40 +01:00
RatzzFatzz
6c08ce69ea Fix logging for debian build 2025-02-05 22:59:38 +01:00
RatzzFatzz
7f8c14e3a9 Use maven properties for wix installer vars 2025-02-05 16:00:01 +01:00
RatzzFatzz
553c672e4d Implement debian package build 2025-02-05 15:49:46 +01:00
RatzzFatzz
d98c4cd49e Handle empty input 2025-02-04 17:57:34 +01:00
RatzzFatzz
21f244ff3f Update logging config 2025-02-04 17:48:45 +01:00
RatzzFatzz
ffac36ac27 Update example gif 2025-02-04 14:45:57 +01:00
RatzzFatzz
0813744148 Update README.md 2025-02-04 13:56:29 +01:00
RatzzFatzz
44d2601d3e Update config parameters and descriptions 2025-02-04 13:49:19 +01:00
Michael
a075dfb27c Remove forced audio tracks & minor refactoring 2024-05-27 22:31:34 +02:00
21 changed files with 334 additions and 194 deletions

View File

@@ -20,11 +20,11 @@ jobs:
with: with:
timezoneLinux: "Europe/Berlin" timezoneLinux: "Europe/Berlin"
- name: Set up JDK 21 - name: Set up JDK 17
uses: actions/setup-java@v4.7.0 uses: actions/setup-java@v4.7.0
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version: 17
- name: Setup workspace - name: Setup workspace
run: mkdir artifacts run: mkdir artifacts
@@ -41,6 +41,41 @@ jobs:
with: with:
args: 'artifacts/M*' 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: windows-installer-build:
runs-on: windows-latest runs-on: windows-latest
steps: steps:

View File

@@ -1,49 +1,62 @@
## Introduction ## Introduction
This program helps to change audio and subtitle tracks of mkv files without rewriting the file. Only track properties will be updated. A streamlined solution for managing MKV files, this program leverages MKVToolNix to modify audio and subtitle track properties without the need for time-consuming file reencoding. Users can easily set their track preferences, and the application intelligently applies the best matching configuration. The tool focuses on metadata modification rather than full file rewriting, ensuring quick operations while maintaining the original file integrity. This makes it an ideal choice for managing multilingual media collections or batch processing multiple MKV files.
![](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/blob/master/example.gif) ![](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/blob/master/example.gif)
## Requirements ## Requirements
- Java 11 or higher - Java 21 or newer
- mkvtoolnix installation - mkvtoolnix installation
## Execution ## Execution
**Minimal usage:** ### Minimal usage
`java -jar mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF` Portable: `java -jar mkvaudiosubtitlechanger-<version>.jar --library "X:/Files" --attribute-config eng:ger eng:OFF`
**Safe usage (best for testing before applying to whole library):** Windows (installed): `mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF`
`java -jar mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF --safe-mode`
Attribute-config must be entered in pairs: `audio:subtitle`; Example: `jpn:eng`. More about this topic ### Safe usage (best for testing before applying to whole library)
[here](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Attribute-Config). Portable: `java -jar mkvaudiosubtitlechanger-<version>.jar --library "X:/Files" --attribute-config eng:ger eng:OFF --safe-mode`
Windows (installed): `mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF --safe-mode`
**Attribute-config must be entered in pairs: `audio:subtitle`; Example: `jpn:eng`. More about this topic
[here](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Attribute-Config).**
## Available parameters ## Available parameters
``` ```
-l,--library-path <arg> Path to library -a, --attribute-config=<attributeConfig>...
-a,--attribute-config <arg> Attribute config to decide which tracks to choose when List of audio:subtitle pairs used to match in order and update files accordingly (e.g. jpn:eng jpn:ger)
-p,--config-path <arg> Path to config file -c, --coherent=<coherent> try to match all files in dir of depth with the same attribute config
-m,--mkvtoolnix <arg> Path to mkv tool nix installation -cf, --force-coherent changes are only applied if it's a coherent match
-s,--safe-mode Test run (no files will be changes) --commentary-keywords=<commentaryKeywords>[, <commentaryKeywords>...]...
-c,--coherent <arg> Try to match all files in dir of depth with the same config Keywords to identify commentary tracks (Defaults will be overwritten; Default: commentary, director)
-cf,--force-coherent Force coherent and don't update anything if config fits not whole config (default: false) -d, --filter-date=<filterDate>
-n,--only-new-files Sets filter-date to last successful execution (Overwrites input of filter-date) only consider files created newer than entered date (format: "dd.MM.yyyy-HH:mm:ss")
-d,--filter-date <arg> Only consider files created newer than entered date (format: "dd.MM.yyyy-HH:mm:ss") -e, --excluded-directory=<excludedDirectories>...
-t,--threads <arg> Thread count (default: 2) Directories to be excluded, combines with config file
-i,--include-pattern <arg> Include files matching pattern (default: ".*") --forced-keywords=<forcedKeywords>[, <forcedKeywords>...]...
-e,--excluded-directories <arg> Directories to be excluded, combines with config file Keywords to identify forced tracks (Defaults will be overwritten; Default: forced, signs, songs)
-fk,--forced-keywords <arg> Additional keywords to identify forced tracks -h, --help Show this help message and exit.
-ck,--commentary-keywords <arg> Additional keywords to identify commentary tracks -i, --include-pattern=<includePattern>
-ps,--preferred-subtitles <arg> Additional keywords to prefer specific subtitle tracks include files matching pattern (default: ".*")
-v,--version Display version -l, --library=<libraryPath>
-h,--help "For help this is" - Yoda path to library
-m, --mkvtoolnix=<mkvToolNix>
path to mkvtoolnix installation
-n, --only-new-file sets filter-date to last successful execution (overwrites input of filter-date)
--preferred-subtitles=<preferredSubtitles>[, <preferredSubtitles>...]...
Keywords to prefer specific subtitle tracks (Defaults will be overwritten; Default: unstyled)
-s, --safemode test run (no files will be changes)
-t, --threads=<threads> thread count (default: 2)
-V, --version Print version information and exit.
``` ```
If you need more information about how each parameter works, check out [this wiki page](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Parameters). If you need more information how each parameter works, check out [this wiki page](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Parameters-v4).
All parameters can also be defined in a [config file](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/How-to-config-file). All parameters can also be defined in a [config file](https://picocli.info/#_argument_files_for_long_command_lines).
## Build requirements ## Build requirements
- JDK 11 or higher - JDK 21 or newer
- Maven 3 - Maven 3
- Git - Git
@@ -51,5 +64,5 @@ All parameters can also be defined in a [config file](https://github.com/RatzzFa
```shell ```shell
git clone https://github.com/RatzzFatzz/MKVAudioSubtitleChanger.git git clone https://github.com/RatzzFatzz/MKVAudioSubtitleChanger.git
cd MKVAudioSubtitleChanger cd MKVAudioSubtitleChanger
mvn package mvn clean package -Pportable
``` ```

View File

@@ -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:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

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

190
pom.xml
View File

@@ -11,6 +11,11 @@
<properties> <properties>
<mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass> <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> <lombok-version>1.18.36</lombok-version>
</properties> </properties>
@@ -66,24 +71,70 @@
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version> <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>
<plugin> <plugin>
<groupId>org.panteleyev</groupId> <groupId>org.panteleyev</groupId>
<artifactId>jpackage-maven-plugin</artifactId> <artifactId>jpackage-maven-plugin</artifactId>
<version>1.6.5</version> <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> <executions>
<execution> <execution>
<id>windows</id> <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> <phase>package</phase>
<goals> <goals>
<goal>jpackage</goal> <goal>jpackage</goal>
@@ -97,25 +148,71 @@
<profile> <profile>
<id>linux</id> <id>linux</id>
<build> <build>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>log4j2-debian.yaml</include>
</includes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.panteleyev</groupId> <artifactId>maven-resources-plugin</artifactId>
<artifactId>jpackage-maven-plugin</artifactId> <version>3.3.1</version>
<version>1.4.0</version>
<executions> <executions>
<execution> <execution>
<id>linux-deb</id> <id>filter-linux-package-info</id>
<configuration>
<type>DEB</type>
<installDir>/usr/local/bin</installDir>
<linuxShortcut>false</linuxShortcut>
<linuxPackageName>mkvasc</linuxPackageName>
<linuxDebMaintainer>your@email.com</linuxDebMaintainer>
</configuration>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>jpackage</goal> <goal>copy-resources</goal>
</goals> </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> </execution>
</executions> </executions>
</plugin> </plugin>
@@ -197,8 +294,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version> <version>3.13.0</version>
<configuration> <configuration>
<source>21</source> <source>${java-version}</source>
<target>21</target> <target>${java-version}</target>
<compilerArgs> <compilerArgs>
<arg>-Aproject=${project.groupId}/${project.artifactId}</arg> <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
</compilerArgs> </compilerArgs>
@@ -218,51 +315,6 @@
</plugin> </plugin>
</plugins> </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> </build>
<repositories> <repositories>

View File

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

8
src/deb/control/control Normal file
View File

@@ -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}

View File

@@ -18,11 +18,12 @@ import java.util.Set;
@Slf4j @Slf4j
@CommandLine.Command( @CommandLine.Command(
name = "mkvasc", name = "mkvaudiosubtitlechanger",
usageHelpWidth = 120, usageHelpWidth = 120,
customSynopsis = { customSynopsis = {
"mkvasc -a <attributeConfig>... -l <libraryPath> [-s]", "mkvaudiosubtitlechanger -a <attributeConfig>... -l <libraryPath> [-s]",
"Example: mkvasc -a eng:eng eng:ger -l /mnt/media/ -s" "Example: mkvaudiosubtitlechanger -a eng:eng eng:ger -l /mnt/media/ -s",
""
}, },
mixinStandardHelpOptions = true, mixinStandardHelpOptions = true,
versionProvider = ProjectUtil.class versionProvider = ProjectUtil.class
@@ -60,6 +61,9 @@ public class Main implements Runnable {
} }
public static void main(String[] args) { public static void main(String[] args) {
if (args.length == 0) {
args = new String[] { "--help" };
}
new CommandLine(Main.class).execute(args); new CommandLine(Main.class).execute(args);
} }
} }

View File

@@ -30,7 +30,8 @@ public class Config {
@CommandLine.Spec @CommandLine.Spec
CommandLine.Model.CommandSpec spec; CommandLine.Model.CommandSpec spec;
@CommandLine.Option(names = {"-a", "--attribute-config"}, required = true, arity = "1..*", converter = AttributeConfigConverter.class) @CommandLine.Option(names = {"-a", "--attribute-config"}, required = true, arity = "1..*", converter = AttributeConfigConverter.class,
description = "List of audio:subtitle pairs used to match in order and update files accordingly (e.g. jpn:eng jpn:ger)")
private List<AttributeConfig> attributeConfig; private List<AttributeConfig> attributeConfig;
@Setter(AccessLevel.NONE) @Setter(AccessLevel.NONE)
@@ -51,7 +52,7 @@ public class Config {
@CommandLine.Option(names = {"-cf", "--force-coherent"}, description = "changes are only applied if it's a coherent match") @CommandLine.Option(names = {"-cf", "--force-coherent"}, description = "changes are only applied if it's a coherent match")
private boolean forceCoherent; private boolean forceCoherent;
@CommandLine.Option(names = {"-n"}, description = "sets filter-date to last successful execution (overwrites input of filter-date)") @CommandLine.Option(names = {"-n", "--only-new-file"}, description = "sets filter-date to last successful execution (overwrites input of filter-date)")
private boolean onlyNewFiles; private boolean onlyNewFiles;
@CommandLine.Option(names = {"-d", "--filter-date"}, defaultValue = CommandLine.Option.NULL_VALUE, description = "only consider files created newer than entered date (format: \"dd.MM.yyyy-HH:mm:ss\")") @CommandLine.Option(names = {"-d", "--filter-date"}, defaultValue = CommandLine.Option.NULL_VALUE, description = "only consider files created newer than entered date (format: \"dd.MM.yyyy-HH:mm:ss\")")
private Date filterDate; private Date filterDate;
@@ -61,15 +62,15 @@ public class Config {
description = "Directories to be excluded, combines with config file") description = "Directories to be excluded, combines with config file")
private Set<String> excludedDirectories = new HashSet<>(); private Set<String> excludedDirectories = new HashSet<>();
@CommandLine.Option(names = {"-fk", "--force-keywords"}, arity = "1..*", @CommandLine.Option(names = {"--forced-keywords"}, arity = "1..*", defaultValue = "forced, signs, songs", split = ", ",
description = "Additional keywords to identify forced tracks (Defaults are will be overwritten; Default: ${DEFAULT-VALUE}") description = "Keywords to identify forced tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
private Set<String> forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs", "songs")); private Set<String> forcedKeywords;
@CommandLine.Option(names = {"-ck", "--commentary-keywords"}, arity = "1..*", @CommandLine.Option(names = {"--commentary-keywords"}, arity = "1..*", defaultValue = "commentary, director", split = ", ",
description = "Additional keywords to identify commentary tracks (Defaults are will be overwritten; Default: ${DEFAULT-VALUE}") description = "Keywords to identify commentary tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
private Set<String> commentaryKeywords = new HashSet<>(Arrays.asList("commentary", "director")); private Set<String> commentaryKeywords;
@CommandLine.Option(names = {"-ps", "--preferred-subtiltes"}, arity = "1..*", @CommandLine.Option(names = {"--preferred-subtitles"}, arity = "1..*", defaultValue = "unstyled", split = ", ",
description = "Additional keywords to prefer specific subtitle tracks (Defaults are will be overwritten; Default: ${DEFAULT-VALUE}") description = "Keywords to prefer specific subtitle tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
private Set<String> preferredSubtitles = new HashSet<>(Arrays.asList("unstyled")); private Set<String> preferredSubtitles;
@CommandLine.Option(names = {"-l", "--library"}, required = true, description = "path to library") @CommandLine.Option(names = {"-l", "--library"}, required = true, description = "path to library")
public void setLibraryPath(File libraryPath) { public void setLibraryPath(File libraryPath) {

View File

@@ -39,16 +39,17 @@ public class MkvFileProcessor implements FileProcessor {
Map<String, Object> jsonMap; Map<String, Object> jsonMap;
List<FileAttribute> fileAttributes = new ArrayList<>(); List<FileAttribute> fileAttributes = new ArrayList<>();
try { try {
String command = format("\"%s\"", Config.getInstance().getPathFor(MkvToolNix.MKV_MERGE)); String[] command = new String[]{
String[] arguments = new String[]{ Config.getInstance().getPathFor(MkvToolNix.MKV_MERGE),
command,
"--identify", "--identify",
"--identification-format", "--identification-format",
"json", "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); jsonMap = mapper.readValue(inputStream, Map.class);
List<Map<String, Object>> tracks = (List<Map<String, Object>>) jsonMap.get("tracks"); List<Map<String, Object>> tracks = (List<Map<String, Object>>) jsonMap.get("tracks");
if (tracks == null) { if (tracks == null) {
@@ -154,7 +155,7 @@ public class MkvFileProcessor implements FileProcessor {
if (fileInfo.isAudioDifferent()) { if (fileInfo.isAudioDifferent()) {
if (fileInfo.getExistingDefaultAudioLanes() != null && !fileInfo.getExistingDefaultAudioLanes().isEmpty()) { 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())); sb.append(format(DISABLE_DEFAULT_TRACK, track.getId()));
} }
} }
@@ -162,14 +163,14 @@ public class MkvFileProcessor implements FileProcessor {
} }
if (!fileInfo.getExistingForcedAudioLanes().isEmpty()) { if (!fileInfo.getExistingForcedAudioLanes().isEmpty()) {
for (FileAttribute track: fileInfo.getExistingForcedAudioLanes()) { for (FileAttribute track : fileInfo.getExistingForcedAudioLanes()) {
sb.append(format(DISABLE_FORCED_TRACK, track.getId())); sb.append(format(DISABLE_FORCED_TRACK, track.getId()));
} }
} }
if (fileInfo.isSubtitleDifferent()) { if (fileInfo.isSubtitleDifferent()) {
if (fileInfo.getExistingDefaultSubtitleLanes() != null && !fileInfo.getExistingDefaultSubtitleLanes().isEmpty()) { 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())); 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(); InputStream inputstream = Runtime.getRuntime().exec(sb.toString()).getInputStream();
String output = IOUtils.toString(new InputStreamReader(inputstream)); String output = IOUtils.toString(new InputStreamReader(inputstream));
log.debug(output); log.debug(output);

View File

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

View File

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

View File

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

View File

@@ -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

View File

@@ -10,7 +10,7 @@ Configuration:
RollingFile: RollingFile:
name: FileAppender name: FileAppender
fileName: logs/application.log fileName: logs/application.log
filePattern: logs/archive/application-%d{yyyy-MM-dd}-%i.log filePattern: logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz
PatternLayout: PatternLayout:
Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable" Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
ThresholdFilter: ThresholdFilter:
@@ -18,6 +18,16 @@ Configuration:
Policies: Policies:
OnStartupTriggeringPolicy: OnStartupTriggeringPolicy:
minSize: 0 minSize: 0
DefaultRolloverStrategy:
max: 30
Delete:
basePath: logs/archive
maxDepth: 1
IfLastModified:
age: 30d
IfAccumulatedFileSize:
exceeds: 1GB
Loggers: Loggers:
Root: Root:
level: debug level: debug

View File

@@ -1,17 +1,10 @@
Configuration: Configuration:
name: DefaultLogger name: DefaultLogger
Appenders: Appenders:
File:
name: FileAppender
fileName: ${sys:user.home}/AppData/Roaming/MyApplication/MyApplication.log
PatternLayout:
Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
ThresholdFilter:
level: info
RollingFile: RollingFile:
name: FileAppender name: FileAppender
fileName: ${sys:user.home}/AppData/Roaming/MKVAudioSubtitleChanger/logs/application.log fileName: ${sys:user.home}/AppData/Roaming/MKVAudioSubtitleChanger/logs/application.log
filePattern: ${sys:user.home}/AppData/Roaming/MKVAudioSubtitleChanger/logs/archive/application-%d{yyyy-MM-dd}-%i.log filePattern: ${sys:user.home}/AppData/Roaming/MKVAudioSubtitleChanger/logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz
PatternLayout: PatternLayout:
Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable" Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
ThresholdFilter: ThresholdFilter:
@@ -19,6 +12,16 @@ Configuration:
Policies: Policies:
OnStartupTriggeringPolicy: OnStartupTriggeringPolicy:
minSize: 0 minSize: 0
DefaultRolloverStrategy:
max: 30
Delete:
basePath: logs/archive
maxDepth: 1
IfLastModified:
age: 30d
IfAccumulatedFileSize:
exceeds: 1GB
Loggers: Loggers:
Root: Root:
level: info level: info

View File

@@ -4,7 +4,7 @@ Configuration:
RollingFile: RollingFile:
name: FileAppender name: FileAppender
fileName: logs/application.log fileName: logs/application.log
filePattern: logs/archive/application-%d{yyyy-MM-dd}-%i.log filePattern: logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz
PatternLayout: PatternLayout:
Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable" Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
ThresholdFilter: ThresholdFilter:
@@ -12,6 +12,16 @@ Configuration:
Policies: Policies:
OnStartupTriggeringPolicy: OnStartupTriggeringPolicy:
minSize: 0 minSize: 0
DefaultRolloverStrategy:
max: 30
Delete:
basePath: logs/archive
maxDepth: 1
IfLastModified:
age: 30d
IfAccumulatedFileSize:
exceeds: 1GB
Loggers: Loggers:
Root: Root:
level: info level: info

View File

@@ -18,9 +18,9 @@ class ConfigTest {
"-c", "2", "-c", "2",
"-t", "4", "-t", "4",
"-i", ".*[abc].*", "-i", ".*[abc].*",
"-fk", "testForced", "--forced-keywords", "testForced",
"-ck", "testCommentary", "--commentary-keywords", "testCommentary",
"-ps", "testPreferred" "--preferred-subtitles", "testPreferred"
}; };
CommandLine.populateCommand(Config.getInstance(), sut); CommandLine.populateCommand(Config.getInstance(), sut);

View File

@@ -19,14 +19,14 @@ class SetConfigParameterTest {
private static Stream<Arguments> provideTestCases() { private static Stream<Arguments> provideTestCases() {
return Stream.of( return Stream.of(
Arguments.of(args("-ck", "test"), 1, (Function<Config, Set<String>>) Config::getCommentaryKeywords), Arguments.of(args("--commentary-keywords", "test"), 1, (Function<Config, Set<String>>) Config::getCommentaryKeywords),
Arguments.of(args("-ck", "test", "test1", "test2", "test3", "test4"), 5, (Function<Config, Set<String>>) Config::getCommentaryKeywords), Arguments.of(args("--commentary-keywords", "test", "test1", "test2", "test3", "test4"), 5, (Function<Config, Set<String>>) Config::getCommentaryKeywords),
Arguments.of(args(), 2, (Function<Config, Set<String>>) Config::getCommentaryKeywords), Arguments.of(args(), 2, (Function<Config, Set<String>>) Config::getCommentaryKeywords),
Arguments.of(args("-fk", "test"), 1, (Function<Config, Set<String>>) Config::getForcedKeywords), Arguments.of(args("--forced-keywords", "test"), 1, (Function<Config, Set<String>>) Config::getForcedKeywords),
Arguments.of(args("-fk", "test", "test1", "test2", "test3", "test4"), 5, (Function<Config, Set<String>>) Config::getForcedKeywords), Arguments.of(args("--forced-keywords", "test", "test1", "test2", "test3", "test4"), 5, (Function<Config, Set<String>>) Config::getForcedKeywords),
Arguments.of(args(), 3, (Function<Config, Set<String>>) Config::getForcedKeywords), Arguments.of(args(), 3, (Function<Config, Set<String>>) Config::getForcedKeywords),
Arguments.of(args("-ps", "test"), 1, (Function<Config, Set<String>>) Config::getPreferredSubtitles), Arguments.of(args("--preferred-subtitles", "test"), 1, (Function<Config, Set<String>>) Config::getPreferredSubtitles),
Arguments.of(args("-ps", "test", "test1", "test2", "test3", "test4"), 5, (Function<Config, Set<String>>) Config::getPreferredSubtitles), Arguments.of(args("--preferred-subtitles", "test", "test1", "test2", "test3", "test4"), 5, (Function<Config, Set<String>>) Config::getPreferredSubtitles),
Arguments.of(args(), 1, (Function<Config, Set<String>>) Config::getPreferredSubtitles) Arguments.of(args(), 1, (Function<Config, Set<String>>) Config::getPreferredSubtitles)
); );
} }
@@ -42,9 +42,9 @@ class SetConfigParameterTest {
@Test @Test
void validate() { void validate() {
Main sut = new Main(); Main sut = new Main();
assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("-ck"))); assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("--commentary-keywords")));
assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("-fk"))); assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("--forced-keywords")));
assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("-e"))); assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("-e")));
assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("-ps"))); assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("--preferred-subtitles")));
} }
} }

View File

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