diff --git a/pom.xml b/pom.xml index ab5a21b..eeec0ec 100644 --- a/pom.xml +++ b/pom.xml @@ -6,17 +6,18 @@ at.pcgamingfreaks MKVAudioSubtitleChanger - 4.0.2 + 4.0.4 at.pcgamingfreaks.mkvaudiosubtitlechanger.Main + UTF-8 RatzzFatzz github.contact@ratzloeffel.de Command-line utility for batch-managing default audio and subtitle tracks in MKV files. 17 - 1.18.36 + 1.18.42 @@ -110,7 +111,7 @@ org.panteleyev jpackage-maven-plugin - 1.6.5 + 1.7.1 ${project.artifactId} RatzzFatzz @@ -307,7 +308,7 @@ info.picocli picocli-codegen - 4.7.6 + 4.7.7 @@ -341,7 +342,7 @@ info.picocli picocli - 4.7.6 + 4.7.7 @@ -357,7 +358,7 @@ jakarta.el jakarta.el-api - 6.0.1 + 6.1.0-M1 @@ -371,7 +372,7 @@ jakarta.validation jakarta.validation-api - 3.0.2 + 3.1.1 @@ -399,26 +400,26 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.18.2 + 2.20.0 com.fasterxml.jackson.core jackson-databind - 2.18.2 + 2.20.0 commons-cli commons-cli - 1.9.0 + 1.10.0 org.apache.commons commons-lang3 - 3.17.0 + 3.19.0 @@ -432,28 +433,28 @@ org.junit.jupiter junit-jupiter-api - 5.11.4 + 6.0.0 test org.junit.jupiter junit-jupiter-engine - 5.11.4 + 6.0.0 test org.mockito mockito-core - 5.15.2 + 5.20.0 test org.junit.jupiter junit-jupiter-params - 5.11.4 + 6.0.0 test @@ -467,7 +468,7 @@ net.harawata appdirs - 1.3.0 + 1.5.0 diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java index a4a612d..26cdd09 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java @@ -20,7 +20,7 @@ import java.util.regex.Pattern; @Getter @Setter @NoArgsConstructor -public class Config { +public class Config implements CommandLine.IVersionProvider { @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private static Config config = null; @@ -151,5 +151,10 @@ public class Config { .add("attributeConfig=" + attributeConfig) .toString(); } + + @Override + public String[] getVersion() throws Exception { + return new String[0]; + } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/kernel/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/kernel/AttributeUpdaterKernel.java index 4f84909..8472af8 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/kernel/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/kernel/AttributeUpdaterKernel.java @@ -100,6 +100,7 @@ public abstract class AttributeUpdaterKernel { List attributes = processor.loadAttributes(file); if (attributes == null || attributes.isEmpty()) { + log.warn("No attributes found for file {}", file); statistic.total(); statistic.failure(); return; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java index 439cc91..a8df545 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java @@ -52,7 +52,7 @@ public class FileInfoDto { public FileStatus getStatus() { if (isChangeNecessary()) return FileStatus.CHANGE_NECESSARY; if (isUnableToApplyConfig()) return FileStatus.NO_SUITABLE_CONFIG; - if (isAlreadySuitable()) return FileStatus.ALREADY_SUITED; + if (isAlreadySuited()) return FileStatus.ALREADY_SUITED; return FileStatus.UNKNOWN; } @@ -60,8 +60,9 @@ public class FileInfoDto { return desiredDefaultAudioLane == null && desiredDefaultSubtitleLane == null; } - private boolean isAlreadySuitable() { - return existingDefaultAudioLanes.contains(desiredDefaultAudioLane) && existingDefaultSubtitleLanes.contains(desiredDefaultSubtitleLane); + private boolean isAlreadySuited() { + return existingDefaultAudioLanes.contains(desiredDefaultAudioLane) + && (desiredDefaultSubtitleLane == null || existingDefaultSubtitleLanes.contains(desiredDefaultSubtitleLane)); } private boolean isChangeNecessary() {