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>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.15.0</version>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.15.0</version>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.12.0</version>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -137,12 +137,12 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.9.9</version>
<version>2.13.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.10.0.pr1</version>
<version>2.13.1</version>
</dependency>
<!-- endregion -->
<!-- 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){
for(File file : allValidPaths){
List<FileAttribute> attributes = collector.loadAttributes(file);
if (attributes.isEmpty()) {
continue;
}
boolean fileHasChanged = false;
for(AttributeConfig config : configPattern){
/*

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

@@ -28,22 +28,22 @@ public class MkvFileCollector implements FileCollector {
@Override
public List<File> loadFiles(String path) {
File file = new File(path);
if(file.isFile() && file.getAbsolutePath().endsWith(".mkv")){
if (file.isFile() && file.getAbsolutePath().endsWith(".mkv")) {
return new ArrayList<File>() {{
add(file);
}};
}else if(file.isDirectory()){
try(Stream<Path> paths = Files.walk(Paths.get(path))){
} else if (file.isDirectory()) {
try (Stream<Path> paths = Files.walk(Paths.get(path))) {
return paths
.filter(Files::isRegularFile)
.map(Path::toFile)
.filter(f -> f.getAbsolutePath().endsWith(".mkv"))
.collect(Collectors.toList());
}catch(IOException e){
} catch (IOException e) {
log.error("Couldn't find file or directory!", e);
return null;
}
}else{
} else {
return null;
}
}
@@ -56,11 +56,11 @@ public class MkvFileCollector implements FileCollector {
public List<FileAttribute> loadAttributes(File file) {
Map<String, Object> jsonMap;
List<FileAttribute> fileAttributes = new ArrayList<>();
try{
try {
String command = "";
if(System.getProperty("os.name").toLowerCase().contains("windows")){
if (System.getProperty("os.name").toLowerCase().contains("windows")) {
command = "\"" + MKVToolProperties.getInstance().getMkvmergePath() + "\"";
}else{
} else {
command = MKVToolProperties.getInstance().getMkvmergePath();
}
String[] array = new String[]{
@@ -74,19 +74,23 @@ public class MkvFileCollector implements FileCollector {
InputStream inputStream = Runtime.getRuntime().exec(array).getInputStream();
jsonMap = mapper.readValue(inputStream, Map.class);
List<Map<String, Object>> tracks = (List<Map<String, Object>>) jsonMap.get("tracks");
for(Map<String, Object> attribute : tracks){
if(! "video".equals(attribute.get("type"))){
if (tracks == null) {
log.warn("Couldn't retrieve information of {}", file.getAbsoluteFile().toString());
return new ArrayList<>();
}
for (Map<String, Object> attribute : tracks) {
if (!"video".equals(attribute.get("type"))) {
Map<String, Object> properties = (Map<String, Object>) attribute.get("properties");
fileAttributes.add(new FileAttribute(
(int) properties.get("number"),
(String) properties.get("language"),
(String) properties.get("track_name"),
(Boolean) properties.get("default_track"),
(Boolean) properties.get("forced_track"),
(Boolean) properties.getOrDefault("default_track", false),
(Boolean) properties.getOrDefault("forced_track", false),
(String) attribute.get("type")));
}
}
}catch(IOException e){
} catch (IOException e) {
e.printStackTrace();
log.error("File could not be found or loaded!");
}