Michael/MKVAudioSubtitleChanger
1
0
Fork 0
mirror of https://github.com/RatzzFatzz/MKVAudioSubtitleChanger.git synced 2026-02-11 02:05:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies & fix null pointer exception when file has missing properties or none at all

Browse Source
This commit is contained in:
Michael Ratz
2022-02-23 00:16:14 +01:00
parent 097499a916
commit bba612476b
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@@ -106,17 +106,17 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<version>2.15.0</version> <version>2.17.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<version>2.15.0</version> <version>2.17.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
<version>2.12.0</version> <version>2.17.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@@ -137,12 +137,12 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId> <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId> <artifactId>jackson-dataformat-yaml</artifactId>
<version>2.9.9</version> <version>2.13.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>2.10.0.pr1</version> <version>2.13.1</version>
</dependency> </dependency>
<!-- endregion --> <!-- endregion -->
<!-- region unit-tests --> <!-- region unit-tests -->

3
src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java
View File

@@ -21,6 +21,9 @@ public class AttributeUpdaterKernel {
if(allValidPaths != null && configPattern != null){ if(allValidPaths != null && configPattern != null){
for(File file : allValidPaths){ for(File file : allValidPaths){
List<FileAttribute> attributes = collector.loadAttributes(file); List<FileAttribute> attributes = collector.loadAttributes(file);
if (attributes.isEmpty()) {
continue;
}
boolean fileHasChanged = false; boolean fileHasChanged = false;
for(AttributeConfig config : configPattern){ for(AttributeConfig config : configPattern){
/* /*

8
src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java
View File

@@ -74,6 +74,10 @@ public class MkvFileCollector implements FileCollector {
InputStream inputStream = Runtime.getRuntime().exec(array).getInputStream(); InputStream inputStream = Runtime.getRuntime().exec(array).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) {
log.warn("Couldn't retrieve information of {}", file.getAbsoluteFile().toString());
return new ArrayList<>();
}
for (Map<String, Object> attribute : tracks) { for (Map<String, Object> attribute : tracks) {
if (!"video".equals(attribute.get("type"))) { if (!"video".equals(attribute.get("type"))) {
Map<String, Object> properties = (Map<String, Object>) attribute.get("properties"); Map<String, Object> properties = (Map<String, Object>) attribute.get("properties");
@@ -81,8 +85,8 @@ public class MkvFileCollector implements FileCollector {
(int) properties.get("number"), (int) properties.get("number"),
(String) properties.get("language"), (String) properties.get("language"),
(String) properties.get("track_name"), (String) properties.get("track_name"),
(Boolean) properties.get("default_track"), (Boolean) properties.getOrDefault("default_track", false),
(Boolean) properties.get("forced_track"), (Boolean) properties.getOrDefault("forced_track", false),
(String) attribute.get("type"))); (String) attribute.get("type")));
} }
} }