From 40604c9ccb5470b6fc67a678a854f284adac9507 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Wed, 15 Apr 2020 22:59:37 +0200 Subject: [PATCH 01/38] [FIX] remove unnecessary method --- .../mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java index f1b6065..59bb0f9 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java @@ -19,7 +19,7 @@ import java.util.stream.Stream; @Log4j2 public class MkvFileCollector implements FileCollector { - private ObjectMapper mapper = new ObjectMapper(); + private final ObjectMapper mapper = new ObjectMapper(); /** * @param path Is entered path, which leads to one file directly or a directory which will be loaded recursive @@ -79,8 +79,4 @@ public class MkvFileCollector implements FileCollector { } return fileAttributes; } - - private boolean verifyFile(File file) { - return false; - } } From b5e075a90276fe90226fc1cecf2465e56a71b577 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 20:00:26 +0000 Subject: [PATCH 02/38] Bump jackson-databind from 2.9.10.3 to 2.9.10.4 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.3 to 2.9.10.4. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c080342..e614db0 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.10.3 + 2.9.10.4 From 0da07297ea751381375fde4d8a6bb83085dd0314 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Sun, 10 May 2020 18:33:27 +0200 Subject: [PATCH 03/38] [IMPL] empty audio or subtitle line --- .../config/ConfigProcessor.java | 39 +++++++++++++------ src/main/resources/config.yaml | 2 +- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java index 2d442a3..7b46ee4 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java @@ -15,7 +15,7 @@ import java.util.List; public class ConfigProcessor { private int audioDefault = 0; private int subtitleDefault = 0; - private AttributeConfig config; + private final AttributeConfig config; public ConfigProcessor(AttributeConfig config) { this.config = config; @@ -32,9 +32,9 @@ public class ConfigProcessor { // check if size is bigger or equal 2 to make sure that there is at least one audio and subtitle line // TODO: implement empty audio or subtitle line if(attributes.size() >= 2){ - filterAttributes(attributes); + TransferObject transfer = filterAttributes(attributes); if(! attributes.isEmpty()){ - return updateFile(file, attributes); + return updateFile(file, attributes, transfer); } } return false; @@ -44,7 +44,8 @@ public class ConfigProcessor { * Filters the attributes that only those are remaining which are needed in the current configuration. * Also analyzes which tracks were default before. */ - private void filterAttributes(List attributes) { + private TransferObject filterAttributes(List attributes) { + TransferObject transfer = new TransferObject(); Iterator iterator = attributes.iterator(); while(iterator.hasNext()){ FileAttribute elem = iterator.next(); @@ -52,6 +53,10 @@ public class ConfigProcessor { if(elem.isDefaultTrack()){ audioDefault = elem.getId(); } + if(config.getAudio().contains("OFF")){ + transfer.setAudioOn(false); + transfer.setAudioIndex(- 2); + } if(! config.getAudio().contains(elem.getLanguage())){ iterator.remove(); } @@ -59,11 +64,16 @@ public class ConfigProcessor { if(elem.isDefaultTrack()){ subtitleDefault = elem.getId(); } + if(config.getSubtitle().contains("OFF")){ + transfer.setSubtitleOn(false); + transfer.setSubtitleIndex(- 2); + } if(! config.getSubtitle().contains(elem.getLanguage())){ iterator.remove(); } } } + return transfer; } /** @@ -73,16 +83,20 @@ public class ConfigProcessor { * @param attributes has the metadata for the transferred file * @return if the the current file was updated or not. Returns true if the file already has the correct metadata set */ - private boolean updateFile(File file, List attributes) { + private boolean updateFile(File file, List attributes, TransferObject transfer) { StringBuilder stringBuffer = new StringBuilder("\""); stringBuffer.append(MKVToolProperties.getInstance().getMkvpropeditPath()); stringBuffer.append("\" \"").append(file.getAbsolutePath()).append("\" "); - stringBuffer.append("--edit track:").append(subtitleDefault).append(" --set flag-default=0 "); - stringBuffer.append("--edit track:").append(audioDefault).append(" --set flag-default=0 "); - TransferObject transfer = collectLines(attributes); + stringBuffer.append("--edit track:=").append(subtitleDefault).append(" --set flag-default=0 "); + stringBuffer.append("--edit track:=").append(audioDefault).append(" --set flag-default=0 "); + collectLines(attributes, transfer); if(transfer.isValid){ - stringBuffer.append("--edit track:").append(transfer.getSubtitleIndex()).append(" --set flag-default=1 "); - stringBuffer.append("--edit track:").append(transfer.getAudioIndex()).append(" --set flag-default=1 "); + if(transfer.isAudioOn){ + stringBuffer.append("--edit track:=").append(transfer.getAudioIndex()).append(" --set flag-default=1 "); + } + if(transfer.isSubtitleOn){ + stringBuffer.append("--edit track:=").append(transfer.getSubtitleIndex()).append(" --set flag-default=1 "); + } if(subtitleDefault == transfer.getSubtitleIndex() && audioDefault == transfer.getAudioIndex()){ /* * In this case the file would be change to the exact same audio and subtitle lines and we want to @@ -114,8 +128,7 @@ public class ConfigProcessor { * the entered config. Also transfers a boolean which contains information about if the other two values * were set */ - private TransferObject collectLines(List attributes) { - TransferObject transfer = new TransferObject(); + private TransferObject collectLines(List attributes, TransferObject transfer) { int subtitleListIndex = - 1; int audioListIndex = - 1; for(FileAttribute elem : attributes){ @@ -157,6 +170,8 @@ public class ConfigProcessor { private boolean isValid; private int audioIndex = - 1; private int subtitleIndex = - 1; + private boolean isSubtitleOn = true; + private boolean isAudioOn = true; TransferObject() { } diff --git a/src/main/resources/config.yaml b/src/main/resources/config.yaml index 84e0047..37c82cc 100644 --- a/src/main/resources/config.yaml +++ b/src/main/resources/config.yaml @@ -10,4 +10,4 @@ config: - ger - eng subtitle: - - eng \ No newline at end of file + - OFF \ No newline at end of file From 401840e554bdbefd079662d42f2aa99a6cd5e580 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Sun, 10 May 2020 19:36:21 +0200 Subject: [PATCH 04/38] [FIX] jar --- src/main/resources/config.yaml => config.yaml | 0 pom.xml | 2 +- src/main/java/Main.java | 16 ---------------- .../MKVToolProperties.java | 2 +- .../mkvaudiosubtitlechanger/Main.java | 2 -- .../config/ConfigProcessor.java | 14 +++++++++----- .../intimpl/MkvFileCollector.java | 4 +++- .../mkvaudiosubtitlechanger/util/ConfigUtil.java | 2 +- src/main/java/query/QueryBuilder.java | 4 ++-- src/test/java/config/MKVToolPropertiesTest.java | 1 + 10 files changed, 18 insertions(+), 29 deletions(-) rename src/main/resources/config.yaml => config.yaml (100%) delete mode 100644 src/main/java/Main.java rename src/main/java/{config => at/pcgamingfreaks/mkvaudiosubtitlechanger}/MKVToolProperties.java (98%) diff --git a/src/main/resources/config.yaml b/config.yaml similarity index 100% rename from src/main/resources/config.yaml rename to config.yaml diff --git a/pom.xml b/pom.xml index c080342..ea63b23 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ - Main + at/pcgamingfreaks/mkvaudiosubtitlechanger/Main diff --git a/src/main/java/Main.java b/src/main/java/Main.java deleted file mode 100644 index 809bfb5..0000000 --- a/src/main/java/Main.java +++ /dev/null @@ -1,16 +0,0 @@ -import at.pcgamingfreaks.mkvaudiosubtitlechanger.AttributeUpdaterKernel; -import lombok.extern.log4j.Log4j2; - -@Log4j2 -public class Main { - - - public static void main(String[] args) { -// MKVToolProperties.getInstance().defineMKVToolNixPath(); -// GUI gui = new GUI(); - AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(); - kernel.execute(); - } - - -} diff --git a/src/main/java/config/MKVToolProperties.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java similarity index 98% rename from src/main/java/config/MKVToolProperties.java rename to src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java index 2fb44f9..4319234 100644 --- a/src/main/java/config/MKVToolProperties.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java @@ -1,4 +1,4 @@ -package config; +package at.pcgamingfreaks.mkvaudiosubtitlechanger; import lombok.Getter; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index 5c21376..926d9d3 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -1,7 +1,5 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; -import config.MKVToolProperties; - public class Main { public static void main(String[] args) { MKVToolProperties.getInstance().defineMKVToolNixPath(); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java index 7b46ee4..9efd6e6 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java @@ -1,7 +1,7 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; -import config.MKVToolProperties; import lombok.Getter; import lombok.Setter; import lombok.extern.log4j.Log4j2; @@ -13,8 +13,8 @@ import java.util.List; @Log4j2 public class ConfigProcessor { - private int audioDefault = 0; - private int subtitleDefault = 0; + private int audioDefault = - 1; + private int subtitleDefault = - 1; private final AttributeConfig config; public ConfigProcessor(AttributeConfig config) { @@ -87,8 +87,12 @@ public class ConfigProcessor { StringBuilder stringBuffer = new StringBuilder("\""); stringBuffer.append(MKVToolProperties.getInstance().getMkvpropeditPath()); stringBuffer.append("\" \"").append(file.getAbsolutePath()).append("\" "); - stringBuffer.append("--edit track:=").append(subtitleDefault).append(" --set flag-default=0 "); - stringBuffer.append("--edit track:=").append(audioDefault).append(" --set flag-default=0 "); + if(audioDefault != - 1){ + stringBuffer.append("--edit track:=").append(audioDefault).append(" --set flag-default=0 "); + } + if(subtitleDefault != - 1){ + stringBuffer.append("--edit track:=").append(subtitleDefault).append(" --set flag-default=0 "); + } collectLines(attributes, transfer); if(transfer.isValid){ if(transfer.isAudioOn){ diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java index 59bb0f9..3b43e44 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java @@ -1,8 +1,8 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; import com.fasterxml.jackson.databind.ObjectMapper; -import config.MKVToolProperties; import lombok.extern.log4j.Log4j2; import java.io.File; @@ -56,6 +56,8 @@ public class MkvFileCollector implements FileCollector { public List loadAttributes(File file) { Map jsonMap; List fileAttributes = new ArrayList<>(); + System.out.println("\"" + MKVToolProperties.getInstance().getMkvmergePath() + + "\" --identify --identification-format json \"" + file.getAbsolutePath() + "\""); try(InputStream inputStream = Runtime.getRuntime().exec("\"" + MKVToolProperties.getInstance().getMkvmergePath() + "\" --identify --identification-format json \"" + file.getAbsolutePath() + "\"").getInputStream()){ diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java index f44d017..d2192bd 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; @Log4j2 public class ConfigUtil { public static List loadConfig() { - try(YAML yaml = new YAML(new File("./src/main/resources/config.yaml"))){ + try(YAML yaml = new YAML(new File("config.yaml"))){ return yaml.getKeysFiltered(".*audio.*").stream() .sorted() .map(elem -> elem.replace(".audio", "")) diff --git a/src/main/java/query/QueryBuilder.java b/src/main/java/query/QueryBuilder.java index 747c6c2..dd51991 100644 --- a/src/main/java/query/QueryBuilder.java +++ b/src/main/java/query/QueryBuilder.java @@ -1,10 +1,10 @@ package query; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; import at.pcgamingfreaks.yaml.YAML; import at.pcgamingfreaks.yaml.YamlInvalidContentException; import com.fasterxml.jackson.databind.ObjectMapper; -import config.MKVToolProperties; import lombok.extern.log4j.Log4j2; import java.io.File; @@ -21,7 +21,7 @@ import java.util.stream.Stream; @Log4j2 public class QueryBuilder { - private ObjectMapper mapper = new ObjectMapper(); + private final ObjectMapper mapper = new ObjectMapper(); public QueryBuilder() { } diff --git a/src/test/java/config/MKVToolPropertiesTest.java b/src/test/java/config/MKVToolPropertiesTest.java index bd58886..eff1fdf 100644 --- a/src/test/java/config/MKVToolPropertiesTest.java +++ b/src/test/java/config/MKVToolPropertiesTest.java @@ -1,5 +1,6 @@ package config; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties; import lombok.extern.log4j.Log4j2; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; From e0a21b5d7c571c701d771363763913d6d47e5df6 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Thu, 4 Jun 2020 00:53:33 +0200 Subject: [PATCH 05/38] [IMPL] Changed to CLI tool --- README.md | 0 src/main/java/GUI.form | 13 -- src/main/java/GUI.java | 90 ---------- .../AttributeUpdaterKernel.java | 37 ++-- .../MKVToolProperties.java | 73 +------- .../mkvaudiosubtitlechanger/Main.java | 29 +++- src/main/java/config/CustomOutputStream.java | 21 --- src/main/java/query/QueryBuilder.java | 160 ------------------ src/test/java/MainTest.java | 3 - .../java/config/MKVToolPropertiesTest.java | 78 --------- 10 files changed, 43 insertions(+), 461 deletions(-) create mode 100644 README.md delete mode 100644 src/main/java/GUI.form delete mode 100644 src/main/java/GUI.java delete mode 100644 src/main/java/config/CustomOutputStream.java delete mode 100644 src/main/java/query/QueryBuilder.java delete mode 100644 src/test/java/MainTest.java delete mode 100644 src/test/java/config/MKVToolPropertiesTest.java diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/GUI.form b/src/main/java/GUI.form deleted file mode 100644 index 94c37be..0000000 --- a/src/main/java/GUI.form +++ /dev/null @@ -1,13 +0,0 @@ - -
- - - - - - - - - - -
diff --git a/src/main/java/GUI.java b/src/main/java/GUI.java deleted file mode 100644 index b544f49..0000000 --- a/src/main/java/GUI.java +++ /dev/null @@ -1,90 +0,0 @@ -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; -import lombok.extern.log4j.Log4j2; -import query.QueryBuilder; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.*; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Paths; - -@Log4j2 -public class GUI { - private String path; - private JButton openFileBrowser; - private JButton startOperation; - - public GUI() { - JFrame frame = new JFrame(); - frame.setLayout(new BorderLayout()); - frame.setTitle("MKV Audio and Subtitle Changer"); - frame.setSize(500, 75); - frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - - JPanel top = new JPanel(new GridLayout(1, 2, 20, 20)); - - openFileBrowser = new JButton("Browse directory"); - openFileBrowser.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - JFileChooser fileChooser = new JFileChooser(); - try{ - if(! readFile("lastDir", Charset.defaultCharset()).isEmpty()){ - String temp = readFile("lastDir", Charset.defaultCharset()); - fileChooser.setCurrentDirectory(new File(temp)); - } - }catch(IOException ie){ - log.info("Couldn't start FileChooser with default path"); - } - fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); - fileChooser.setMultiSelectionEnabled(false); - fileChooser.setPreferredSize(new Dimension(600, 500)); - Action details = fileChooser.getActionMap().get("viewTypeDetails"); - details.actionPerformed(null); - fileChooser.showOpenDialog(null); - try{ - if(FileAttribute.pathIsValid(fileChooser.getSelectedFile().getAbsolutePath())){ - path = fileChooser.getSelectedFile().getAbsolutePath(); - try(PrintWriter out = new PrintWriter("lastDir", "UTF-8")){ - out.print(fileChooser.getCurrentDirectory()); - }catch(FileNotFoundException | UnsupportedEncodingException fne){ - log.error(fne); - } - startOperation.setEnabled(true); - } - }catch(NullPointerException ne){ - System.out.println("File or directory not found!"); - log.error("File or directory not found!", ne); - } - } - }); - - startOperation = new JButton("Start updating"); - startOperation.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - QueryBuilder queryBuilder = new QueryBuilder(); - if(queryBuilder.executeUpdateOnAllFiles(path)){ - log.info("All files updated!"); - System.out.println("All files updated!"); - } - } - }); - startOperation.setEnabled(false); - - top.add(openFileBrowser); - top.add(startOperation); - - frame.add(top, BorderLayout.NORTH); - - frame.setVisible(true); - } - - static String readFile(String path, Charset encoding) throws IOException { - byte[] encoded = Files.readAllBytes(Paths.get(path)); - return new String(encoded, encoding); - } -} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index 62c44d2..9c1f5ef 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -10,36 +10,29 @@ import lombok.extern.log4j.Log4j2; import java.io.File; import java.util.ArrayList; import java.util.List; -import java.util.Scanner; @Log4j2 public class AttributeUpdaterKernel { MkvFileCollector collector = new MkvFileCollector(); - public void execute() { + public void execute(String path) { List configPattern = ConfigUtil.loadConfig(); - List allValidPaths = null; - try(Scanner scanner = new Scanner(System.in)){ - System.out.println("Please enter the path to the files which should be updated: "); - do{ - allValidPaths = collector.loadFiles(scanner.nextLine()); - if(allValidPaths == null){ - System.out.println("Please enter a valid path: "); - } - }while(allValidPaths == null); - log.info(allValidPaths.size() + " files where found and will now be processed!"); - } - for(File file : allValidPaths){ - List attributes = collector.loadAttributes(file); - for(AttributeConfig config : configPattern){ - /* - * Creating new ArrayList, because the method removes elements from the list by reference - */ - boolean fileHasChanged = new ConfigProcessor(config).processConfig(file, new ArrayList<>(attributes)); - if(fileHasChanged){ - break; + List allValidPaths = collector.loadFiles(path); + if(! allValidPaths.isEmpty()){ + for(File file : allValidPaths){ + List attributes = collector.loadAttributes(file); + for(AttributeConfig config : configPattern){ + /* + * Creating new ArrayList, because the method removes elements from the list by reference + */ + boolean fileHasChanged = new ConfigProcessor(config).processConfig(file, new ArrayList<>(attributes)); + if(fileHasChanged){ + break; + } } } + }else{ + log.error("Path is not valid!"); } } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java index 4319234..14618ee 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java @@ -1,19 +1,13 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; import lombok.Getter; +import lombok.Setter; import lombok.extern.log4j.Log4j2; -import java.io.*; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.Scanner; -import java.util.stream.Collectors; -import java.util.stream.Stream; - @Log4j2 @Getter +@Setter public class MKVToolProperties { - private String directoryPath; private String mkvmergePath; private String mkvpropeditPath; @@ -28,67 +22,4 @@ public class MKVToolProperties { } return instance; } - - public void defineMKVToolNixPath() { - if(searchWithFilePath() && pathIsValid()){ - log.info("MKVToolNix found!"); - return; - } - log.debug("MKVToolNix not found in file!"); - searchInDefaultPath(); - if(pathIsValid()){ - log.info("MKVToolNix found!"); - return; - } - log.debug("MKVToolNix not found in default path!"); - Scanner input = new Scanner(System.in); - while(true){ - searchWithUserPath(input); - if(pathIsValid()){ - break; - } - } - try(PrintWriter writer = new PrintWriter("mkvDirectoryPath", "UTF-8")){ - writer.println(directoryPath); - }catch(UnsupportedEncodingException | FileNotFoundException e){ - log.error("File counldn't be written!"); - } - log.info("MKVToolNix found!"); - } - - private boolean pathIsValid() { - checkForSeparator(); - setMKVmergeAndPropEditPath(); - return new File(mkvmergePath).exists() && new File(mkvpropeditPath).exists(); - } - - private void checkForSeparator() { - if(! (directoryPath.endsWith("/") || (directoryPath.endsWith("\\") && System.getProperty("os.name").toLowerCase().contains("windows")))){ - directoryPath += File.separator; - } - } - - private void setMKVmergeAndPropEditPath() { - mkvmergePath = directoryPath + "mkvmerge.exe"; - mkvpropeditPath = directoryPath + "mkvpropedit.exe"; - } - - private boolean searchWithFilePath() { - try(Stream stream = Files.lines(Paths.get("mkvDirectoryPath"))){ - directoryPath = stream.collect(Collectors.joining("\n")); - }catch(IOException e){ - log.fatal(e.getMessage()); - return false; - } - return true; - } - - private void searchInDefaultPath() { - directoryPath = "C:\\Program Files\\MKVToolNix"; - } - - private void searchWithUserPath(Scanner input) { - log.info("Please enter the path to the directory of MKVToolNix:"); - directoryPath = input.nextLine(); - } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index 926d9d3..0509f99 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -1,9 +1,32 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; +import at.pcgamingfreaks.yaml.YAML; +import at.pcgamingfreaks.yaml.YamlInvalidContentException; +import at.pcgamingfreaks.yaml.YamlKeyNotFoundException; +import lombok.extern.log4j.Log4j2; + +import java.io.File; +import java.io.IOException; + +@Log4j2 public class Main { public static void main(String[] args) { - MKVToolProperties.getInstance().defineMKVToolNixPath(); - AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(); - kernel.execute(); + if(checkIfMKVToolNixIsValid()){ + AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(); + kernel.execute(args[0]); + }else{ + log.error("MKVToolNix was not found! Please recheck path"); + } + } + + private static boolean checkIfMKVToolNixIsValid() { + try{ + String path = new YAML(new File("config.yml")).getString("mkvtoolnixPath"); + MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge"); + MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvproperties"); + }catch(YamlKeyNotFoundException | IOException | YamlInvalidContentException e){ + e.printStackTrace(); + } + return new File(MKVToolProperties.getInstance().getMkvmergePath()).isFile() && new File(MKVToolProperties.getInstance().getMkvpropeditPath()).isFile(); } } diff --git a/src/main/java/config/CustomOutputStream.java b/src/main/java/config/CustomOutputStream.java deleted file mode 100644 index f6d5db2..0000000 --- a/src/main/java/config/CustomOutputStream.java +++ /dev/null @@ -1,21 +0,0 @@ -package config; - -import javax.swing.*; -import java.io.IOException; -import java.io.OutputStream; - -public class CustomOutputStream extends OutputStream { - private JTextArea textArea; - - public CustomOutputStream(JTextArea textArea) { - this.textArea = textArea; - } - - @Override - public void write(int b) throws IOException { - // redirects data to the text area - textArea.append(String.valueOf((char) b)); - // scrolls the text area to the end of data - textArea.setCaretPosition(textArea.getDocument().getLength()); - } -} diff --git a/src/main/java/query/QueryBuilder.java b/src/main/java/query/QueryBuilder.java deleted file mode 100644 index dd51991..0000000 --- a/src/main/java/query/QueryBuilder.java +++ /dev/null @@ -1,160 +0,0 @@ -package query; - -import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; -import at.pcgamingfreaks.yaml.YAML; -import at.pcgamingfreaks.yaml.YamlInvalidContentException; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.log4j.Log4j2; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -@Log4j2 -public class QueryBuilder { - private final ObjectMapper mapper = new ObjectMapper(); - - public QueryBuilder() { - } - - public boolean executeUpdateOnAllFiles(String path) { - List allFilePaths = getAllFilesFromDirectory(path); - if(allFilePaths == null){ - log.error("Couldn't process path!"); - return false; - } - for(String filePath : allFilePaths){ - updateAttributes(filePath, queryAttributes(filePath)); - } - return true; - } - - private List getAllFilesFromDirectory(String path) { - try(Stream paths = Files.walk(Paths.get(path))){ - return paths - .filter(Files::isRegularFile) - .map(file -> file.toAbsolutePath().toString()) - .collect(Collectors.toList()); - }catch(IOException e){ - log.error("Couldn't find file or directory!", e); - } - return null; - } - - private List queryAttributes(String path) { - Map jsonMap; - List fileAttributes = new ArrayList<>(); - try(InputStream inputStream = Runtime.getRuntime().exec("\"" + MKVToolProperties.getInstance().getMkvmergePath() + "\" --identify --identification-format json \"" + path + "\"").getInputStream()){ - jsonMap = mapper.readValue(inputStream, Map.class); - List> tracks = (List>) jsonMap.get("tracks"); - - for(Map attribute : tracks){ - if(! "video".equals(attribute.get("type"))){ - Map properties = (Map) 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"), - (String) attribute.get("type"))); - } - } - }catch(IOException e){ - log.error("File could not be found or loaded!"); - } - return fileAttributes; - } - - private void updateAttributes(String path, List fileAttributes) { - - YAML yaml; - List subtitles = null; - List audios = null; - - try{ - yaml = new YAML(new File("./src/main/resources/config.yaml")); - subtitles = yaml.getStringList("subtitle", null); - audios = yaml.getStringList("audio", null); - - - if(fileAttributes.size() > 2 && subtitles != null && audios != null){ - - - int oldAudioDefault = - 1; - int oldSubtitleDefault = - 1; - int audioDefault = - 1; - int subtitleDefault = - 1; - int subtitleIndex = - 1; - int audioIndex = - 1; - - for(FileAttribute attribute : fileAttributes){ - if(subtitles.contains(attribute.getLanguage()) && "subtitles".equals(attribute.getType())){ - for(int i = 0; i < subtitles.size(); i++){ - if(subtitles.get(i).equals(attribute.getLanguage())){ - if(subtitleIndex == - 1 || i < subtitleIndex){ - subtitleIndex = i; - subtitleDefault = attribute.getId(); - } - } - } - } - if(audios.contains(attribute.getLanguage()) && "audio".equals(attribute.getType())){ - for(int i = 0; i < audios.size(); i++){ - if(audios.get(i).equals(attribute.getLanguage())){ - if(audioIndex == - 1 || i < audioIndex){ - audioIndex = i; - audioDefault = attribute.getId(); - } - } - } - } - - if(attribute.isDefaultTrack() && "audio".equals(attribute.getType())){ - oldAudioDefault = attribute.getId(); - } - if(attribute.isDefaultTrack() && "subtitles".equals(attribute.getType())){ - oldSubtitleDefault = attribute.getId(); - } - } - if(oldAudioDefault == audioDefault && oldSubtitleDefault == subtitleDefault){ - return; - } - if(audioIndex != 0){ - subtitleDefault = oldSubtitleDefault; - } - - StringBuilder stringBuffer = new StringBuilder("\""); - stringBuffer.append(MKVToolProperties.getInstance().getMkvpropeditPath()); - stringBuffer.append("\" \"").append(path).append("\" "); - stringBuffer.append("--edit track:").append(oldSubtitleDefault).append(" --set flag-default=0 "); - stringBuffer.append("--edit track:").append(oldAudioDefault).append(" --set flag-default=0 "); - stringBuffer.append("--edit track:").append(subtitleDefault).append(" --set flag-default=1 "); - stringBuffer.append("--edit track:").append(audioDefault).append(" --set flag-default=1 "); - - try{ - Runtime.getRuntime().exec(stringBuffer.toString()); - }catch(IOException e){ - log.error("Couldn't make changes to file"); - - } - log.info("Success: " + path); - - }else{ - log.info("There were not enough lines provided to make any changes to the file"); - } - }catch(YamlInvalidContentException | IOException e){ - log.error("Failure: " + path); - log.error(e.getMessage()); - } - } -} diff --git a/src/test/java/MainTest.java b/src/test/java/MainTest.java deleted file mode 100644 index 895a398..0000000 --- a/src/test/java/MainTest.java +++ /dev/null @@ -1,3 +0,0 @@ -public class MainTest { - -} diff --git a/src/test/java/config/MKVToolPropertiesTest.java b/src/test/java/config/MKVToolPropertiesTest.java deleted file mode 100644 index eff1fdf..0000000 --- a/src/test/java/config/MKVToolPropertiesTest.java +++ /dev/null @@ -1,78 +0,0 @@ -package config; - -import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties; -import lombok.extern.log4j.Log4j2; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -@Log4j2 -public class MKVToolPropertiesTest { - - @Test - public void testPathIsValid() { - try(PrintWriter out = new PrintWriter("mkvDirectoryPath", "UTF-8")){ - out.print("src/test/resources"); - }catch(FileNotFoundException | UnsupportedEncodingException e){ - log.error("File not found!"); - } - MKVToolProperties.getInstance().defineMKVToolNixPath(); - assertEquals("src/test/resources\\mkvmerge.exe", MKVToolProperties.getInstance().getMkvmergePath()); - - try(PrintWriter out = new PrintWriter("mkvDirectoryPath", "UTF-8")){ - out.print("src/test/resources/"); - }catch(FileNotFoundException | UnsupportedEncodingException e){ - log.error("File not found!"); - } - MKVToolProperties.getInstance().defineMKVToolNixPath(); - assertEquals("src/test/resources/mkvmerge.exe", MKVToolProperties.getInstance().getMkvmergePath()); - } - - @Test - public void testCheckForSeparator() { - try(PrintWriter out = new PrintWriter("mkvDirectoryPath", "UTF-8")){ - out.print("src/test/resources"); - }catch(FileNotFoundException | UnsupportedEncodingException e){ - log.error("File not found!"); - } - MKVToolProperties.getInstance().defineMKVToolNixPath(); - assertTrue(MKVToolProperties.getInstance().getDirectoryPath().endsWith("/") || MKVToolProperties.getInstance().getDirectoryPath().endsWith("\\")); - - try(PrintWriter out = new PrintWriter("mkvDirectoryPath", "UTF-8")){ - out.print("src/test/resources/"); - }catch(FileNotFoundException | UnsupportedEncodingException e){ - log.error("File not found!"); - } - MKVToolProperties.getInstance().defineMKVToolNixPath(); - assertTrue(MKVToolProperties.getInstance().getDirectoryPath().endsWith("/") || MKVToolProperties.getInstance().getDirectoryPath().endsWith("\\")); - - try(PrintWriter out = new PrintWriter("mkvDirectoryPath", "UTF-8")){ - out.print("src\\test\\resources"); - }catch(FileNotFoundException | UnsupportedEncodingException e){ - log.error("File not found!"); - } - MKVToolProperties.getInstance().defineMKVToolNixPath(); - assertTrue(MKVToolProperties.getInstance().getDirectoryPath().endsWith("/") || MKVToolProperties.getInstance().getDirectoryPath().endsWith("\\")); - - try(PrintWriter out = new PrintWriter("mkvDirectoryPath", "UTF-8")){ - out.print("src\\test\\resources\\"); - }catch(FileNotFoundException | UnsupportedEncodingException e){ - log.error("File not found!"); - } - MKVToolProperties.getInstance().defineMKVToolNixPath(); - assertTrue(MKVToolProperties.getInstance().getDirectoryPath().endsWith("/") || MKVToolProperties.getInstance().getDirectoryPath().endsWith("\\")); - } - - @AfterEach - public void afterAll() { - File file = new File("mkvDirectoryPath"); - file.delete(); - } -} From ee019ec12115657ab476b09d80c1f3670ef40dea Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Thu, 4 Jun 2020 01:54:03 +0200 Subject: [PATCH 06/38] [ADDED] First README & [FIX] path checking --- README.md | 20 +++++++++++++++++++ .../AttributeUpdaterKernel.java | 4 ++-- .../mkvaudiosubtitlechanger/Main.java | 3 +++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e69de29..0ef14e1 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,20 @@ +config.yml example: + +``` +mkvtoolnixPath: /usr/bin +config: + 1: + audio: + - jpn + subtitle: + - ger + - eng + 2: + audio: + - ger + - eng + subtitle: + - OFF +``` +Config file needs to be placed in the same directory as the jar. + diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index 9c1f5ef..fc29326 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -18,7 +18,7 @@ public class AttributeUpdaterKernel { public void execute(String path) { List configPattern = ConfigUtil.loadConfig(); List allValidPaths = collector.loadFiles(path); - if(! allValidPaths.isEmpty()){ + if(! allValidPaths.isEmpty() && configPattern != null){ for(File file : allValidPaths){ List attributes = collector.loadAttributes(file); for(AttributeConfig config : configPattern){ @@ -32,7 +32,7 @@ public class AttributeUpdaterKernel { } } }else{ - log.error("Path is not valid!"); + log.error("Path is not valid or config has errors!"); } } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index 0509f99..06ad776 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -22,6 +22,9 @@ public class Main { private static boolean checkIfMKVToolNixIsValid() { try{ String path = new YAML(new File("config.yml")).getString("mkvtoolnixPath"); + if(! path.endsWith(File.separator)){ + path += File.separator; + } MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge"); MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvproperties"); }catch(YamlKeyNotFoundException | IOException | YamlInvalidContentException e){ From 58bdf1d1d4f903a30b2ba18cad79c6b689047173 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Thu, 4 Jun 2020 13:34:44 +0200 Subject: [PATCH 07/38] [UPDATE] README.md --- README.md | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ef14e1..d572a85 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,27 @@ -config.yml example: +###Table of content + - Introduction + - Requirements + - Running + - config.yml example + +###Introduction + +This program helps changing audio and subtitle lines of mkv files. + +###Requirements + + - Java 8 or higher + - mkvtoolnix installation + +###Running + +Opening terminal / cmd in the directory of the jar and the config file and execute following command: + +`java -jar mkvaudiosubtitleschanger.jar [path to mkv or dir with mkv]` + +You have to replace the brackets and the content of it with the path to your mkv file or the directory with mkv files. + +###config.yml example: ``` mkvtoolnixPath: /usr/bin From aebc89fcaeb2e3e2c5c576e56828ba4584a47eb7 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Thu, 4 Jun 2020 15:24:58 +0200 Subject: [PATCH 08/38] [FIX] README.md headlines --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d572a85..e504830 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ -###Table of content +### Table of content - Introduction - Requirements - Running - config.yml example -###Introduction +### Introduction This program helps changing audio and subtitle lines of mkv files. -###Requirements +### Requirements - Java 8 or higher - mkvtoolnix installation -###Running +### Running Opening terminal / cmd in the directory of the jar and the config file and execute following command: @@ -21,7 +21,7 @@ Opening terminal / cmd in the directory of the jar and the config file and execu You have to replace the brackets and the content of it with the path to your mkv file or the directory with mkv files. -###config.yml example: +### config.yml example: ``` mkvtoolnixPath: /usr/bin From 79fa6de19095b695f37ab6c90281827e6eba7557 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Thu, 4 Jun 2020 23:07:32 +0200 Subject: [PATCH 09/38] [FIX] Linux compatibility --- config.yaml | 1 + pom.xml | 8 +++++++ .../AttributeUpdaterKernel.java | 8 +++++-- .../mkvaudiosubtitlechanger/Main.java | 11 ++++++--- .../config/ConfigProcessor.java | 15 ++++++++---- .../intimpl/MkvFileCollector.java | 23 ++++++++++++++----- 6 files changed, 51 insertions(+), 15 deletions(-) diff --git a/config.yaml b/config.yaml index 37c82cc..9809263 100644 --- a/config.yaml +++ b/config.yaml @@ -1,3 +1,4 @@ +mkvtoolnixPath: /usr/bin config: 1: audio: diff --git a/pom.xml b/pom.xml index be5b0bc..e62cc98 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,14 @@ maven-surefire-plugin 2.22.2 + + org.apache.maven.plugins + maven-compiler-plugin + + 9 + 9 + + diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index fc29326..4a0e9e4 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -18,18 +18,22 @@ public class AttributeUpdaterKernel { public void execute(String path) { List configPattern = ConfigUtil.loadConfig(); List allValidPaths = collector.loadFiles(path); - if(! allValidPaths.isEmpty() && configPattern != null){ + if(allValidPaths != null && configPattern != null){ for(File file : allValidPaths){ List attributes = collector.loadAttributes(file); + boolean fileHasChanged = false; for(AttributeConfig config : configPattern){ /* * Creating new ArrayList, because the method removes elements from the list by reference */ - boolean fileHasChanged = new ConfigProcessor(config).processConfig(file, new ArrayList<>(attributes)); + fileHasChanged = new ConfigProcessor(config).processConfig(file, new ArrayList<>(attributes)); if(fileHasChanged){ break; } } + if(! fileHasChanged){ + log.info(file.getName() + " didn't change!"); + } } }else{ log.error("Path is not valid or config has errors!"); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index 06ad776..ea645a3 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -21,12 +21,17 @@ public class Main { private static boolean checkIfMKVToolNixIsValid() { try{ - String path = new YAML(new File("config.yml")).getString("mkvtoolnixPath"); + String path = new YAML(new File("config.yaml")).getString("mkvtoolnixPath"); if(! path.endsWith(File.separator)){ path += File.separator; } - MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge"); - MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvproperties"); + if(System.getProperty("os.name").toLowerCase().contains("windows")){ + MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge.exe"); + MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvpropedit.exe"); + }else{ + MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge"); + MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvpropedit"); + } }catch(YamlKeyNotFoundException | IOException | YamlInvalidContentException e){ e.printStackTrace(); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java index 9efd6e6..9e226bc 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java @@ -84,9 +84,15 @@ public class ConfigProcessor { * @return if the the current file was updated or not. Returns true if the file already has the correct metadata set */ private boolean updateFile(File file, List attributes, TransferObject transfer) { - StringBuilder stringBuffer = new StringBuilder("\""); - stringBuffer.append(MKVToolProperties.getInstance().getMkvpropeditPath()); - stringBuffer.append("\" \"").append(file.getAbsolutePath()).append("\" "); + StringBuilder stringBuffer = new StringBuilder(); + if(System.getProperty("os.name").toLowerCase().contains("windows")){ + stringBuffer.append("\""); + stringBuffer.append(MKVToolProperties.getInstance().getMkvpropeditPath()); + stringBuffer.append("\" \"").append(file.getAbsolutePath()).append("\" "); + }else{ + stringBuffer.append(MKVToolProperties.getInstance().getMkvpropeditPath()); + stringBuffer.append(" ").append(file.getAbsolutePath()).append(" "); + } if(audioDefault != - 1){ stringBuffer.append("--edit track:=").append(audioDefault).append(" --set flag-default=0 "); } @@ -106,18 +112,19 @@ public class ConfigProcessor { * In this case the file would be change to the exact same audio and subtitle lines and we want to * avoid unnecessary changes to the file */ + log.info(file.getName() + " already fits config!"); return true; } try{ Runtime.getRuntime().exec(stringBuffer.toString()); }catch(IOException e){ log.error("Couldn't make changes to file"); - } /* * We return true even if there was an error. If there was an error, the chances that this file is still * busy later. */ + log.info(file.getName() + " was updated"); return true; }else{ return false; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java index 3b43e44..8e56e10 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java @@ -56,14 +56,24 @@ public class MkvFileCollector implements FileCollector { public List loadAttributes(File file) { Map jsonMap; List fileAttributes = new ArrayList<>(); - System.out.println("\"" + MKVToolProperties.getInstance().getMkvmergePath() - + "\" --identify --identification-format json \"" + file.getAbsolutePath() + "\""); - try(InputStream inputStream = - Runtime.getRuntime().exec("\"" + MKVToolProperties.getInstance().getMkvmergePath() - + "\" --identify --identification-format json \"" + file.getAbsolutePath() + "\"").getInputStream()){ + try{ + String command = ""; + if(System.getProperty("os.name").toLowerCase().contains("windows")){ + command = "\"" + MKVToolProperties.getInstance().getMkvmergePath() + "\""; + }else{ + command = MKVToolProperties.getInstance().getMkvmergePath(); + } + String[] array = new String[]{ + command, + "--identify", + "--identification-format", + "json", + file.getAbsoluteFile().toString() + }; + + InputStream inputStream = Runtime.getRuntime().exec(array).getInputStream(); jsonMap = mapper.readValue(inputStream, Map.class); List> tracks = (List>) jsonMap.get("tracks"); - for(Map attribute : tracks){ if(! "video".equals(attribute.get("type"))){ Map properties = (Map) attribute.get("properties"); @@ -77,6 +87,7 @@ public class MkvFileCollector implements FileCollector { } } }catch(IOException e){ + e.printStackTrace(); log.error("File could not be found or loaded!"); } return fileAttributes; From 03c58d27ed4d70b4bd5094157a7eff3ea4813962 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Sat, 6 Jun 2020 13:19:36 +0200 Subject: [PATCH 10/38] [UPDATE] README.md --- README.md | 9 ++++++--- pom.xml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e504830..b8309ac 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,8 @@ Opening terminal / cmd in the directory of the jar and the config file and execu You have to replace the brackets and the content of it with the path to your mkv file or the directory with mkv files. -### config.yml example: +### config.yml example +Config file needs to be placed in the same directory as the jar. ``` mkvtoolnixPath: /usr/bin @@ -39,5 +40,7 @@ config: subtitle: - OFF ``` -Config file needs to be placed in the same directory as the jar. - +This config will first check if there is japanese audio and german or english subtitles available, if yes, +it will set these attributes. If these are not available, it will check the second part. This means, it checks +if german or english audio is available. It does not care for the subtitle, because it's "off", which means, it +will disable subtitles in this case. diff --git a/pom.xml b/pom.xml index e62cc98..c1df755 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ MKVAudioSubtilesChanger MKVAudioSubtitlesChanger - 1.0-SNAPSHOT + 1.0 clean package From 9775be153b88ddef6a20743aa9438d8dbedbe916 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 16:58:21 +0000 Subject: [PATCH 11/38] Bump jackson-databind from 2.9.10.4 to 2.10.0.pr1 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.4 to 2.10.0.pr1. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1df755..2700403 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.10.4 + 2.10.0.pr1 From a41895df1b5e45caeac1be85b6293eafe9a33bcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 19:23:34 +0000 Subject: [PATCH 12/38] Bump log4j-core from 2.12.0 to 2.13.2 Bumps log4j-core from 2.12.0 to 2.13.2. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2700403..012f1f3 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ org.apache.logging.log4j log4j-core - 2.12.0 + 2.13.2 org.apache.logging.log4j From 1ed1b6e05767b6d5096ef28a693d341381971459 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 00:59:52 +0000 Subject: [PATCH 13/38] Bump log4j-api from 2.12.0 to 2.15.0 Bumps log4j-api from 2.12.0 to 2.15.0. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 012f1f3..8edb65b 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.apache.logging.log4j log4j-api - 2.12.0 + 2.15.0 org.apache.logging.log4j From ecbfc77da0a0729ef5013ba03e9f67c1e762218e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 01:26:51 +0000 Subject: [PATCH 14/38] Bump log4j-core from 2.13.2 to 2.15.0 Bumps log4j-core from 2.13.2 to 2.15.0. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 012f1f3..3abab9b 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.15.0 org.apache.logging.log4j From bba612476b25e2405a349c850db5d1d013fc96a0 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Wed, 23 Feb 2022 00:16:14 +0100 Subject: [PATCH 15/38] Update dependencies & fix null pointer exception when file has missing properties or none at all --- pom.xml | 10 +++---- .../AttributeUpdaterKernel.java | 3 ++ .../intimpl/MkvFileCollector.java | 30 +++++++++++-------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 2785ca1..aaa762f 100644 --- a/pom.xml +++ b/pom.xml @@ -106,17 +106,17 @@ org.apache.logging.log4j log4j-api - 2.15.0 + 2.17.1 org.apache.logging.log4j log4j-core - 2.15.0 + 2.17.1 org.apache.logging.log4j log4j-slf4j-impl - 2.12.0 + 2.17.1 org.slf4j @@ -137,12 +137,12 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.9.9 + 2.13.1 com.fasterxml.jackson.core jackson-databind - 2.10.0.pr1 + 2.13.1 diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index 4a0e9e4..95a04c3 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -21,6 +21,9 @@ public class AttributeUpdaterKernel { if(allValidPaths != null && configPattern != null){ for(File file : allValidPaths){ List attributes = collector.loadAttributes(file); + if (attributes.isEmpty()) { + continue; + } boolean fileHasChanged = false; for(AttributeConfig config : configPattern){ /* diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java index 8e56e10..52e86be 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java @@ -28,22 +28,22 @@ public class MkvFileCollector implements FileCollector { @Override public List 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() {{ add(file); }}; - }else if(file.isDirectory()){ - try(Stream paths = Files.walk(Paths.get(path))){ + } else if (file.isDirectory()) { + try (Stream 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 loadAttributes(File file) { Map jsonMap; List 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> tracks = (List>) jsonMap.get("tracks"); - for(Map 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 attribute : tracks) { + if (!"video".equals(attribute.get("type"))) { Map properties = (Map) 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!"); } From 03efab657ce996d61637c16e57969a53ba7e65ab Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Sun, 6 Mar 2022 20:02:10 +0100 Subject: [PATCH 16/38] Implement multi threading to improve throughput --- config.yaml | 4 +- pom.xml | 2 +- .../AttributeUpdaterKernel.java | 56 ++++++++++++------- .../config/ConfigProcessor.java | 14 +++-- .../util/ConfigUtil.java | 11 ++++ src/main/resources/log4j2.yaml | 8 --- 6 files changed, 59 insertions(+), 36 deletions(-) diff --git a/config.yaml b/config.yaml index 9809263..8638af4 100644 --- a/config.yaml +++ b/config.yaml @@ -1,4 +1,6 @@ -mkvtoolnixPath: /usr/bin +mkvtoolnixPath: C:\Program Files\MKVToolNix +# Only edit this value if you know what you are doing, otherwise it may impact your performance negatively +threadCount: 2 config: 1: audio: diff --git a/pom.xml b/pom.xml index aaa762f..747b179 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ MKVAudioSubtilesChanger MKVAudioSubtitlesChanger - 1.0 + 1.2 clean package diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index 95a04c3..b030b48 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -5,41 +5,57 @@ import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ConfigProcessor; import at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl.MkvFileCollector; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ConfigUtil; +import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; import java.io.File; -import java.util.ArrayList; import java.util.List; +import java.util.concurrent.*; @Log4j2 public class AttributeUpdaterKernel { MkvFileCollector collector = new MkvFileCollector(); + int filesChangedAmount = 0; + int filesNotChangedAmount = 0; + long runtime = 0; + @SneakyThrows public void execute(String path) { List configPattern = ConfigUtil.loadConfig(); List allValidPaths = collector.loadFiles(path); + ExecutorService executor = Executors.newFixedThreadPool(ConfigUtil.getThreadCount()); + + long beforeTimer = System.currentTimeMillis(); if(allValidPaths != null && configPattern != null){ - for(File file : allValidPaths){ - List attributes = collector.loadAttributes(file); - if (attributes.isEmpty()) { - continue; - } - boolean fileHasChanged = false; - for(AttributeConfig config : configPattern){ - /* - * Creating new ArrayList, because the method removes elements from the list by reference - */ - fileHasChanged = new ConfigProcessor(config).processConfig(file, new ArrayList<>(attributes)); - if(fileHasChanged){ - break; - } - } - if(! fileHasChanged){ - log.info(file.getName() + " didn't change!"); - } - } + System.out.print("Running"); + allValidPaths.forEach(file -> executor.submit(() -> process(configPattern, file))); }else{ log.error("Path is not valid or config has errors!"); } + executor.shutdown(); + executor.awaitTermination(1, TimeUnit.DAYS); + runtime = System.currentTimeMillis() - beforeTimer; + + System.out.printf("%nFiles changed: %s%n", filesChangedAmount); + System.out.printf("Files not changed: %s%n", filesNotChangedAmount); + System.out.printf("Runtime: %ss%n", runtime / 1000); + } + + private void process(List configPattern, File file) { + List attributes = collector.loadAttributes(file); + boolean fileHasChanged = false; + + if (attributes.isEmpty()) return; + for(AttributeConfig config : configPattern){ + fileHasChanged = new ConfigProcessor(config).processConfig(file, attributes); + if(fileHasChanged) break; + } + if(!fileHasChanged){ + log.info("File didn't change: {}", file.getName()); + filesNotChangedAmount++; + } else { + filesChangedAmount++; + } + System.out.print("."); } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java index 9e226bc..137adf2 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java @@ -8,6 +8,7 @@ import lombok.extern.log4j.Log4j2; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -31,10 +32,11 @@ public class ConfigProcessor { public boolean processConfig(File file, List attributes) { // check if size is bigger or equal 2 to make sure that there is at least one audio and subtitle line // TODO: implement empty audio or subtitle line - if(attributes.size() >= 2){ - TransferObject transfer = filterAttributes(attributes); - if(! attributes.isEmpty()){ - return updateFile(file, attributes, transfer); + List attributesCopy = new ArrayList<>(attributes); + if(attributesCopy.size() >= 2){ + TransferObject transfer = filterAttributes(attributesCopy); + if(! attributesCopy.isEmpty()){ + return updateFile(file, attributesCopy, transfer); } } return false; @@ -112,7 +114,7 @@ public class ConfigProcessor { * In this case the file would be change to the exact same audio and subtitle lines and we want to * avoid unnecessary changes to the file */ - log.info(file.getName() + " already fits config!"); + log.info("File already fits config: {}", file.getName()); return true; } try{ @@ -124,7 +126,7 @@ public class ConfigProcessor { * We return true even if there was an error. If there was an error, the chances that this file is still * busy later. */ - log.info(file.getName() + " was updated"); + log.info("Updated {}", file.getName()); return true; }else{ return false; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java index d2192bd..6aa7956 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java @@ -37,4 +37,15 @@ public class ConfigUtil { return null; } } + + public static int getThreadCount() { + try { + return Integer.parseInt(new YAML(new File("config.yaml")).getString("threadCount")); + } catch (YamlInvalidContentException | IOException e) { + e.printStackTrace(); + } catch (YamlKeyNotFoundException e) { + throw new RuntimeException(e); + } + return 1; + } } diff --git a/src/main/resources/log4j2.yaml b/src/main/resources/log4j2.yaml index 6355c6c..14026cc 100644 --- a/src/main/resources/log4j2.yaml +++ b/src/main/resources/log4j2.yaml @@ -1,12 +1,6 @@ Configuration: name: DefaultLogger Appenders: - Console: - name: Console_Out - PatternLayout: - Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable" - ThresholdFilter: - level: debug File: name: FileAppender fileName: default.log @@ -18,11 +12,9 @@ Configuration: Root: level: debug AppenderRef: - - ref: Console_Out - ref: FileAppender Logger: name: "com.zaxxer.hikari.HikariConfig" level: info AppenderRef: - - ref: Console_Out - ref: FileAppender \ No newline at end of file From f2fb296698bd48db109f5842ba66ce510c79d68e Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Thu, 17 Mar 2022 18:58:05 +0100 Subject: [PATCH 17/38] Make use of String.format --- .../config/ConfigProcessor.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java index 137adf2..82d2972 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java @@ -12,6 +12,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import static java.lang.String.format; + @Log4j2 public class ConfigProcessor { private int audioDefault = - 1; @@ -83,31 +85,32 @@ public class ConfigProcessor { * * @param file is the file, which will be updated * @param attributes has the metadata for the transferred file - * @return if the the current file was updated or not. Returns true if the file already has the correct metadata set + * @return if the current file was updated or not. Returns true if the file already has the correct metadata set */ private boolean updateFile(File file, List attributes, TransferObject transfer) { StringBuilder stringBuffer = new StringBuilder(); if(System.getProperty("os.name").toLowerCase().contains("windows")){ - stringBuffer.append("\""); - stringBuffer.append(MKVToolProperties.getInstance().getMkvpropeditPath()); - stringBuffer.append("\" \"").append(file.getAbsolutePath()).append("\" "); + stringBuffer.append(format("\"%s\" \"%s\" ", + MKVToolProperties.getInstance().getMkvpropeditPath(), + file.getAbsolutePath())); }else{ - stringBuffer.append(MKVToolProperties.getInstance().getMkvpropeditPath()); - stringBuffer.append(" ").append(file.getAbsolutePath()).append(" "); + stringBuffer.append(format("%s %s ", + MKVToolProperties.getInstance().getMkvpropeditPath(), + file.getAbsolutePath())); } if(audioDefault != - 1){ - stringBuffer.append("--edit track:=").append(audioDefault).append(" --set flag-default=0 "); + stringBuffer.append(format("--edit track:=%s --set flag-default=0 ", audioDefault)); } if(subtitleDefault != - 1){ - stringBuffer.append("--edit track:=").append(subtitleDefault).append(" --set flag-default=0 "); + stringBuffer.append(format("--edit track:=%s --set flag-default=0 ", subtitleDefault)); } collectLines(attributes, transfer); if(transfer.isValid){ if(transfer.isAudioOn){ - stringBuffer.append("--edit track:=").append(transfer.getAudioIndex()).append(" --set flag-default=1 "); + stringBuffer.append(format("--edit track:=%s --set flag-default=1 ", transfer.getAudioIndex())); } if(transfer.isSubtitleOn){ - stringBuffer.append("--edit track:=").append(transfer.getSubtitleIndex()).append(" --set flag-default=1 "); + stringBuffer.append(format("--edit track:=%s --set flag-default=1 ", transfer.getSubtitleIndex())); } if(subtitleDefault == transfer.getSubtitleIndex() && audioDefault == transfer.getAudioIndex()){ /* From feaeda746a814fbbd3cba1f6c15dffa8a7ee4513 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Sun, 20 Mar 2022 20:49:34 +0100 Subject: [PATCH 18/38] Implement cli parameter basis --- pom.xml | 5 + .../AttributeUpdaterKernel.java | 4 +- .../mkvaudiosubtitlechanger/Main.java | 48 +++++++--- .../config/AttributeConfig.java | 10 ++ .../intimpl/MkvFileCollector.java | 7 +- .../util/ConfigUtil.java | 96 ++++++++++++++----- .../util/MkvToolNix.java | 17 ++++ 7 files changed, 148 insertions(+), 39 deletions(-) create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/MkvToolNix.java diff --git a/pom.xml b/pom.xml index 747b179..fc17d43 100644 --- a/pom.xml +++ b/pom.xml @@ -144,6 +144,11 @@ jackson-databind 2.13.1 + + commons-cli + commons-cli + 1.5.0 + diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index b030b48..3f36952 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -21,9 +21,9 @@ public class AttributeUpdaterKernel { @SneakyThrows public void execute(String path) { - List configPattern = ConfigUtil.loadConfig(); + List configPattern = ConfigUtil.getInstance().getAttributeConfig(); List allValidPaths = collector.loadFiles(path); - ExecutorService executor = Executors.newFixedThreadPool(ConfigUtil.getThreadCount()); + ExecutorService executor = Executors.newFixedThreadPool(ConfigUtil.getInstance().getThreadCount()); long beforeTimer = System.currentTimeMillis(); if(allValidPaths != null && configPattern != null){ diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index ea645a3..78c1f2c 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -1,40 +1,66 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ConfigUtil; import at.pcgamingfreaks.yaml.YAML; import at.pcgamingfreaks.yaml.YamlInvalidContentException; import at.pcgamingfreaks.yaml.YamlKeyNotFoundException; import lombok.extern.log4j.Log4j2; +import org.apache.commons.cli.*; import java.io.File; import java.io.IOException; +import static java.lang.Integer.parseInt; + @Log4j2 public class Main { public static void main(String[] args) { - if(checkIfMKVToolNixIsValid()){ - AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(); - kernel.execute(args[0]); - }else{ - log.error("MKVToolNix was not found! Please recheck path"); - } + System.out.println(String.join(", ", args)); + initConfig(args); + AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(); + kernel.execute(ConfigUtil.getInstance().getLibraryPath()); } private static boolean checkIfMKVToolNixIsValid() { - try{ + try { String path = new YAML(new File("config.yaml")).getString("mkvtoolnixPath"); - if(! path.endsWith(File.separator)){ + if (!path.endsWith(File.separator)) { path += File.separator; } - if(System.getProperty("os.name").toLowerCase().contains("windows")){ + if (System.getProperty("os.name").toLowerCase().contains("windows")) { MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge.exe"); MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvpropedit.exe"); - }else{ + } else { MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge"); MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvpropedit"); } - }catch(YamlKeyNotFoundException | IOException | YamlInvalidContentException e){ + } catch (YamlKeyNotFoundException | IOException | YamlInvalidContentException e) { e.printStackTrace(); } return new File(MKVToolProperties.getInstance().getMkvmergePath()).isFile() && new File(MKVToolProperties.getInstance().getMkvpropeditPath()).isFile(); } + + private static void initConfig(String[] args) { + Options options = new Options(); + options.addOption("h", "help", false, "\"for help this is\" - Yoda"); + options.addRequiredOption("l", "library", true, "path to library"); + options.addOption("c", "config", false, "path to config"); + options.addOption("t", "threads", true, "thread count"); + + CommandLineParser parser = new DefaultParser(); + HelpFormatter formatter = new HelpFormatter(); + try { + CommandLine cmd = parser.parse(options, args); + + ConfigUtil configUtil = ConfigUtil.getInstance(); + configUtil.loadConfig(cmd.getOptionValue("config", "config.yaml")); // use cmd input + configUtil.setLibraryPath(cmd.getOptionValue("library")); + if (cmd.hasOption("threads")) configUtil.setThreadCount(parseInt(cmd.getOptionValue("threads"))); + configUtil.isValid(); + } catch (ParseException e) { + log.error(e); + formatter.printHelp("java -jar MKVAudioSubtitlesChanger.jar -p ", options); + System.exit(1); + } + } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfig.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfig.java index 729e82a..200ea6c 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfig.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfig.java @@ -4,6 +4,7 @@ import lombok.Getter; import lombok.extern.log4j.Log4j2; import java.util.List; +import java.util.stream.Collectors; @Log4j2 @Getter @@ -15,4 +16,13 @@ public class AttributeConfig { this.audio = audio; this.subtitle = subtitle; } + + @Override + public String toString() { + final StringBuffer sb = new StringBuffer("AttributeConfig{"); + sb.append("audio=").append(String.join(", ", audio)); + sb.append(", subtitle=").append(String.join(", ", subtitle)); + sb.append('}'); + return sb.toString(); + } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java index 52e86be..3ef774f 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java @@ -1,7 +1,8 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ConfigUtil; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.MkvToolNix; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.log4j.Log4j2; @@ -59,9 +60,9 @@ public class MkvFileCollector implements FileCollector { try { String command = ""; if (System.getProperty("os.name").toLowerCase().contains("windows")) { - command = "\"" + MKVToolProperties.getInstance().getMkvmergePath() + "\""; + command = "\"" + ConfigUtil.getInstance().getPathFor(MkvToolNix.MKV_MERGER) + "\""; } else { - command = MKVToolProperties.getInstance().getMkvmergePath(); + command = ConfigUtil.getInstance().getPathFor(MkvToolNix.MKV_MERGER); } String[] array = new String[]{ command, diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java index 6aa7956..32ff212 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java @@ -4,6 +4,9 @@ import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.AttributeConfig; import at.pcgamingfreaks.yaml.YAML; import at.pcgamingfreaks.yaml.YamlInvalidContentException; import at.pcgamingfreaks.yaml.YamlKeyNotFoundException; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import lombok.extern.log4j.Log4j2; import java.io.File; @@ -12,40 +15,87 @@ import java.util.List; import java.util.stream.Collectors; @Log4j2 +@Getter +@Setter public class ConfigUtil { - public static List loadConfig() { - try(YAML yaml = new YAML(new File("config.yaml"))){ - return yaml.getKeysFiltered(".*audio.*").stream() - .sorted() - .map(elem -> elem.replace(".audio", "")) - .map(elem -> createAttributeConfig(elem, yaml)) - .collect(Collectors.toList()); - }catch(YamlInvalidContentException | IOException e){ - log.fatal("Config could not be loaded"); - e.printStackTrace(); + @Getter(AccessLevel.NONE) + @Setter(AccessLevel.NONE) + private static ConfigUtil configUtil = null; + + private List attributeConfig; + private int threadCount; + @Getter(AccessLevel.NONE) + private String mkvtoolnixPath; + private String libraryPath; + + public static ConfigUtil getInstance() { + if(configUtil == null) { + configUtil = new ConfigUtil(); } - return null; + return configUtil; } - private static AttributeConfig createAttributeConfig(String key, YAML yaml) { + public void isValid() throws RuntimeException{ + System.out.println(attributeConfig); + System.out.println(threadCount); + System.out.println(mkvtoolnixPath); + System.out.println(libraryPath); + if (attributeConfig != null && !attributeConfig.isEmpty() + && threadCount > 0 && !mkvtoolnixPath.isEmpty() + && new File(getPathFor(MkvToolNix.MKV_MERGER)).isFile() + && new File(getPathFor(MkvToolNix.MKV_PROP_EDIT)).isFile()) { + return; + } + throw new RuntimeException("Invalid configuration"); + } + + public void loadConfig(String configPath) { + try(YAML config = new YAML(new File(configPath))){ + setAttributeConfig(loadAttributeConfig(config)); + setThreadCount(loadThreadCount(config)); + setMkvtoolnixPath(loadMkvToolNixPath(config)); + }catch(YamlInvalidContentException | YamlKeyNotFoundException | IOException e){ + log.fatal("Config could not be loaded: {}", e.getMessage()); + } + } + + private List loadAttributeConfig(YAML config) { + return config.getKeysFiltered(".*audio.*").stream() + .sorted() + .map(elem -> elem.replace(".audio", "")) + .map(elem -> createAttributeConfig(elem, config)) + .collect(Collectors.toList()); + } + + private AttributeConfig createAttributeConfig(String key, YAML config) { try{ return new AttributeConfig( - yaml.getStringList(key + ".audio"), - yaml.getStringList(key + ".subtitle")); + config.getStringList(key + ".audio"), + config.getStringList(key + ".subtitle")); }catch(YamlKeyNotFoundException e){ e.printStackTrace(); return null; } } - public static int getThreadCount() { - try { - return Integer.parseInt(new YAML(new File("config.yaml")).getString("threadCount")); - } catch (YamlInvalidContentException | IOException e) { - e.printStackTrace(); - } catch (YamlKeyNotFoundException e) { - throw new RuntimeException(e); - } - return 1; + private int loadThreadCount(YAML config) throws YamlKeyNotFoundException{ + return config.isSet("threadCount") + ? Integer.parseInt(config.getString("threadCount")) + : 1; + } + + private String loadMkvToolNixPath(YAML config) throws YamlKeyNotFoundException { + return config.isSet("mkvtoolnixPath") ? config.getString("mkvtoolnixPath") : defaultMkvToolNixPath(); + } + + private String defaultMkvToolNixPath() { + return System.getProperty("os.name").toLowerCase().contains("windows") + ? "C:/Program Files/MKVToolNix/" + : "/usr/bin/"; + } + + public String getPathFor(MkvToolNix exe) { + return mkvtoolnixPath.endsWith("/") ? mkvtoolnixPath + exe : mkvtoolnixPath + "/" + exe; } } + diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/MkvToolNix.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/MkvToolNix.java new file mode 100644 index 0000000..cc2eda6 --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/MkvToolNix.java @@ -0,0 +1,17 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; + +public enum MkvToolNix { + MKV_MERGER("mkvmerge.exe"), + MKV_PROP_EDIT("mkvpropedit.exe"); + + private final String file; + + MkvToolNix(String file) { + this.file = file; + } + + @Override + public String toString() { + return file; + } +} From 1df06e8a08c5f8801a7ca69302bce079d4ff2b4a Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Mon, 21 Mar 2022 23:21:15 +0100 Subject: [PATCH 19/38] Add safe-mode --- .../mkvaudiosubtitlechanger/AttributeUpdaterKernel.java | 8 ++++++-- .../at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java | 2 ++ .../mkvaudiosubtitlechanger/config/ConfigProcessor.java | 5 ++++- .../mkvaudiosubtitlechanger/util/ConfigUtil.java | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index 3f36952..4e1e05e 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -36,8 +36,12 @@ public class AttributeUpdaterKernel { executor.awaitTermination(1, TimeUnit.DAYS); runtime = System.currentTimeMillis() - beforeTimer; - System.out.printf("%nFiles changed: %s%n", filesChangedAmount); - System.out.printf("Files not changed: %s%n", filesNotChangedAmount); + System.out.printf("%nFiles %schanged: %s%n", + ConfigUtil.getInstance().isSafeMode() ? "would " : "", + filesChangedAmount); + System.out.printf("Files %s not changed: %s%n", + ConfigUtil.getInstance().isSafeMode() ? "would " : "", + filesNotChangedAmount); System.out.printf("Runtime: %ss%n", runtime / 1000); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index 78c1f2c..6afe134 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -46,6 +46,7 @@ public class Main { options.addRequiredOption("l", "library", true, "path to library"); options.addOption("c", "config", false, "path to config"); options.addOption("t", "threads", true, "thread count"); + options.addOption("s", "safe-mode", false, "Test run (no files will be changes)"); CommandLineParser parser = new DefaultParser(); HelpFormatter formatter = new HelpFormatter(); @@ -56,6 +57,7 @@ public class Main { configUtil.loadConfig(cmd.getOptionValue("config", "config.yaml")); // use cmd input configUtil.setLibraryPath(cmd.getOptionValue("library")); if (cmd.hasOption("threads")) configUtil.setThreadCount(parseInt(cmd.getOptionValue("threads"))); + configUtil.setSafeMode(cmd.hasOption("safe-mode")); configUtil.isValid(); } catch (ParseException e) { log.error(e); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java index 82d2972..bf03fa5 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java @@ -2,6 +2,7 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ConfigUtil; import lombok.Getter; import lombok.Setter; import lombok.extern.log4j.Log4j2; @@ -121,7 +122,9 @@ public class ConfigProcessor { return true; } try{ - Runtime.getRuntime().exec(stringBuffer.toString()); + if(!ConfigUtil.getInstance().isSafeMode()) { + Runtime.getRuntime().exec(stringBuffer.toString()); + } }catch(IOException e){ log.error("Couldn't make changes to file"); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java index 32ff212..53acab6 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java @@ -27,6 +27,7 @@ public class ConfigUtil { @Getter(AccessLevel.NONE) private String mkvtoolnixPath; private String libraryPath; + private boolean isSafeMode; public static ConfigUtil getInstance() { if(configUtil == null) { From a1e9031cbcd86bc2275605d4d022e844377d641f Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Wed, 23 Mar 2022 21:02:28 +0100 Subject: [PATCH 20/38] Restructure files & remove unused code & simplify few statements --- .../AttributeUpdaterKernel.java | 18 +++---- .../mkvaudiosubtitlechanger/Main.java | 47 +++++-------------- .../ConfigUtil.java => config/Config.java} | 19 ++++---- .../{config => intimpl}/ConfigProcessor.java | 13 +++-- .../intimpl/MkvFileCollector.java | 11 ++--- .../{config => model}/AttributeConfig.java | 2 +- .../{util => model}/MkvToolNix.java | 2 +- 7 files changed, 46 insertions(+), 66 deletions(-) rename src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/{util/ConfigUtil.java => config/Config.java} (86%) rename src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/{config => intimpl}/ConfigProcessor.java (93%) rename src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/{config => model}/AttributeConfig.java (92%) rename src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/{util => model}/MkvToolNix.java (82%) diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index 4e1e05e..a2ad0ce 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -1,10 +1,10 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.AttributeConfig; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ConfigProcessor; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl.ConfigProcessor; import at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl.MkvFileCollector; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ConfigUtil; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; @@ -20,10 +20,10 @@ public class AttributeUpdaterKernel { long runtime = 0; @SneakyThrows - public void execute(String path) { - List configPattern = ConfigUtil.getInstance().getAttributeConfig(); - List allValidPaths = collector.loadFiles(path); - ExecutorService executor = Executors.newFixedThreadPool(ConfigUtil.getInstance().getThreadCount()); + public void execute() { + List configPattern = Config.getInstance().getAttributeConfig(); + List allValidPaths = collector.loadFiles(Config.getInstance().getLibraryPath()); + ExecutorService executor = Executors.newFixedThreadPool(Config.getInstance().getThreadCount()); long beforeTimer = System.currentTimeMillis(); if(allValidPaths != null && configPattern != null){ @@ -37,10 +37,10 @@ public class AttributeUpdaterKernel { runtime = System.currentTimeMillis() - beforeTimer; System.out.printf("%nFiles %schanged: %s%n", - ConfigUtil.getInstance().isSafeMode() ? "would " : "", + Config.getInstance().isSafeMode() ? "would " : "", filesChangedAmount); System.out.printf("Files %s not changed: %s%n", - ConfigUtil.getInstance().isSafeMode() ? "would " : "", + Config.getInstance().isSafeMode() ? "would " : "", filesNotChangedAmount); System.out.printf("Runtime: %ss%n", runtime / 1000); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index 6afe134..8b1932c 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -1,43 +1,17 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ConfigUtil; -import at.pcgamingfreaks.yaml.YAML; -import at.pcgamingfreaks.yaml.YamlInvalidContentException; -import at.pcgamingfreaks.yaml.YamlKeyNotFoundException; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import lombok.extern.log4j.Log4j2; import org.apache.commons.cli.*; -import java.io.File; -import java.io.IOException; - import static java.lang.Integer.parseInt; @Log4j2 public class Main { public static void main(String[] args) { - System.out.println(String.join(", ", args)); initConfig(args); AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(); - kernel.execute(ConfigUtil.getInstance().getLibraryPath()); - } - - private static boolean checkIfMKVToolNixIsValid() { - try { - String path = new YAML(new File("config.yaml")).getString("mkvtoolnixPath"); - if (!path.endsWith(File.separator)) { - path += File.separator; - } - if (System.getProperty("os.name").toLowerCase().contains("windows")) { - MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge.exe"); - MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvpropedit.exe"); - } else { - MKVToolProperties.getInstance().setMkvmergePath(path + "mkvmerge"); - MKVToolProperties.getInstance().setMkvpropeditPath(path + "mkvpropedit"); - } - } catch (YamlKeyNotFoundException | IOException | YamlInvalidContentException e) { - e.printStackTrace(); - } - return new File(MKVToolProperties.getInstance().getMkvmergePath()).isFile() && new File(MKVToolProperties.getInstance().getMkvpropeditPath()).isFile(); + kernel.execute(); } private static void initConfig(String[] args) { @@ -53,12 +27,17 @@ public class Main { try { CommandLine cmd = parser.parse(options, args); - ConfigUtil configUtil = ConfigUtil.getInstance(); - configUtil.loadConfig(cmd.getOptionValue("config", "config.yaml")); // use cmd input - configUtil.setLibraryPath(cmd.getOptionValue("library")); - if (cmd.hasOption("threads")) configUtil.setThreadCount(parseInt(cmd.getOptionValue("threads"))); - configUtil.setSafeMode(cmd.hasOption("safe-mode")); - configUtil.isValid(); + if (cmd.hasOption("help")) { + formatter.printHelp("java -jar MKVAudioSubtitlesChanger.jar -p ", options); + System.exit(0); + } + + Config config = Config.getInstance(); + config.loadConfig(cmd.getOptionValue("config", "config.yaml")); // use cmd input + config.setLibraryPath(cmd.getOptionValue("library")); + if (cmd.hasOption("threads")) config.setThreadCount(parseInt(cmd.getOptionValue("threads"))); + config.setSafeMode(cmd.hasOption("safe-mode")); + config.isValid(); } catch (ParseException e) { log.error(e); formatter.printHelp("java -jar MKVAudioSubtitlesChanger.jar -p ", options); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java similarity index 86% rename from src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java rename to src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java index 53acab6..e0a1a29 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ConfigUtil.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java @@ -1,6 +1,7 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; +package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.AttributeConfig; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix; import at.pcgamingfreaks.yaml.YAML; import at.pcgamingfreaks.yaml.YamlInvalidContentException; import at.pcgamingfreaks.yaml.YamlKeyNotFoundException; @@ -17,10 +18,10 @@ import java.util.stream.Collectors; @Log4j2 @Getter @Setter -public class ConfigUtil { +public class Config { @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) - private static ConfigUtil configUtil = null; + private static Config config = null; private List attributeConfig; private int threadCount; @@ -28,12 +29,13 @@ public class ConfigUtil { private String mkvtoolnixPath; private String libraryPath; private boolean isSafeMode; + private boolean isWindows; - public static ConfigUtil getInstance() { - if(configUtil == null) { - configUtil = new ConfigUtil(); + public static Config getInstance() { + if(config == null) { + config = new Config(); } - return configUtil; + return config; } public void isValid() throws RuntimeException{ @@ -55,6 +57,7 @@ public class ConfigUtil { setAttributeConfig(loadAttributeConfig(config)); setThreadCount(loadThreadCount(config)); setMkvtoolnixPath(loadMkvToolNixPath(config)); + setWindows(System.getProperty("os.name").toLowerCase().contains("windows")); }catch(YamlInvalidContentException | YamlKeyNotFoundException | IOException e){ log.fatal("Config could not be loaded: {}", e.getMessage()); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/ConfigProcessor.java similarity index 93% rename from src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java rename to src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/ConfigProcessor.java index bf03fa5..19f34b1 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/ConfigProcessor.java @@ -1,8 +1,10 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; +package at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl; import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ConfigUtil; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix; import lombok.Getter; import lombok.Setter; import lombok.extern.log4j.Log4j2; @@ -12,6 +14,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.function.Supplier; import static java.lang.String.format; @@ -92,11 +95,11 @@ public class ConfigProcessor { StringBuilder stringBuffer = new StringBuilder(); if(System.getProperty("os.name").toLowerCase().contains("windows")){ stringBuffer.append(format("\"%s\" \"%s\" ", - MKVToolProperties.getInstance().getMkvpropeditPath(), + Config.getInstance().getPathFor(MkvToolNix.MKV_PROP_EDIT), file.getAbsolutePath())); }else{ stringBuffer.append(format("%s %s ", - MKVToolProperties.getInstance().getMkvpropeditPath(), + Config.getInstance().getPathFor(MkvToolNix.MKV_PROP_EDIT), file.getAbsolutePath())); } if(audioDefault != - 1){ @@ -122,7 +125,7 @@ public class ConfigProcessor { return true; } try{ - if(!ConfigUtil.getInstance().isSafeMode()) { + if(!Config.getInstance().isSafeMode()) { Runtime.getRuntime().exec(stringBuffer.toString()); } }catch(IOException e){ diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java index 3ef774f..d82fd6a 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java @@ -1,8 +1,8 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ConfigUtil; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.MkvToolNix; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.log4j.Log4j2; @@ -58,12 +58,7 @@ public class MkvFileCollector implements FileCollector { Map jsonMap; List fileAttributes = new ArrayList<>(); try { - String command = ""; - if (System.getProperty("os.name").toLowerCase().contains("windows")) { - command = "\"" + ConfigUtil.getInstance().getPathFor(MkvToolNix.MKV_MERGER) + "\""; - } else { - command = ConfigUtil.getInstance().getPathFor(MkvToolNix.MKV_MERGER); - } + String command = String.format("\"%s\"", Config.getInstance().getPathFor(MkvToolNix.MKV_MERGER)); String[] array = new String[]{ command, "--identify", diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfig.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java similarity index 92% rename from src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfig.java rename to src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java index 200ea6c..6adce73 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfig.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java @@ -1,4 +1,4 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; +package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; import lombok.Getter; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/MkvToolNix.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/MkvToolNix.java similarity index 82% rename from src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/MkvToolNix.java rename to src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/MkvToolNix.java index cc2eda6..a4ee572 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/MkvToolNix.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/MkvToolNix.java @@ -1,4 +1,4 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; +package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; public enum MkvToolNix { MKV_MERGER("mkvmerge.exe"), From 68e5b9e988237a2f1882c47c12e7f0751b985726 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Thu, 24 Mar 2022 19:07:58 +0100 Subject: [PATCH 21/38] Change AttributeConfig to only hold one audio & subtitle lane --- config.yaml | 20 +++---- .../AttributeUpdaterKernel.java | 19 +++---- .../config/Config.java | 54 ++++++++++--------- .../intimpl/ConfigProcessor.java | 20 ++++--- .../intimpl/MkvFileCollector.java | 4 +- .../model/AttributeConfig.java | 14 +++-- 6 files changed, 66 insertions(+), 65 deletions(-) diff --git a/config.yaml b/config.yaml index 8638af4..ae1362d 100644 --- a/config.yaml +++ b/config.yaml @@ -3,14 +3,14 @@ mkvtoolnixPath: C:\Program Files\MKVToolNix threadCount: 2 config: 1: - audio: - - jpn - subtitle: - - ger - - eng + audio: jpn + subtitle: ger 2: - audio: - - ger - - eng - subtitle: - - OFF \ No newline at end of file + audio: jpn + subtitle: eng + 3: + audio: ger + subtitle: OFF + 4: + audio: eng + subtitle: OFF diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index a2ad0ce..1663935 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -14,6 +14,8 @@ import java.util.concurrent.*; @Log4j2 public class AttributeUpdaterKernel { + + ExecutorService executor = Executors.newFixedThreadPool(Config.getInstance().getThreadCount()); MkvFileCollector collector = new MkvFileCollector(); int filesChangedAmount = 0; int filesNotChangedAmount = 0; @@ -21,17 +23,10 @@ public class AttributeUpdaterKernel { @SneakyThrows public void execute() { - List configPattern = Config.getInstance().getAttributeConfig(); - List allValidPaths = collector.loadFiles(Config.getInstance().getLibraryPath()); - ExecutorService executor = Executors.newFixedThreadPool(Config.getInstance().getThreadCount()); - long beforeTimer = System.currentTimeMillis(); - if(allValidPaths != null && configPattern != null){ - System.out.print("Running"); - allValidPaths.forEach(file -> executor.submit(() -> process(configPattern, file))); - }else{ - log.error("Path is not valid or config has errors!"); - } + + collector.loadFiles(Config.getInstance().getLibraryPath()) + .forEach(file -> executor.submit(() -> process(file))); executor.shutdown(); executor.awaitTermination(1, TimeUnit.DAYS); runtime = System.currentTimeMillis() - beforeTimer; @@ -45,12 +40,12 @@ public class AttributeUpdaterKernel { System.out.printf("Runtime: %ss%n", runtime / 1000); } - private void process(List configPattern, File file) { + private void process(File file) { List attributes = collector.loadAttributes(file); boolean fileHasChanged = false; if (attributes.isEmpty()) return; - for(AttributeConfig config : configPattern){ + for(AttributeConfig config : Config.getInstance().getAttributeConfig()){ fileHasChanged = new ConfigProcessor(config).processConfig(file, attributes); if(fileHasChanged) break; } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java index e0a1a29..ddad79f 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java @@ -13,6 +13,7 @@ import lombok.extern.log4j.Log4j2; import java.io.File; import java.io.IOException; import java.util.List; +import java.util.function.Function; import java.util.stream.Collectors; @Log4j2 @@ -39,17 +40,26 @@ public class Config { } public void isValid() throws RuntimeException{ - System.out.println(attributeConfig); - System.out.println(threadCount); - System.out.println(mkvtoolnixPath); - System.out.println(libraryPath); - if (attributeConfig != null && !attributeConfig.isEmpty() - && threadCount > 0 && !mkvtoolnixPath.isEmpty() - && new File(getPathFor(MkvToolNix.MKV_MERGER)).isFile() - && new File(getPathFor(MkvToolNix.MKV_PROP_EDIT)).isFile()) { - return; + boolean isValid = true; + if (attributeConfig == null || attributeConfig.isEmpty() + || !attributeConfig.stream().allMatch(AttributeConfig::isValid)) { + isValid = false; + System.out.println("Audio & subtitle configuration invalid!"); + } + if (threadCount <= 0) { + isValid = false; + System.out.println("Thread count needs to be at least 1!"); + } + if (mkvtoolnixPath.isEmpty() + || !new File(getPathFor(MkvToolNix.MKV_MERGER)).isFile() + || !new File(getPathFor(MkvToolNix.MKV_PROP_EDIT)).isFile()) { + isValid = false; + System.out.println("MkvToolNix installation path invalid!"); + } + + if (!isValid) { + throw new RuntimeException("Invalid configuration"); } - throw new RuntimeException("Invalid configuration"); } public void loadConfig(String configPath) { @@ -63,25 +73,17 @@ public class Config { } } - private List loadAttributeConfig(YAML config) { + private List loadAttributeConfig(YAML config){ + Function audio = key -> config.getString(key + ".audio", null); + Function subtitle = key -> config.getString(key + ".subtitle", null); + return config.getKeysFiltered(".*audio.*").stream() .sorted() - .map(elem -> elem.replace(".audio", "")) - .map(elem -> createAttributeConfig(elem, config)) + .map(key -> key.replace(".audio", "")) + .map(key -> new AttributeConfig(audio.apply(key), subtitle.apply(key))) .collect(Collectors.toList()); } - private AttributeConfig createAttributeConfig(String key, YAML config) { - try{ - return new AttributeConfig( - config.getStringList(key + ".audio"), - config.getStringList(key + ".subtitle")); - }catch(YamlKeyNotFoundException e){ - e.printStackTrace(); - return null; - } - } - private int loadThreadCount(YAML config) throws YamlKeyNotFoundException{ return config.isSet("threadCount") ? Integer.parseInt(config.getString("threadCount")) @@ -89,7 +91,9 @@ public class Config { } private String loadMkvToolNixPath(YAML config) throws YamlKeyNotFoundException { - return config.isSet("mkvtoolnixPath") ? config.getString("mkvtoolnixPath") : defaultMkvToolNixPath(); + return config.isSet("mkvtoolnixPath") + ? config.getString("mkvtoolnixPath") + : defaultMkvToolNixPath(); } private String defaultMkvToolNixPath() { diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/ConfigProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/ConfigProcessor.java index 19f34b1..9b31f3b 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/ConfigProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/ConfigProcessor.java @@ -1,6 +1,5 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.MKVToolProperties; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; @@ -14,7 +13,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.function.Supplier; import static java.lang.String.format; @@ -154,15 +152,15 @@ public class ConfigProcessor { int subtitleListIndex = - 1; int audioListIndex = - 1; for(FileAttribute elem : attributes){ - if("audio".equals(elem.getType())){ - for(int i = 0; i < config.getAudio().size(); i++){ - audioListIndex = findIndex("audio", elem, audioListIndex, config.getAudio(), transfer); - } - }else if("subtitles".equals(elem.getType())){ - for(int i = 0; i < config.getSubtitle().size(); i++){ - subtitleListIndex = findIndex("subtitles", elem, subtitleListIndex, config.getSubtitle(), transfer); - } - } +// if("audio".equals(elem.getType())){ +// for(int i = 0; i < config.getAudio().size(); i++){ +// audioListIndex = findIndex("audio", elem, audioListIndex, config.getAudio(), transfer); +// } +// }else if("subtitles".equals(elem.getType())){ +// for(int i = 0; i < config.getSubtitle().size(); i++){ +// subtitleListIndex = findIndex("subtitles", elem, subtitleListIndex, config.getSubtitle(), transfer); +// } +// } } transfer.analyzeIfValid(); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java index d82fd6a..f83dd57 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java @@ -42,10 +42,10 @@ public class MkvFileCollector implements FileCollector { .collect(Collectors.toList()); } catch (IOException e) { log.error("Couldn't find file or directory!", e); - return null; + return new ArrayList<>(); } } else { - return null; + return new ArrayList<>(); } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java index 6adce73..354a6d4 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java @@ -9,19 +9,23 @@ import java.util.stream.Collectors; @Log4j2 @Getter public class AttributeConfig { - private List audio; - private List subtitle; + private String audio; + private String subtitle; - public AttributeConfig(List audio, List subtitle) { + public AttributeConfig(String audio, String subtitle) { this.audio = audio; this.subtitle = subtitle; } + public boolean isValid() { + return audio != null && subtitle != null; + } + @Override public String toString() { final StringBuffer sb = new StringBuffer("AttributeConfig{"); - sb.append("audio=").append(String.join(", ", audio)); - sb.append(", subtitle=").append(String.join(", ", subtitle)); + sb.append("audio='").append(audio).append('\''); + sb.append(", subtitle='").append(subtitle).append('\''); sb.append('}'); return sb.toString(); } From c11431d85b236193214e4866e42c7d9c013d56a0 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Mon, 28 Mar 2022 22:35:02 +0200 Subject: [PATCH 22/38] Change track selection --- pom.xml | 5 + .../AttributeUpdaterKernel.java | 37 +++++-- .../mkvaudiosubtitlechanger/Main.java | 4 +- .../ConfigProcessorOld.java} | 14 +-- .../impl/FileCollector.java | 13 +++ .../impl/FileProcessor.java | 20 ++++ .../impl/MkvFileCollector.java | 40 +++++++ .../impl/MkvFileProcessor.java | 100 ++++++++++++++++++ .../intimpl/FileCollector.java | 12 --- .../intimpl/MkvFileCollector.java | 95 ----------------- .../model/AttributeConfig.java | 19 ++-- .../model/FileAttribute.java | 5 +- .../model/FileInfoDto.java | 20 ++++ .../model/LaneType.java | 14 +++ .../model/ResultStatistic.java | 4 + 15 files changed, 266 insertions(+), 136 deletions(-) rename src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/{intimpl/ConfigProcessor.java => impl/ConfigProcessorOld.java} (94%) create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileCollector.java create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileProcessor.java create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java delete mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/FileCollector.java delete mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/LaneType.java create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java diff --git a/pom.xml b/pom.xml index fc17d43..e7ae762 100644 --- a/pom.xml +++ b/pom.xml @@ -149,6 +149,11 @@ commons-cli 1.5.0 + + org.apache.commons + commons-lang3 + 3.12.0 + diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index 1663935..42883d9 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -1,10 +1,12 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileCollector; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileProcessor; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl.ConfigProcessor; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl.MkvFileCollector; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.ConfigProcessorOld; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto; import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; @@ -16,19 +18,30 @@ import java.util.concurrent.*; public class AttributeUpdaterKernel { ExecutorService executor = Executors.newFixedThreadPool(Config.getInstance().getThreadCount()); - MkvFileCollector collector = new MkvFileCollector(); + FileCollector collector; + FileProcessor processor; int filesChangedAmount = 0; int filesNotChangedAmount = 0; long runtime = 0; + public AttributeUpdaterKernel(FileCollector collector, FileProcessor processor) { + this.collector = collector; + this.processor = processor; + } + @SneakyThrows public void execute() { long beforeTimer = System.currentTimeMillis(); - collector.loadFiles(Config.getInstance().getLibraryPath()) - .forEach(file -> executor.submit(() -> process(file))); + + + List files = collector.loadFiles(Config.getInstance().getLibraryPath()); + files.forEach(file -> executor.submit(() -> process(file))); executor.shutdown(); executor.awaitTermination(1, TimeUnit.DAYS); + + + runtime = System.currentTimeMillis() - beforeTimer; System.out.printf("%nFiles %schanged: %s%n", @@ -40,13 +53,13 @@ public class AttributeUpdaterKernel { System.out.printf("Runtime: %ss%n", runtime / 1000); } - private void process(File file) { - List attributes = collector.loadAttributes(file); + private void processOld(File file) { + List attributes = processor.loadAttributes(file); boolean fileHasChanged = false; if (attributes.isEmpty()) return; for(AttributeConfig config : Config.getInstance().getAttributeConfig()){ - fileHasChanged = new ConfigProcessor(config).processConfig(file, attributes); + fileHasChanged = new ConfigProcessorOld(config).processConfig(file, attributes); if(fileHasChanged) break; } if(!fileHasChanged){ @@ -57,4 +70,12 @@ public class AttributeUpdaterKernel { } System.out.print("."); } + + private void process(File file) { + List attributes = processor.loadAttributes(file); + FileInfoDto fileInfo = processor.filterAttributes(attributes); + if (fileInfo.isChangeNecessary() && !Config.getInstance().isSafeMode()) { + processor.update(file, fileInfo); + } + } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index 8b1932c..e99e7e6 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -1,6 +1,8 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileCollector; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileProcessor; import lombok.extern.log4j.Log4j2; import org.apache.commons.cli.*; @@ -10,7 +12,7 @@ import static java.lang.Integer.parseInt; public class Main { public static void main(String[] args) { initConfig(args); - AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(); + AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(new MkvFileCollector(), new MkvFileProcessor()); kernel.execute(); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/ConfigProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/ConfigProcessorOld.java similarity index 94% rename from src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/ConfigProcessor.java rename to src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/ConfigProcessorOld.java index 9b31f3b..44c2dab 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/ConfigProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/ConfigProcessorOld.java @@ -1,4 +1,4 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl; +package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; @@ -17,12 +17,12 @@ import java.util.List; import static java.lang.String.format; @Log4j2 -public class ConfigProcessor { +public class ConfigProcessorOld { private int audioDefault = - 1; private int subtitleDefault = - 1; private final AttributeConfig config; - public ConfigProcessor(AttributeConfig config) { + public ConfigProcessorOld(AttributeConfig config) { this.config = config; } @@ -59,22 +59,22 @@ public class ConfigProcessor { if(elem.isDefaultTrack()){ audioDefault = elem.getId(); } - if(config.getAudio().contains("OFF")){ + if(config.getAudioLanguage().contains("OFF")){ transfer.setAudioOn(false); transfer.setAudioIndex(- 2); } - if(! config.getAudio().contains(elem.getLanguage())){ + if(! config.getAudioLanguage().contains(elem.getLanguage())){ iterator.remove(); } }else if("subtitles".equals(elem.getType())){ if(elem.isDefaultTrack()){ subtitleDefault = elem.getId(); } - if(config.getSubtitle().contains("OFF")){ + if(config.getSubtitleLanguage().contains("OFF")){ transfer.setSubtitleOn(false); transfer.setSubtitleIndex(- 2); } - if(! config.getSubtitle().contains(elem.getLanguage())){ + if(! config.getSubtitleLanguage().contains(elem.getLanguage())){ iterator.remove(); } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileCollector.java new file mode 100644 index 0000000..d60ac8b --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileCollector.java @@ -0,0 +1,13 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; + +import java.io.File; +import java.util.List; + +public interface FileCollector { + + /** + * @param path leads to one file directly or a directory which will be loaded recursively + * @return list of all files within the directory + */ + List loadFiles(String path); +} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileProcessor.java new file mode 100644 index 0000000..5175e3e --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileProcessor.java @@ -0,0 +1,20 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; + +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto; + +import java.io.File; +import java.util.List; + +public interface FileProcessor { + + /** + * @param file Takes the file from which the attributes will be returned + * @return list of all important attributes + */ + List loadAttributes(File file); + + FileInfoDto filterAttributes(List attributes); + + void update(File file, FileInfoDto fileInfo); +} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java new file mode 100644 index 0000000..6de706b --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java @@ -0,0 +1,40 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; + +import lombok.extern.log4j.Log4j2; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +@Log4j2 +public class MkvFileCollector implements FileCollector { + + @Override + public List loadFiles(String path) { + File file = new File(path); + if (file.isFile() && file.getAbsolutePath().endsWith(".mkv")) { + return new ArrayList() {{ + add(file); + }}; + } else if (file.isDirectory()) { + try (Stream 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) { + log.error("Couldn't find file or directory!", e); + return new ArrayList<>(); + } + } else { + return new ArrayList<>(); + } + } +} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java new file mode 100644 index 0000000..c13eb1c --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java @@ -0,0 +1,100 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; + +import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.*; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Collectors; + +import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.LaneType.AUDIO; +import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.LaneType.SUBTITLES; + +@Log4j2 +public class MkvFileProcessor implements FileProcessor { + private final ObjectMapper mapper = new ObjectMapper(); + + @Override + public List loadAttributes(File file) { + Map jsonMap; + List fileAttributes = new ArrayList<>(); + try { + String command = String.format("\"%s\"", Config.getInstance().getPathFor(MkvToolNix.MKV_MERGER)); + String[] arguments = new String[]{ + command, + "--identify", + "--identification-format", + "json", + file.getAbsoluteFile().toString() + }; + + InputStream inputStream = Runtime.getRuntime().exec(arguments).getInputStream(); + jsonMap = mapper.readValue(inputStream, Map.class); + List> tracks = (List>) jsonMap.get("tracks"); + if (tracks == null) { + log.warn("Couldn't retrieve information of {}", file.getAbsoluteFile().toString()); + return new ArrayList<>(); + } + for (Map attribute : tracks) { + if (!"video".equals(attribute.get("type"))) { + Map properties = (Map) attribute.get("properties"); + fileAttributes.add(new FileAttribute( + (int) properties.get("number"), + (String) properties.get("language"), + (String) properties.get("track_name"), + (Boolean) properties.getOrDefault("default_track", false), + (Boolean) properties.getOrDefault("forced_track", false), + LaneType.valueOf(((String) attribute.get("type")).toUpperCase(Locale.ENGLISH)))); + } + } + } catch (IOException e) { + e.printStackTrace(); + log.error("File could not be found or loaded!"); + } + return fileAttributes; + } + + @Override + public FileInfoDto filterAttributes(List attributes) { + FileInfoDto info = new FileInfoDto(); + for (FileAttribute attribute: attributes) { + if (attribute.isDefaultTrack() && AUDIO.equals(attribute.getType())) info.setDefaultAudioLane(attribute); + if (attribute.isForcedTrack() && AUDIO.equals(attribute.getType())) info.setForcedAudioLane(attribute); + + if (attribute.isDefaultTrack() && SUBTITLES.equals(attribute.getType())) info.setDefaultSubtitleLane(attribute); + if (attribute.isForcedTrack() && SUBTITLES.equals(attribute.getType())) info.setForcedSubtitleLane(attribute); + } + List nonForcedTracks = attributes.stream() + .filter(elem -> !StringUtils.containsIgnoreCase(elem.getTrackName(), "forced")) + .collect(Collectors.toList()); + for (AttributeConfig config: Config.getInstance().getAttributeConfig()) { + FileAttribute desiredAudio = null; + FileAttribute desiredSubtitle = null; + for (FileAttribute attribute: nonForcedTracks) { + if ( attribute.getLanguage().equals(config.getAudioLanguage()) + && AUDIO.equals(attribute.getType())) desiredAudio = attribute; + if ( attribute.getLanguage().equals(config.getSubtitleLanguage()) + && SUBTITLES.equals(attribute.getType())) desiredSubtitle = attribute; + } + if (desiredAudio != null && desiredSubtitle != null) { + info.setDesiredAudioLane(desiredAudio); + info.setDesiredSubtitleLane(desiredSubtitle); + break; + } + } + return info; + } + + @Override + public void update(File file, FileInfoDto fileInfo) { + + } +} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/FileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/FileCollector.java deleted file mode 100644 index b369067..0000000 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/FileCollector.java +++ /dev/null @@ -1,12 +0,0 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl; - -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; - -import java.io.File; -import java.util.List; - -public interface FileCollector { - List loadFiles(String path); - - List loadAttributes(File file); -} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java deleted file mode 100644 index f83dd57..0000000 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/intimpl/MkvFileCollector.java +++ /dev/null @@ -1,95 +0,0 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.intimpl; - -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.log4j.Log4j2; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -@Log4j2 -public class MkvFileCollector implements FileCollector { - private final ObjectMapper mapper = new ObjectMapper(); - - /** - * @param path Is entered path, which leads to one file directly or a directory which will be loaded recursive - * @return list of all files within the directory, if it's only a file, the file will be returned in a list - */ - @Override - public List loadFiles(String path) { - File file = new File(path); - if (file.isFile() && file.getAbsolutePath().endsWith(".mkv")) { - return new ArrayList() {{ - add(file); - }}; - } else if (file.isDirectory()) { - try (Stream 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) { - log.error("Couldn't find file or directory!", e); - return new ArrayList<>(); - } - } else { - return new ArrayList<>(); - } - } - - /** - * @param file Takes the file from which the attributes will be returned - * @return list of all important attributes - */ - @Override - public List loadAttributes(File file) { - Map jsonMap; - List fileAttributes = new ArrayList<>(); - try { - String command = String.format("\"%s\"", Config.getInstance().getPathFor(MkvToolNix.MKV_MERGER)); - String[] array = new String[]{ - command, - "--identify", - "--identification-format", - "json", - file.getAbsoluteFile().toString() - }; - - InputStream inputStream = Runtime.getRuntime().exec(array).getInputStream(); - jsonMap = mapper.readValue(inputStream, Map.class); - List> tracks = (List>) jsonMap.get("tracks"); - if (tracks == null) { - log.warn("Couldn't retrieve information of {}", file.getAbsoluteFile().toString()); - return new ArrayList<>(); - } - for (Map attribute : tracks) { - if (!"video".equals(attribute.get("type"))) { - Map properties = (Map) attribute.get("properties"); - fileAttributes.add(new FileAttribute( - (int) properties.get("number"), - (String) properties.get("language"), - (String) properties.get("track_name"), - (Boolean) properties.getOrDefault("default_track", false), - (Boolean) properties.getOrDefault("forced_track", false), - (String) attribute.get("type"))); - } - } - } catch (IOException e) { - e.printStackTrace(); - log.error("File could not be found or loaded!"); - } - return fileAttributes; - } -} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java index 354a6d4..2849946 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java @@ -3,29 +3,26 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; import lombok.Getter; import lombok.extern.log4j.Log4j2; -import java.util.List; -import java.util.stream.Collectors; - @Log4j2 @Getter public class AttributeConfig { - private String audio; - private String subtitle; + private String audioLanguage; + private String subtitleLanguage; - public AttributeConfig(String audio, String subtitle) { - this.audio = audio; - this.subtitle = subtitle; + public AttributeConfig(String audioLanguage, String subtitleLanguage) { + this.audioLanguage = audioLanguage; + this.subtitleLanguage = subtitleLanguage; } public boolean isValid() { - return audio != null && subtitle != null; + return audioLanguage != null && subtitleLanguage != null; } @Override public String toString() { final StringBuffer sb = new StringBuffer("AttributeConfig{"); - sb.append("audio='").append(audio).append('\''); - sb.append(", subtitle='").append(subtitle).append('\''); + sb.append("audioLanguage='").append(audioLanguage).append('\''); + sb.append(", subtitleLanguage='").append(subtitleLanguage).append('\''); sb.append('}'); return sb.toString(); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java index 28a50f4..0932c0c 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java @@ -20,9 +20,10 @@ public class FileAttribute { private String trackName; private boolean defaultTrack; private boolean forcedTrack; - private String type; + private LaneType type; - public FileAttribute(int id, String language, String trackName, boolean defaultTrack, boolean forcedTrack, String type) { + public FileAttribute(int id, String language, String trackName, boolean defaultTrack, boolean forcedTrack, + LaneType type) { this.id = id; this.language = language; this.trackName = trackName; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java new file mode 100644 index 0000000..9b8592e --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java @@ -0,0 +1,20 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class FileInfoDto { + private FileAttribute defaultAudioLane; + private FileAttribute defaultSubtitleLane; + private FileAttribute forcedAudioLane; + private FileAttribute forcedSubtitleLane; + private FileAttribute desiredAudioLane; + private FileAttribute desiredSubtitleLane; + + public boolean isChangeNecessary() { + return defaultAudioLane.getId() != desiredAudioLane.getId() + || defaultSubtitleLane.getId() != desiredSubtitleLane.getId(); + } +} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/LaneType.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/LaneType.java new file mode 100644 index 0000000..0145370 --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/LaneType.java @@ -0,0 +1,14 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; + +public enum LaneType { + AUDIO, + SUBTITLES; + + LaneType() { + } + + @Override + public String toString() { + return name(); + } +} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java new file mode 100644 index 0000000..8c354f0 --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java @@ -0,0 +1,4 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; + +public class ResultStatistic { +} From b94f6eb7dedc4d3ae83f58ea00621e89a8f87f1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 20:35:33 +0000 Subject: [PATCH 23/38] Bump jackson-databind from 2.13.1 to 2.13.2.1 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.1 to 2.13.2.1. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7ae762..95623f1 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.1 + 2.13.2.1 commons-cli From 93f3542cf1e4f5f4b4fac4aa0cf2cf5af2574141 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Wed, 30 Mar 2022 19:00:24 +0200 Subject: [PATCH 24/38] Add new file update process --- .../AttributeUpdaterKernel.java | 20 -- .../impl/ConfigProcessorOld.java | 203 ------------------ .../impl/MkvFileProcessor.java | 80 +++++-- .../model/FileAttribute.java | 48 +---- .../model/FileInfoDto.java | 22 +- 5 files changed, 87 insertions(+), 286 deletions(-) delete mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/ConfigProcessorOld.java diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index 42883d9..f82553c 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -2,8 +2,6 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileCollector; import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileProcessor; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.ConfigProcessorOld; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto; @@ -53,24 +51,6 @@ public class AttributeUpdaterKernel { System.out.printf("Runtime: %ss%n", runtime / 1000); } - private void processOld(File file) { - List attributes = processor.loadAttributes(file); - boolean fileHasChanged = false; - - if (attributes.isEmpty()) return; - for(AttributeConfig config : Config.getInstance().getAttributeConfig()){ - fileHasChanged = new ConfigProcessorOld(config).processConfig(file, attributes); - if(fileHasChanged) break; - } - if(!fileHasChanged){ - log.info("File didn't change: {}", file.getName()); - filesNotChangedAmount++; - } else { - filesChangedAmount++; - } - System.out.print("."); - } - private void process(File file) { List attributes = processor.loadAttributes(file); FileInfoDto fileInfo = processor.filterAttributes(attributes); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/ConfigProcessorOld.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/ConfigProcessorOld.java deleted file mode 100644 index 44c2dab..0000000 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/ConfigProcessorOld.java +++ /dev/null @@ -1,203 +0,0 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; - -import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix; -import lombok.Getter; -import lombok.Setter; -import lombok.extern.log4j.Log4j2; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import static java.lang.String.format; - -@Log4j2 -public class ConfigProcessorOld { - private int audioDefault = - 1; - private int subtitleDefault = - 1; - private final AttributeConfig config; - - public ConfigProcessorOld(AttributeConfig config) { - this.config = config; - } - - /** - * Processes the config lists and apply the changes if the combination matches - * - * @param file is the file, which will be updated - * @param attributes has the metadata for the transferred file - * @return If the current configuration matched and changes applied or not - */ - public boolean processConfig(File file, List attributes) { - // check if size is bigger or equal 2 to make sure that there is at least one audio and subtitle line - // TODO: implement empty audio or subtitle line - List attributesCopy = new ArrayList<>(attributes); - if(attributesCopy.size() >= 2){ - TransferObject transfer = filterAttributes(attributesCopy); - if(! attributesCopy.isEmpty()){ - return updateFile(file, attributesCopy, transfer); - } - } - return false; - } - - /* - * Filters the attributes that only those are remaining which are needed in the current configuration. - * Also analyzes which tracks were default before. - */ - private TransferObject filterAttributes(List attributes) { - TransferObject transfer = new TransferObject(); - Iterator iterator = attributes.iterator(); - while(iterator.hasNext()){ - FileAttribute elem = iterator.next(); - if("audio".equals(elem.getType())){ - if(elem.isDefaultTrack()){ - audioDefault = elem.getId(); - } - if(config.getAudioLanguage().contains("OFF")){ - transfer.setAudioOn(false); - transfer.setAudioIndex(- 2); - } - if(! config.getAudioLanguage().contains(elem.getLanguage())){ - iterator.remove(); - } - }else if("subtitles".equals(elem.getType())){ - if(elem.isDefaultTrack()){ - subtitleDefault = elem.getId(); - } - if(config.getSubtitleLanguage().contains("OFF")){ - transfer.setSubtitleOn(false); - transfer.setSubtitleIndex(- 2); - } - if(! config.getSubtitleLanguage().contains(elem.getLanguage())){ - iterator.remove(); - } - } - } - return transfer; - } - - /** - * Creates the command which will be executed if the attributes of the current file fit the current {@link AttributeConfig} - * - * @param file is the file, which will be updated - * @param attributes has the metadata for the transferred file - * @return if the current file was updated or not. Returns true if the file already has the correct metadata set - */ - private boolean updateFile(File file, List attributes, TransferObject transfer) { - StringBuilder stringBuffer = new StringBuilder(); - if(System.getProperty("os.name").toLowerCase().contains("windows")){ - stringBuffer.append(format("\"%s\" \"%s\" ", - Config.getInstance().getPathFor(MkvToolNix.MKV_PROP_EDIT), - file.getAbsolutePath())); - }else{ - stringBuffer.append(format("%s %s ", - Config.getInstance().getPathFor(MkvToolNix.MKV_PROP_EDIT), - file.getAbsolutePath())); - } - if(audioDefault != - 1){ - stringBuffer.append(format("--edit track:=%s --set flag-default=0 ", audioDefault)); - } - if(subtitleDefault != - 1){ - stringBuffer.append(format("--edit track:=%s --set flag-default=0 ", subtitleDefault)); - } - collectLines(attributes, transfer); - if(transfer.isValid){ - if(transfer.isAudioOn){ - stringBuffer.append(format("--edit track:=%s --set flag-default=1 ", transfer.getAudioIndex())); - } - if(transfer.isSubtitleOn){ - stringBuffer.append(format("--edit track:=%s --set flag-default=1 ", transfer.getSubtitleIndex())); - } - if(subtitleDefault == transfer.getSubtitleIndex() && audioDefault == transfer.getAudioIndex()){ - /* - * In this case the file would be change to the exact same audio and subtitle lines and we want to - * avoid unnecessary changes to the file - */ - log.info("File already fits config: {}", file.getName()); - return true; - } - try{ - if(!Config.getInstance().isSafeMode()) { - Runtime.getRuntime().exec(stringBuffer.toString()); - } - }catch(IOException e){ - log.error("Couldn't make changes to file"); - } - /* - * We return true even if there was an error. If there was an error, the chances that this file is still - * busy later. - */ - log.info("Updated {}", file.getName()); - return true; - }else{ - return false; - } - } - - /** - * Analyzes the left over attributes and decides which is the most wanted for audio and subtitle - * - * @param attributes contains all the leftover attributes - * @return is an object, which contains information about which audio and subtitle line is the best suitable for - * the entered config. Also transfers a boolean which contains information about if the other two values - * were set - */ - private TransferObject collectLines(List attributes, TransferObject transfer) { - int subtitleListIndex = - 1; - int audioListIndex = - 1; - for(FileAttribute elem : attributes){ -// if("audio".equals(elem.getType())){ -// for(int i = 0; i < config.getAudio().size(); i++){ -// audioListIndex = findIndex("audio", elem, audioListIndex, config.getAudio(), transfer); -// } -// }else if("subtitles".equals(elem.getType())){ -// for(int i = 0; i < config.getSubtitle().size(); i++){ -// subtitleListIndex = findIndex("subtitles", elem, subtitleListIndex, config.getSubtitle(), transfer); -// } -// } - } - - transfer.analyzeIfValid(); - return transfer; - } - - private int findIndex(String type, FileAttribute elem, int index, List config, TransferObject transfer) { - for(int i = 0; i < config.size(); i++){ - if(config.get(i).equals(elem.getLanguage()) && (index == - 1 || i < index)){ - switch(type){ - case "audio": - transfer.setAudioIndex(elem.getId()); - break; - case "subtitles": - transfer.setSubtitleIndex(elem.getId()); - break; - } - return i; - } - } - return index; - } - - @Getter - @Setter - private static class TransferObject { - private boolean isValid; - private int audioIndex = - 1; - private int subtitleIndex = - 1; - private boolean isSubtitleOn = true; - private boolean isAudioOn = true; - - TransferObject() { - } - - private void analyzeIfValid() { - isValid = audioIndex != - 1 && subtitleIndex != - 1; - } - } -} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java index c13eb1c..2da348a 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java @@ -5,29 +5,31 @@ import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.*; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.core.util.IOUtils; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; +import java.io.*; +import java.util.*; import java.util.stream.Collectors; import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.LaneType.AUDIO; import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.LaneType.SUBTITLES; +import static java.lang.String.format; @Log4j2 public class MkvFileProcessor implements FileProcessor { private final ObjectMapper mapper = new ObjectMapper(); + private final String[] forcedKeywords = new String[]{"forced", "signs"}; + private static final String DISABLE_DEFAULT_TRACK = "--edit track:%s --set flag-default=0 "; + private static final String ENABLE_DEFAULT_TRACK = "--edit track:%s --set flag-default=1 "; + private static final String ENABLE_FORCED_TRACK = "--edit track:%s --set flag-forced=1 "; + @Override public List loadAttributes(File file) { Map jsonMap; List fileAttributes = new ArrayList<>(); try { - String command = String.format("\"%s\"", Config.getInstance().getPathFor(MkvToolNix.MKV_MERGER)); + String command = format("\"%s\"", Config.getInstance().getPathFor(MkvToolNix.MKV_MERGER)); String[] arguments = new String[]{ command, "--identify", @@ -40,7 +42,7 @@ public class MkvFileProcessor implements FileProcessor { jsonMap = mapper.readValue(inputStream, Map.class); List> tracks = (List>) jsonMap.get("tracks"); if (tracks == null) { - log.warn("Couldn't retrieve information of {}", file.getAbsoluteFile().toString()); + log.warn("Couldn't retrieve information of {}", file.getAbsolutePath()); return new ArrayList<>(); } for (Map attribute : tracks) { @@ -65,24 +67,40 @@ public class MkvFileProcessor implements FileProcessor { @Override public FileInfoDto filterAttributes(List attributes) { FileInfoDto info = new FileInfoDto(); + List nonForcedTracks = attributes.stream() + .filter(elem -> !StringUtils.containsAnyIgnoreCase(elem.getTrackName(), forcedKeywords)) + .collect(Collectors.toList()); + + detectCurrentConfiguration(attributes, info, nonForcedTracks); + detectDesiredConfiguration(info, nonForcedTracks); + + return info; + } + + private void detectCurrentConfiguration(List attributes, FileInfoDto info, List nonForcedTracks) { + Set detectedForcedSubtitleLanes = new HashSet<>(); for (FileAttribute attribute: attributes) { if (attribute.isDefaultTrack() && AUDIO.equals(attribute.getType())) info.setDefaultAudioLane(attribute); - if (attribute.isForcedTrack() && AUDIO.equals(attribute.getType())) info.setForcedAudioLane(attribute); - if (attribute.isDefaultTrack() && SUBTITLES.equals(attribute.getType())) info.setDefaultSubtitleLane(attribute); - if (attribute.isForcedTrack() && SUBTITLES.equals(attribute.getType())) info.setForcedSubtitleLane(attribute); + if (attribute.isForcedTrack() && SUBTITLES.equals(attribute.getType())) detectedForcedSubtitleLanes.add(attribute); } - List nonForcedTracks = attributes.stream() - .filter(elem -> !StringUtils.containsIgnoreCase(elem.getTrackName(), "forced")) - .collect(Collectors.toList()); + + info.setDesiredForcedSubtitleLanes(attributes.stream() + .filter(e -> !nonForcedTracks.contains(e)) + .filter(e -> !detectedForcedSubtitleLanes.contains(e)) + .collect(Collectors.toSet()) + ); + } + + private void detectDesiredConfiguration(FileInfoDto info, List nonForcedTracks) { for (AttributeConfig config: Config.getInstance().getAttributeConfig()) { FileAttribute desiredAudio = null; FileAttribute desiredSubtitle = null; for (FileAttribute attribute: nonForcedTracks) { if ( attribute.getLanguage().equals(config.getAudioLanguage()) - && AUDIO.equals(attribute.getType())) desiredAudio = attribute; + && AUDIO.equals(attribute.getType())) desiredAudio = attribute; if ( attribute.getLanguage().equals(config.getSubtitleLanguage()) - && SUBTITLES.equals(attribute.getType())) desiredSubtitle = attribute; + && SUBTITLES.equals(attribute.getType())) desiredSubtitle = attribute; } if (desiredAudio != null && desiredSubtitle != null) { info.setDesiredAudioLane(desiredAudio); @@ -90,11 +108,37 @@ public class MkvFileProcessor implements FileProcessor { break; } } - return info; } @Override public void update(File file, FileInfoDto fileInfo) { + StringBuffer sb = new StringBuffer(); + sb.append(format("\"%s\" ", Config.getInstance().getPathFor(MkvToolNix.MKV_PROP_EDIT))); + sb.append(format("\"%s\" ", file.getAbsolutePath())); + if (fileInfo.isAudioDifferent()) { + if (fileInfo.getDefaultAudioLane() != null) { + sb.append(format(DISABLE_DEFAULT_TRACK, fileInfo.getDefaultAudioLane().getId())); + } + sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredAudioLane().getId())); + } + if (fileInfo.isSubtitleDifferent()) { + if (fileInfo.getDefaultSubtitleLane() != null) { + sb.append(format(DISABLE_DEFAULT_TRACK, fileInfo.getDefaultSubtitleLane().getId())); + } + sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredSubtitleLane().getId())); + } + if (fileInfo.areForcedTracksDifferent()) { + for (FileAttribute attribute: fileInfo.getDesiredForcedSubtitleLanes()) { + sb.append(format(ENABLE_FORCED_TRACK, attribute.getId())); + } + } + try { + InputStream inputstream = Runtime.getRuntime().exec(sb.toString()).getInputStream(); + log.debug(IOUtils.toString(new InputStreamReader(inputstream))); + } catch (IOException e) { + log.warn("File couldn't be updated: {}", file.getAbsoluteFile()); + } } + } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java index 0932c0c..4f2090d 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java @@ -3,27 +3,17 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; import lombok.Getter; import lombok.extern.log4j.Log4j2; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - @Log4j2 @Getter public class FileAttribute { - private int id; - private String language; - private String trackName; - private boolean defaultTrack; - private boolean forcedTrack; - private LaneType type; + private final int id; + private final String language; + private final String trackName; + private final boolean defaultTrack; + private final boolean forcedTrack; + private final LaneType type; - public FileAttribute(int id, String language, String trackName, boolean defaultTrack, boolean forcedTrack, - LaneType type) { + public FileAttribute(int id, String language, String trackName, boolean defaultTrack, boolean forcedTrack, LaneType type) { this.id = id; this.language = language; this.trackName = trackName; @@ -31,28 +21,4 @@ public class FileAttribute { this.forcedTrack = forcedTrack; this.type = type; } - - public static boolean pathIsValid(String path) { - File file = new File(path); - if(file.isFile()){ - return file.getAbsolutePath().endsWith(".mkv"); - } - if(file.isDirectory()){ - try(Stream paths = Files.walk(Paths.get(path))){ - List allPaths = paths - .filter(Files::isRegularFile) - .map(f -> f.toAbsolutePath().toString()) - .collect(Collectors.toList()); - for(String filePath : allPaths){ - if(! filePath.endsWith(".mkv")){ - return false; - } - } - }catch(IOException e){ - log.error("Couldn't find file or directory!", e); - } - return true; - } - return false; - } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java index 9b8592e..81f4123 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java @@ -3,18 +3,32 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter public class FileInfoDto { private FileAttribute defaultAudioLane; private FileAttribute defaultSubtitleLane; - private FileAttribute forcedAudioLane; - private FileAttribute forcedSubtitleLane; + private Set desiredForcedSubtitleLanes; private FileAttribute desiredAudioLane; private FileAttribute desiredSubtitleLane; public boolean isChangeNecessary() { - return defaultAudioLane.getId() != desiredAudioLane.getId() - || defaultSubtitleLane.getId() != desiredSubtitleLane.getId(); + return isAudioDifferent() || isSubtitleDifferent() || areForcedTracksDifferent(); + } + + public boolean isAudioDifferent() { + return desiredAudioLane != null && + (defaultAudioLane == null || defaultAudioLane.getId() != desiredAudioLane.getId()); + } + + public boolean isSubtitleDifferent() { + return desiredSubtitleLane != null && + (defaultSubtitleLane == null || defaultSubtitleLane.getId() != desiredSubtitleLane.getId()); + } + + public boolean areForcedTracksDifferent() { + return desiredForcedSubtitleLanes.size() > 0; } } From f7a2e4234aee103facb99f91cdf7a5b89c392490 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Wed, 30 Mar 2022 20:09:32 +0200 Subject: [PATCH 25/38] Add cli property for forced keywords --- config.yaml | 3 +- .../mkvaudiosubtitlechanger/Main.java | 27 +++++++++++----- .../config/Config.java | 31 ++++++++++++------- .../model/ConfigProperty.java | 22 +++++++++++++ 4 files changed, 64 insertions(+), 19 deletions(-) create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java diff --git a/config.yaml b/config.yaml index ae1362d..2e94f1f 100644 --- a/config.yaml +++ b/config.yaml @@ -1,6 +1,7 @@ mkvtoolnixPath: C:\Program Files\MKVToolNix # Only edit this value if you know what you are doing, otherwise it may impact your performance negatively -threadCount: 2 +threads: 2 +#forcedKeywords: ["forced", "signs"] config: 1: audio: jpn diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index e99e7e6..56ec26f 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -3,9 +3,13 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileCollector; import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileProcessor; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty; import lombok.extern.log4j.Log4j2; import org.apache.commons.cli.*; +import java.util.List; + +import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*; import static java.lang.Integer.parseInt; @Log4j2 @@ -18,11 +22,12 @@ public class Main { private static void initConfig(String[] args) { Options options = new Options(); - options.addOption("h", "help", false, "\"for help this is\" - Yoda"); - options.addRequiredOption("l", "library", true, "path to library"); - options.addOption("c", "config", false, "path to config"); - options.addOption("t", "threads", true, "thread count"); - options.addOption("s", "safe-mode", false, "Test run (no files will be changes)"); + options.addOption("h", HELP.toString(), false, "\"for help this is\" - Yoda"); + options.addRequiredOption("l", LIBRARY.toString(), true, "path to library"); + options.addOption("c", CONFIG.toString(), false, "path to config"); + options.addOption("t", THREADS.toString(), true, "thread count"); + options.addOption("s", SAFE_MODE.toString(), false, "Test run (no files will be changes)"); + options.addOption(create("k", FORCED_KEYWORDS.toString(),Option.UNLIMITED_VALUES,"Additional keywords to identify forced tracks")); CommandLineParser parser = new DefaultParser(); HelpFormatter formatter = new HelpFormatter(); @@ -35,10 +40,11 @@ public class Main { } Config config = Config.getInstance(); - config.loadConfig(cmd.getOptionValue("config", "config.yaml")); // use cmd input + config.loadConfig(cmd.getOptionValue(CONFIG.toString(), "config.yaml")); // use cmd input config.setLibraryPath(cmd.getOptionValue("library")); - if (cmd.hasOption("threads")) config.setThreadCount(parseInt(cmd.getOptionValue("threads"))); config.setSafeMode(cmd.hasOption("safe-mode")); + if (cmd.hasOption("threads")) config.setThreadCount(parseInt(cmd.getOptionValue("threads"))); + if (cmd.hasOption(FORCED_KEYWORDS.toString())) config.getForcedKeywords().addAll(List.of(cmd.getOptionValues(FORCED_KEYWORDS.toString()))); config.isValid(); } catch (ParseException e) { log.error(e); @@ -46,4 +52,11 @@ public class Main { System.exit(1); } } + + private static Option create(String opt, String longOpt, int args, String desc) { + Option option = new Option(opt, desc); + option.setLongOpt(longOpt); + option.setArgs(args); + return option; + } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java index ddad79f..5eeda69 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java @@ -1,6 +1,7 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix; import at.pcgamingfreaks.yaml.YAML; import at.pcgamingfreaks.yaml.YamlInvalidContentException; @@ -12,10 +13,12 @@ import lombok.extern.log4j.Log4j2; import java.io.File; import java.io.IOException; -import java.util.List; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*; + @Log4j2 @Getter @Setter @@ -26,6 +29,7 @@ public class Config { private List attributeConfig; private int threadCount; + private Set forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs")); @Getter(AccessLevel.NONE) private String mkvtoolnixPath; private String libraryPath; @@ -33,13 +37,13 @@ public class Config { private boolean isWindows; public static Config getInstance() { - if(config == null) { + if (config == null) { config = new Config(); } return config; } - public void isValid() throws RuntimeException{ + public void isValid() throws RuntimeException { boolean isValid = true; if (attributeConfig == null || attributeConfig.isEmpty() || !attributeConfig.stream().allMatch(AttributeConfig::isValid)) { @@ -63,17 +67,18 @@ public class Config { } public void loadConfig(String configPath) { - try(YAML config = new YAML(new File(configPath))){ + try (YAML config = new YAML(new File(configPath))) { setAttributeConfig(loadAttributeConfig(config)); setThreadCount(loadThreadCount(config)); setMkvtoolnixPath(loadMkvToolNixPath(config)); setWindows(System.getProperty("os.name").toLowerCase().contains("windows")); - }catch(YamlInvalidContentException | YamlKeyNotFoundException | IOException e){ + getForcedKeywords().addAll(loadForcedKeywords(config)); + } catch (YamlInvalidContentException | YamlKeyNotFoundException | IOException e) { log.fatal("Config could not be loaded: {}", e.getMessage()); } } - private List loadAttributeConfig(YAML config){ + private List loadAttributeConfig(YAML config) { Function audio = key -> config.getString(key + ".audio", null); Function subtitle = key -> config.getString(key + ".subtitle", null); @@ -84,15 +89,19 @@ public class Config { .collect(Collectors.toList()); } - private int loadThreadCount(YAML config) throws YamlKeyNotFoundException{ - return config.isSet("threadCount") - ? Integer.parseInt(config.getString("threadCount")) + private int loadThreadCount(YAML config) throws YamlKeyNotFoundException { + return config.isSet(ConfigProperty.THREADS.toString()) + ? Integer.parseInt(config.getString(ConfigProperty.THREADS.toString())) : 1; } + private List loadForcedKeywords(YAML config) { + return config.getStringList(ConfigProperty.FORCED_KEYWORDS.toString(), new ArrayList<>()); + } + private String loadMkvToolNixPath(YAML config) throws YamlKeyNotFoundException { - return config.isSet("mkvtoolnixPath") - ? config.getString("mkvtoolnixPath") + return config.isSet(MKV_TOOL_NIX.toString()) + ? config.getString(MKV_TOOL_NIX.toString()) : defaultMkvToolNixPath(); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java new file mode 100644 index 0000000..8d439ca --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java @@ -0,0 +1,22 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; + +public enum ConfigProperty { + MKV_TOOL_NIX("mkvtoolnixPath"), + THREADS("threads"), + FORCED_KEYWORDS("forcedKeywords"), + CONFIG("config"), + LIBRARY("library"), + SAFE_MODE("safe-mode"), + HELP("help"); + + private String property; + + ConfigProperty(String property) { + this.property = property; + } + + @Override + public String toString() { + return property; + } +} From a5b0224d6c1c395c32dfef43848aa0752c93f884 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Wed, 30 Mar 2022 20:32:26 +0200 Subject: [PATCH 26/38] Reimplement basic statistics --- pom.xml | 2 +- .../AttributeUpdaterKernel.java | 50 ++++++++++--------- .../MKVToolProperties.java | 2 +- .../mkvaudiosubtitlechanger/Main.java | 6 +-- .../config/Config.java | 2 +- .../impl/FileProcessor.java | 3 +- .../impl/MkvFileProcessor.java | 34 ++++++------- .../model/AttributeConfig.java | 4 +- .../model/ConfigProperty.java | 2 +- .../model/ResultStatistic.java | 49 ++++++++++++++++++ 10 files changed, 103 insertions(+), 51 deletions(-) diff --git a/pom.xml b/pom.xml index e7ae762..ae165d1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ MKVAudioSubtilesChanger MKVAudioSubtitlesChanger - 1.2 + 2.0 clean package diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index f82553c..ade9974 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -1,26 +1,28 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileCollector; import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileProcessor; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ResultStatistic; import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; import java.io.File; +import java.io.IOException; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; @Log4j2 public class AttributeUpdaterKernel { - ExecutorService executor = Executors.newFixedThreadPool(Config.getInstance().getThreadCount()); - FileCollector collector; - FileProcessor processor; - int filesChangedAmount = 0; - int filesNotChangedAmount = 0; - long runtime = 0; + private final ExecutorService executor = Executors.newFixedThreadPool(Config.getInstance().getThreadCount()); + private final FileCollector collector; + private final FileProcessor processor; + private final ResultStatistic statistic = new ResultStatistic(); public AttributeUpdaterKernel(FileCollector collector, FileProcessor processor) { this.collector = collector; @@ -29,33 +31,33 @@ public class AttributeUpdaterKernel { @SneakyThrows public void execute() { - long beforeTimer = System.currentTimeMillis(); - - + statistic.startTimer(); List files = collector.loadFiles(Config.getInstance().getLibraryPath()); files.forEach(file -> executor.submit(() -> process(file))); executor.shutdown(); executor.awaitTermination(1, TimeUnit.DAYS); - - - runtime = System.currentTimeMillis() - beforeTimer; - - System.out.printf("%nFiles %schanged: %s%n", - Config.getInstance().isSafeMode() ? "would " : "", - filesChangedAmount); - System.out.printf("Files %s not changed: %s%n", - Config.getInstance().isSafeMode() ? "would " : "", - filesNotChangedAmount); - System.out.printf("Runtime: %ss%n", runtime / 1000); + statistic.stopTimer(); + System.out.println(statistic); } private void process(File file) { List attributes = processor.loadAttributes(file); FileInfoDto fileInfo = processor.filterAttributes(attributes); - if (fileInfo.isChangeNecessary() && !Config.getInstance().isSafeMode()) { - processor.update(file, fileInfo); + if (fileInfo.isChangeNecessary()) { + statistic.shouldChange(file, fileInfo); + if (!Config.getInstance().isSafeMode()) { + try { + processor.update(file, fileInfo); + statistic.success(file, fileInfo); + } catch (IOException e) { + statistic.failure(file, fileInfo); + log.warn("File couldn't be updated: {}", file.getAbsoluteFile()); + } + } + } else { + statistic.fits(file, fileInfo); } } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java index 14618ee..53b9ddb 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java @@ -17,7 +17,7 @@ public class MKVToolProperties { } public static MKVToolProperties getInstance() { - if(instance == null){ + if (instance == null) { instance = new MKVToolProperties(); } return instance; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index 56ec26f..ca008ee 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -3,7 +3,6 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileCollector; import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileProcessor; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty; import lombok.extern.log4j.Log4j2; import org.apache.commons.cli.*; @@ -27,7 +26,7 @@ public class Main { options.addOption("c", CONFIG.toString(), false, "path to config"); options.addOption("t", THREADS.toString(), true, "thread count"); options.addOption("s", SAFE_MODE.toString(), false, "Test run (no files will be changes)"); - options.addOption(create("k", FORCED_KEYWORDS.toString(),Option.UNLIMITED_VALUES,"Additional keywords to identify forced tracks")); + options.addOption(create("k", FORCED_KEYWORDS.toString(), Option.UNLIMITED_VALUES, "Additional keywords to identify forced tracks")); CommandLineParser parser = new DefaultParser(); HelpFormatter formatter = new HelpFormatter(); @@ -44,7 +43,8 @@ public class Main { config.setLibraryPath(cmd.getOptionValue("library")); config.setSafeMode(cmd.hasOption("safe-mode")); if (cmd.hasOption("threads")) config.setThreadCount(parseInt(cmd.getOptionValue("threads"))); - if (cmd.hasOption(FORCED_KEYWORDS.toString())) config.getForcedKeywords().addAll(List.of(cmd.getOptionValues(FORCED_KEYWORDS.toString()))); + if (cmd.hasOption(FORCED_KEYWORDS.toString())) + config.getForcedKeywords().addAll(List.of(cmd.getOptionValues(FORCED_KEYWORDS.toString()))); config.isValid(); } catch (ParseException e) { log.error(e); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java index 5eeda69..6a7c871 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java @@ -17,7 +17,7 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*; +import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.MKV_TOOL_NIX; @Log4j2 @Getter diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileProcessor.java index 5175e3e..5a5b105 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileProcessor.java @@ -4,6 +4,7 @@ import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto; import java.io.File; +import java.io.IOException; import java.util.List; public interface FileProcessor { @@ -16,5 +17,5 @@ public interface FileProcessor { FileInfoDto filterAttributes(List attributes); - void update(File file, FileInfoDto fileInfo); + void update(File file, FileInfoDto fileInfo) throws IOException; } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java index 2da348a..78d2657 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java @@ -7,7 +7,10 @@ import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.core.util.IOUtils; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.util.*; import java.util.stream.Collectors; @@ -79,10 +82,12 @@ public class MkvFileProcessor implements FileProcessor { private void detectCurrentConfiguration(List attributes, FileInfoDto info, List nonForcedTracks) { Set detectedForcedSubtitleLanes = new HashSet<>(); - for (FileAttribute attribute: attributes) { + for (FileAttribute attribute : attributes) { if (attribute.isDefaultTrack() && AUDIO.equals(attribute.getType())) info.setDefaultAudioLane(attribute); - if (attribute.isDefaultTrack() && SUBTITLES.equals(attribute.getType())) info.setDefaultSubtitleLane(attribute); - if (attribute.isForcedTrack() && SUBTITLES.equals(attribute.getType())) detectedForcedSubtitleLanes.add(attribute); + if (attribute.isDefaultTrack() && SUBTITLES.equals(attribute.getType())) + info.setDefaultSubtitleLane(attribute); + if (attribute.isForcedTrack() && SUBTITLES.equals(attribute.getType())) + detectedForcedSubtitleLanes.add(attribute); } info.setDesiredForcedSubtitleLanes(attributes.stream() @@ -93,13 +98,13 @@ public class MkvFileProcessor implements FileProcessor { } private void detectDesiredConfiguration(FileInfoDto info, List nonForcedTracks) { - for (AttributeConfig config: Config.getInstance().getAttributeConfig()) { + for (AttributeConfig config : Config.getInstance().getAttributeConfig()) { FileAttribute desiredAudio = null; FileAttribute desiredSubtitle = null; - for (FileAttribute attribute: nonForcedTracks) { - if ( attribute.getLanguage().equals(config.getAudioLanguage()) + for (FileAttribute attribute : nonForcedTracks) { + if (attribute.getLanguage().equals(config.getAudioLanguage()) && AUDIO.equals(attribute.getType())) desiredAudio = attribute; - if ( attribute.getLanguage().equals(config.getSubtitleLanguage()) + if (attribute.getLanguage().equals(config.getSubtitleLanguage()) && SUBTITLES.equals(attribute.getType())) desiredSubtitle = attribute; } if (desiredAudio != null && desiredSubtitle != null) { @@ -111,7 +116,7 @@ public class MkvFileProcessor implements FileProcessor { } @Override - public void update(File file, FileInfoDto fileInfo) { + public void update(File file, FileInfoDto fileInfo) throws IOException { StringBuffer sb = new StringBuffer(); sb.append(format("\"%s\" ", Config.getInstance().getPathFor(MkvToolNix.MKV_PROP_EDIT))); sb.append(format("\"%s\" ", file.getAbsolutePath())); @@ -128,17 +133,12 @@ public class MkvFileProcessor implements FileProcessor { sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredSubtitleLane().getId())); } if (fileInfo.areForcedTracksDifferent()) { - for (FileAttribute attribute: fileInfo.getDesiredForcedSubtitleLanes()) { + for (FileAttribute attribute : fileInfo.getDesiredForcedSubtitleLanes()) { sb.append(format(ENABLE_FORCED_TRACK, attribute.getId())); } } - try { - InputStream inputstream = Runtime.getRuntime().exec(sb.toString()).getInputStream(); - log.debug(IOUtils.toString(new InputStreamReader(inputstream))); - } catch (IOException e) { - log.warn("File couldn't be updated: {}", file.getAbsoluteFile()); - } + InputStream inputstream = Runtime.getRuntime().exec(sb.toString()).getInputStream(); + log.debug(IOUtils.toString(new InputStreamReader(inputstream))); } - } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java index 2849946..afd685f 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java @@ -6,8 +6,8 @@ import lombok.extern.log4j.Log4j2; @Log4j2 @Getter public class AttributeConfig { - private String audioLanguage; - private String subtitleLanguage; + private final String audioLanguage; + private final String subtitleLanguage; public AttributeConfig(String audioLanguage, String subtitleLanguage) { this.audioLanguage = audioLanguage; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java index 8d439ca..432ee1b 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java @@ -9,7 +9,7 @@ public enum ConfigProperty { SAFE_MODE("safe-mode"), HELP("help"); - private String property; + private final String property; ConfigProperty(String property) { this.property = property; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java index 8c354f0..fb21473 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java @@ -1,4 +1,53 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; +import lombok.AccessLevel; +import lombok.Getter; + +import java.io.File; + +@Getter public class ResultStatistic { + private static final String result = "Files should change: %s%n" + + "Files successfully changed: %s%n" + + "Files failed changing: %s%n" + + "Files already fitting config: %s%n" + + "Runtime: %ss"; + + private int filesShouldChange = 0; + private int filesSuccessfullyChanged = 0; + private int filesFailed = 0; + private int filesAlreadyFit = 0; + @Getter(AccessLevel.NONE) + private long startTime = 0; + private long runtime = 0; + + public void shouldChange(File file, FileInfoDto fileInfo) { + filesShouldChange++; + } + + public void success(File file, FileInfoDto fileInfo) { + filesSuccessfullyChanged++; + } + + public void failure(File file, FileInfoDto fileInfo) { + filesFailed++; + } + + public void fits(File file, FileInfoDto fileInfo) { + filesAlreadyFit++; + } + + public void startTimer() { + startTime = System.currentTimeMillis(); + } + + public void stopTimer() { + runtime = System.currentTimeMillis() - startTime; + } + + @Override + public String toString() { + return String.format(result, filesShouldChange, filesSuccessfullyChanged, filesFailed, filesAlreadyFit, + runtime / 1000); + } } From 4e53d99c258a599acbce3065206c37d7d2ee353f Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Sat, 2 Apr 2022 18:13:46 +0200 Subject: [PATCH 27/38] Add progress bar --- pom.xml | 5 +++ .../AttributeUpdaterKernel.java | 33 ++++++++++++++----- .../model/ResultStatistic.java | 26 +++++++++------ 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index ae165d1..a1fac2b 100644 --- a/pom.xml +++ b/pom.xml @@ -154,6 +154,11 @@ commons-lang3 3.12.0 + + me.tongfei + progressbar + 0.9.3 + diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index ade9974..940ea1f 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -8,6 +8,9 @@ import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ResultStatistic; import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; +import me.tongfei.progressbar.ProgressBar; +import me.tongfei.progressbar.ProgressBarBuilder; +import me.tongfei.progressbar.ProgressBarStyle; import java.io.File; import java.io.IOException; @@ -33,31 +36,43 @@ public class AttributeUpdaterKernel { public void execute() { statistic.startTimer(); - List files = collector.loadFiles(Config.getInstance().getLibraryPath()); - files.forEach(file -> executor.submit(() -> process(file))); - executor.shutdown(); - executor.awaitTermination(1, TimeUnit.DAYS); + try (ProgressBar progressBar = pbBuilder().build()) { + List files = collector.loadFiles(Config.getInstance().getLibraryPath()); + progressBar.maxHint(files.size()); + files.forEach(file -> executor.submit(() -> process(file, progressBar))); + executor.shutdown(); + executor.awaitTermination(1, TimeUnit.DAYS); + } statistic.stopTimer(); System.out.println(statistic); } - private void process(File file) { + private void process(File file, ProgressBar progressBar) { + statistic.total(); List attributes = processor.loadAttributes(file); FileInfoDto fileInfo = processor.filterAttributes(attributes); if (fileInfo.isChangeNecessary()) { - statistic.shouldChange(file, fileInfo); + statistic.shouldChange(); if (!Config.getInstance().isSafeMode()) { try { processor.update(file, fileInfo); - statistic.success(file, fileInfo); + statistic.success(); } catch (IOException e) { - statistic.failure(file, fileInfo); + statistic.failure(); log.warn("File couldn't be updated: {}", file.getAbsoluteFile()); } } } else { - statistic.fits(file, fileInfo); + statistic.fits(); } + progressBar.step(); + } + + private static ProgressBarBuilder pbBuilder() { + return new ProgressBarBuilder() + .setStyle(ProgressBarStyle.ASCII) + .setUpdateIntervalMillis(250) + .setMaxRenderedLength(75); } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java index fb21473..3cc4cee 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java @@ -7,12 +7,14 @@ import java.io.File; @Getter public class ResultStatistic { - private static final String result = "Files should change: %s%n" + - "Files successfully changed: %s%n" + - "Files failed changing: %s%n" + - "Files already fitting config: %s%n" + + private static final String result = "Total files: %s%n" + + "├─ Should change: %s%n" + + "├─ Successfully changed: %s%n" + + "├─ Already fit config: %s%n" + + "└─ Failed: %s%n" + "Runtime: %ss"; + private int filesTotal = 0; private int filesShouldChange = 0; private int filesSuccessfullyChanged = 0; private int filesFailed = 0; @@ -21,19 +23,23 @@ public class ResultStatistic { private long startTime = 0; private long runtime = 0; - public void shouldChange(File file, FileInfoDto fileInfo) { + public synchronized void total() { + filesTotal++; + } + + public synchronized void shouldChange() { filesShouldChange++; } - public void success(File file, FileInfoDto fileInfo) { + public synchronized void success() { filesSuccessfullyChanged++; } - public void failure(File file, FileInfoDto fileInfo) { + public synchronized void failure() { filesFailed++; } - public void fits(File file, FileInfoDto fileInfo) { + public synchronized void fits() { filesAlreadyFit++; } @@ -47,7 +53,7 @@ public class ResultStatistic { @Override public String toString() { - return String.format(result, filesShouldChange, filesSuccessfullyChanged, filesFailed, filesAlreadyFit, - runtime / 1000); + return String.format(result, filesTotal, filesShouldChange, filesSuccessfullyChanged, filesAlreadyFit, + filesFailed, runtime / 1000); } } From 5d86b4338829ac96cb1dfcc9da2db435f5417642 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Sat, 2 Apr 2022 18:36:13 +0200 Subject: [PATCH 28/38] Update README.md --- README.md | 41 ++++++++++++++++++++++------------------- config-template.yaml | 11 +++++++++++ config.yaml | 17 ----------------- pom.xml | 4 ++-- 4 files changed, 35 insertions(+), 38 deletions(-) create mode 100644 config-template.yaml delete mode 100644 config.yaml diff --git a/README.md b/README.md index b8309ac..bec976a 100644 --- a/README.md +++ b/README.md @@ -17,30 +17,33 @@ This program helps changing audio and subtitle lines of mkv files. Opening terminal / cmd in the directory of the jar and the config file and execute following command: -`java -jar mkvaudiosubtitleschanger.jar [path to mkv or dir with mkv]` +`java -jar mkvaudiosubtitleschanger.jar -l [path to mkv or dir with mkv]` -You have to replace the brackets and the content of it with the path to your mkv file or the directory with mkv files. +### Additional arameters +```properties + -c,--config path to config + -h,--help "for help this is" - Yoda + -k,--forcedKeywords Additional keywords to identify forced tracks + -l,--library path to library (Required) + -s,--safe-mode Test run (no files will be changes) + -t,--threads thread count +``` ### config.yml example -Config file needs to be placed in the same directory as the jar. +Config file needs to be placed in the same directory as the jar or path to config has to be passed via command line +argument. -``` -mkvtoolnixPath: /usr/bin +```yaml +mkvtoolnixPath: C:\Program Files\MKVToolNix +# Recommendations for data stored on HDDs, increase when using SSDs +threads: 2 +#forcedKeywords: ["forced", "signs"] config: 1: - audio: - - jpn - subtitle: - - ger - - eng + audio: ger + subtitle: OFF 2: - audio: - - ger - - eng - subtitle: - - OFF + audio: eng + subtitle: ger ``` -This config will first check if there is japanese audio and german or english subtitles available, if yes, -it will set these attributes. If these are not available, it will check the second part. This means, it checks -if german or english audio is available. It does not care for the subtitle, because it's "off", which means, it -will disable subtitles in this case. +Subtitle lanes recognized as forced will be set as one. Already existing ones will not be overwritten or changed. diff --git a/config-template.yaml b/config-template.yaml new file mode 100644 index 0000000..808c51d --- /dev/null +++ b/config-template.yaml @@ -0,0 +1,11 @@ +mkvtoolnixPath: C:\Program Files\MKVToolNix +# Recommendations for data stored on HDDs, increase when using SSDs +threads: 2 +#forcedKeywords: ["forced", "signs"] +config: + 1: + audio: ger + subtitle: OFF + 2: + audio: eng + subtitle: ger \ No newline at end of file diff --git a/config.yaml b/config.yaml deleted file mode 100644 index 2e94f1f..0000000 --- a/config.yaml +++ /dev/null @@ -1,17 +0,0 @@ -mkvtoolnixPath: C:\Program Files\MKVToolNix -# Only edit this value if you know what you are doing, otherwise it may impact your performance negatively -threads: 2 -#forcedKeywords: ["forced", "signs"] -config: - 1: - audio: jpn - subtitle: ger - 2: - audio: jpn - subtitle: eng - 3: - audio: ger - subtitle: OFF - 4: - audio: eng - subtitle: OFF diff --git a/pom.xml b/pom.xml index ca6ab2a..69584ec 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - MKVAudioSubtilesChanger - MKVAudioSubtitlesChanger + MKVAudioSubtileChanger + MKVAudioSubtitleChanger 2.0 From 0ee92cfd7fd31070073720cd5a30eebf7e62dc94 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 2 Apr 2022 18:47:39 +0200 Subject: [PATCH 29/38] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 5cbf3fede23977b8c27b816d932913ff863e172b Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Mon, 4 Apr 2022 23:40:42 +0200 Subject: [PATCH 30/38] Add property for file exclusion --- README.md | 13 ++++---- config-template.yaml | 3 ++ .../AttributeUpdaterKernel.java | 10 +++++- .../MKVToolProperties.java | 25 -------------- .../mkvaudiosubtitlechanger/Main.java | 33 ++++++++++--------- .../config/Config.java | 16 ++++++--- .../impl/MkvFileCollector.java | 2 +- .../model/ConfigProperty.java | 26 +++++++++------ .../util/CommandLineOptionsUtil.java | 23 +++++++++++++ 9 files changed, 87 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/CommandLineOptionsUtil.java diff --git a/README.md b/README.md index bec976a..5b5de01 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,13 @@ Opening terminal / cmd in the directory of the jar and the config file and execu ### Additional arameters ```properties - -c,--config path to config - -h,--help "for help this is" - Yoda - -k,--forcedKeywords Additional keywords to identify forced tracks - -l,--library path to library (Required) - -s,--safe-mode Test run (no files will be changes) - -t,--threads thread count + -c,--config path to config + -e,--exclude-directories Directories to exclude + -h,--help "for help this is" - Yoda + -k,--forcedKeywords Additional keywords to identify forcedtracks" + -l,--library path to library + -s,--safe-mode Test run (no files will be changes) + -t,--threads thread count ``` ### config.yml example diff --git a/config-template.yaml b/config-template.yaml index 808c51d..c7174b9 100644 --- a/config-template.yaml +++ b/config-template.yaml @@ -2,6 +2,9 @@ mkvtoolnixPath: C:\Program Files\MKVToolNix # Recommendations for data stored on HDDs, increase when using SSDs threads: 2 #forcedKeywords: ["forced", "signs"] +#exclude-directories: +# - "D:/Path/To/File.mkv" +# - "D:/Path/To/Directory" config: 1: audio: ger diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index 940ea1f..2e484c7 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -14,10 +14,12 @@ import me.tongfei.progressbar.ProgressBarStyle; import java.io.File; import java.io.IOException; +import java.util.Collection; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; @Log4j2 public class AttributeUpdaterKernel { @@ -37,7 +39,13 @@ public class AttributeUpdaterKernel { statistic.startTimer(); try (ProgressBar progressBar = pbBuilder().build()) { - List files = collector.loadFiles(Config.getInstance().getLibraryPath()); + List excludedFiles = Config.getInstance().getExcludedDirectories().stream() + .map(collector::loadFiles) + .flatMap(Collection::stream) + .collect(Collectors.toList()); + List files = collector.loadFiles(Config.getInstance().getLibraryPath()).stream() + .filter(file -> !excludedFiles.contains(file)) + .collect(Collectors.toList()); progressBar.maxHint(files.size()); files.forEach(file -> executor.submit(() -> process(file, progressBar))); executor.shutdown(); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java deleted file mode 100644 index 53b9ddb..0000000 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/MKVToolProperties.java +++ /dev/null @@ -1,25 +0,0 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger; - -import lombok.Getter; -import lombok.Setter; -import lombok.extern.log4j.Log4j2; - -@Log4j2 -@Getter -@Setter -public class MKVToolProperties { - private String mkvmergePath; - private String mkvpropeditPath; - - private static MKVToolProperties instance = null; - - private MKVToolProperties() { - } - - public static MKVToolProperties getInstance() { - if (instance == null) { - instance = new MKVToolProperties(); - } - return instance; - } -} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index ca008ee..f018e41 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -9,6 +9,7 @@ import org.apache.commons.cli.*; import java.util.List; import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*; +import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf; import static java.lang.Integer.parseInt; @Log4j2 @@ -20,14 +21,7 @@ public class Main { } private static void initConfig(String[] args) { - Options options = new Options(); - options.addOption("h", HELP.toString(), false, "\"for help this is\" - Yoda"); - options.addRequiredOption("l", LIBRARY.toString(), true, "path to library"); - options.addOption("c", CONFIG.toString(), false, "path to config"); - options.addOption("t", THREADS.toString(), true, "thread count"); - options.addOption("s", SAFE_MODE.toString(), false, "Test run (no files will be changes)"); - options.addOption(create("k", FORCED_KEYWORDS.toString(), Option.UNLIMITED_VALUES, "Additional keywords to identify forced tracks")); - + Options options = initOptions(); CommandLineParser parser = new DefaultParser(); HelpFormatter formatter = new HelpFormatter(); try { @@ -39,12 +33,14 @@ public class Main { } Config config = Config.getInstance(); - config.loadConfig(cmd.getOptionValue(CONFIG.toString(), "config.yaml")); // use cmd input + config.loadConfig(cmd.getOptionValue(CONFIG_PATH.prop(), "config.yaml")); // use cmd input config.setLibraryPath(cmd.getOptionValue("library")); config.setSafeMode(cmd.hasOption("safe-mode")); if (cmd.hasOption("threads")) config.setThreadCount(parseInt(cmd.getOptionValue("threads"))); - if (cmd.hasOption(FORCED_KEYWORDS.toString())) - config.getForcedKeywords().addAll(List.of(cmd.getOptionValues(FORCED_KEYWORDS.toString()))); + if (cmd.hasOption(FORCED_KEYWORDS.prop())) + config.getForcedKeywords().addAll(List.of(cmd.getOptionValues(FORCED_KEYWORDS.prop()))); + if (cmd.hasOption(EXCLUDE_DIRECTORY.prop())) + config.getExcludedDirectories().addAll(List.of(cmd.getOptionValues(EXCLUDE_DIRECTORY.prop()))); config.isValid(); } catch (ParseException e) { log.error(e); @@ -53,10 +49,15 @@ public class Main { } } - private static Option create(String opt, String longOpt, int args, String desc) { - Option option = new Option(opt, desc); - option.setLongOpt(longOpt); - option.setArgs(args); - return option; + private static Options initOptions() { + Options options = new Options(); + options.addOption(optionOf(HELP, "h", false)); + options.addOption(optionOf(LIBRARY, "l", true, true)); + options.addOption(optionOf(CONFIG_PATH, "c", false)); + options.addOption(optionOf(THREADS, "t", true)); + options.addOption(optionOf(SAFE_MODE, "s", false)); + options.addOption(optionOf(FORCED_KEYWORDS, "k", Option.UNLIMITED_VALUES, false)); + options.addOption(optionOf(EXCLUDE_DIRECTORY, "e", Option.UNLIMITED_VALUES, false)); + return options; } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java index 6a7c871..9f22a83 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java @@ -30,6 +30,7 @@ public class Config { private List attributeConfig; private int threadCount; private Set forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs")); + private Set excludedDirectories = new HashSet<>(); @Getter(AccessLevel.NONE) private String mkvtoolnixPath; private String libraryPath; @@ -73,6 +74,7 @@ public class Config { setMkvtoolnixPath(loadMkvToolNixPath(config)); setWindows(System.getProperty("os.name").toLowerCase().contains("windows")); getForcedKeywords().addAll(loadForcedKeywords(config)); + getExcludedDirectories().addAll(loadExcludeDirectories(config)); } catch (YamlInvalidContentException | YamlKeyNotFoundException | IOException e) { log.fatal("Config could not be loaded: {}", e.getMessage()); } @@ -90,18 +92,22 @@ public class Config { } private int loadThreadCount(YAML config) throws YamlKeyNotFoundException { - return config.isSet(ConfigProperty.THREADS.toString()) - ? Integer.parseInt(config.getString(ConfigProperty.THREADS.toString())) + return config.isSet(ConfigProperty.THREADS.prop()) + ? Integer.parseInt(config.getString(ConfigProperty.THREADS.prop())) : 1; } private List loadForcedKeywords(YAML config) { - return config.getStringList(ConfigProperty.FORCED_KEYWORDS.toString(), new ArrayList<>()); + return config.getStringList(ConfigProperty.FORCED_KEYWORDS.prop(), new ArrayList<>()); + } + + private List loadExcludeDirectories(YAML config) { + return config.getStringList(ConfigProperty.EXCLUDE_DIRECTORY.prop(), new ArrayList<>()); } private String loadMkvToolNixPath(YAML config) throws YamlKeyNotFoundException { - return config.isSet(MKV_TOOL_NIX.toString()) - ? config.getString(MKV_TOOL_NIX.toString()) + return config.isSet(MKV_TOOL_NIX.prop()) + ? config.getString(MKV_TOOL_NIX.prop()) : defaultMkvToolNixPath(); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java index 6de706b..6540958 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java @@ -19,7 +19,7 @@ public class MkvFileCollector implements FileCollector { public List loadFiles(String path) { File file = new File(path); if (file.isFile() && file.getAbsolutePath().endsWith(".mkv")) { - return new ArrayList() {{ + return new ArrayList<>() {{ add(file); }}; } else if (file.isDirectory()) { diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java index 432ee1b..cb478ed 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java @@ -1,22 +1,28 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; public enum ConfigProperty { - MKV_TOOL_NIX("mkvtoolnixPath"), - THREADS("threads"), - FORCED_KEYWORDS("forcedKeywords"), - CONFIG("config"), - LIBRARY("library"), - SAFE_MODE("safe-mode"), - HELP("help"); + MKV_TOOL_NIX("mkvtoolnixPath", "Path to mkv tool nix installation"), + THREADS("threads", "thread count"), + FORCED_KEYWORDS("forcedKeywords", "Additional keywords to identify forced tracks\""), + CONFIG_PATH("config", "path to config"), + LIBRARY("library", "path to library"), + SAFE_MODE("safe-mode", "Test run (no files will be changes)"), + HELP("help", "\"for help this is\" - Yoda"), + EXCLUDE_DIRECTORY("exclude-directories", "Directories to exclude"); private final String property; + private final String description; - ConfigProperty(String property) { + ConfigProperty(String property, String description) { this.property = property; + this.description = description; } - @Override - public String toString() { + public String desc() { + return description; + } + + public String prop() { return property; } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/CommandLineOptionsUtil.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/CommandLineOptionsUtil.java new file mode 100644 index 0000000..95607ac --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/CommandLineOptionsUtil.java @@ -0,0 +1,23 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; + +import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty; +import org.apache.commons.cli.Option; + +public class CommandLineOptionsUtil { + public static Option optionOf(ConfigProperty property, String opt, boolean hasArg) { + return optionOf(property, opt, hasArg ? 1 : 0, false); + } + + public static Option optionOf(ConfigProperty property, String opt, boolean hasArg, boolean required) { + return optionOf(property, opt, hasArg ? 1 : 0, required); + } + + public static Option optionOf(ConfigProperty property, String opt, int args, boolean required) { + Option option = new Option(opt, property.desc()); + option.setArgs(args); + option.setLongOpt(property.prop()); + option.setRequired(required); + return option; + } + +} From c2f32a30cec171ec265477336f34dacff795f152 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Mon, 11 Apr 2022 23:26:34 +0200 Subject: [PATCH 31/38] Add property to include/exclude files by pattern --- README.md | 4 +++- .../mkvaudiosubtitlechanger/Main.java | 4 ++++ .../config/Config.java | 23 ++++++++++++++++++- .../impl/MkvFileCollector.java | 2 ++ .../model/ConfigProperty.java | 3 ++- 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5b5de01..2889947 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,13 @@ Opening terminal / cmd in the directory of the jar and the config file and execu `java -jar mkvaudiosubtitleschanger.jar -l [path to mkv or dir with mkv]` ### Additional arameters +These properties overwrite already existing values in the config file. ```properties -c,--config path to config -e,--exclude-directories Directories to exclude -h,--help "for help this is" - Yoda - -k,--forcedKeywords Additional keywords to identify forcedtracks" + -i,--include-pattern Include files matching pattern + -k,--forcedKeywords Additional keywords to identify forced tracks" -l,--library path to library -s,--safe-mode Test run (no files will be changes) -t,--threads thread count diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index f018e41..0c30167 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -41,6 +41,9 @@ public class Main { config.getForcedKeywords().addAll(List.of(cmd.getOptionValues(FORCED_KEYWORDS.prop()))); if (cmd.hasOption(EXCLUDE_DIRECTORY.prop())) config.getExcludedDirectories().addAll(List.of(cmd.getOptionValues(EXCLUDE_DIRECTORY.prop()))); + if (cmd.hasOption(INCLUDE_PATTERN.prop())) { + config.setIncludePattern(Config.compilePattern(cmd.getOptionValue(INCLUDE_PATTERN.prop()), INCLUDE_PATTERN)); + } config.isValid(); } catch (ParseException e) { log.error(e); @@ -58,6 +61,7 @@ public class Main { options.addOption(optionOf(SAFE_MODE, "s", false)); options.addOption(optionOf(FORCED_KEYWORDS, "k", Option.UNLIMITED_VALUES, false)); options.addOption(optionOf(EXCLUDE_DIRECTORY, "e", Option.UNLIMITED_VALUES, false)); + options.addOption(optionOf(INCLUDE_PATTERN, "i", true)); return options; } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java index 9f22a83..7a056a5 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java @@ -15,9 +15,11 @@ import java.io.File; import java.io.IOException; import java.util.*; import java.util.function.Function; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.MKV_TOOL_NIX; +import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*; @Log4j2 @Getter @@ -31,6 +33,7 @@ public class Config { private int threadCount; private Set forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs")); private Set excludedDirectories = new HashSet<>(); + private Pattern includePattern; @Getter(AccessLevel.NONE) private String mkvtoolnixPath; private String libraryPath; @@ -75,6 +78,7 @@ public class Config { setWindows(System.getProperty("os.name").toLowerCase().contains("windows")); getForcedKeywords().addAll(loadForcedKeywords(config)); getExcludedDirectories().addAll(loadExcludeDirectories(config)); + loadIncludePattern(config); } catch (YamlInvalidContentException | YamlKeyNotFoundException | IOException e) { log.fatal("Config could not be loaded: {}", e.getMessage()); } @@ -105,6 +109,23 @@ public class Config { return config.getStringList(ConfigProperty.EXCLUDE_DIRECTORY.prop(), new ArrayList<>()); } + private void loadIncludePattern(YAML config) throws YamlKeyNotFoundException { + if (config.isSet(INCLUDE_PATTERN.prop())) { + includePattern = compilePattern(config.getString(INCLUDE_PATTERN.prop()), INCLUDE_PATTERN); + } else { + includePattern = Pattern.compile(".*"); + } + } + + public static Pattern compilePattern(String pattern, ConfigProperty origin) { + try { + return Pattern.compile(pattern); + } catch (PatternSyntaxException e) { + log.error("{} is not a valid regex pattern!", origin.prop()); + throw new RuntimeException(String.format("%s is not a valid regex pattern!%n", origin.prop())); + } + } + private String loadMkvToolNixPath(YAML config) throws YamlKeyNotFoundException { return config.isSet(MKV_TOOL_NIX.prop()) ? config.getString(MKV_TOOL_NIX.prop()) diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java index 6540958..0023dce 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java @@ -1,5 +1,6 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import lombok.extern.log4j.Log4j2; import java.io.File; @@ -28,6 +29,7 @@ public class MkvFileCollector implements FileCollector { .filter(Files::isRegularFile) .map(Path::toFile) .filter(f -> f.getAbsolutePath().endsWith(".mkv")) + .filter(f -> Config.getInstance().getIncludePattern().matcher(f.getName()).matches()) .collect(Collectors.toList()); } catch (IOException e) { log.error("Couldn't find file or directory!", e); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java index cb478ed..92433e8 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java @@ -8,7 +8,8 @@ public enum ConfigProperty { LIBRARY("library", "path to library"), SAFE_MODE("safe-mode", "Test run (no files will be changes)"), HELP("help", "\"for help this is\" - Yoda"), - EXCLUDE_DIRECTORY("exclude-directories", "Directories to exclude"); + EXCLUDE_DIRECTORY("exclude-directories", "Directories to exclude"), + INCLUDE_PATTERN("include-pattern", "Include files matching pattern"); private final String property; private final String description; From a606c506374f0e433daacd77104de733e5ed54d3 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Mon, 18 Apr 2022 15:07:56 +0200 Subject: [PATCH 32/38] Add language validation & refactor config initialization --- config-template.yaml | 2 +- language-codes | 487 ++++++++++++++++++ pom.xml | 10 +- .../mkvaudiosubtitlechanger/Main.java | 54 +- .../config/Config.java | 236 ++++++--- .../config/ConfigErrors.java | 22 + .../config/InvalidConfigException.java | 7 + .../model/AttributeConfig.java | 4 - .../model/ConfigProperty.java | 16 +- .../util/LanguageValidatorUtil.java | 44 ++ 10 files changed, 730 insertions(+), 152 deletions(-) create mode 100644 language-codes create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigErrors.java create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/InvalidConfigException.java create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java diff --git a/config-template.yaml b/config-template.yaml index c7174b9..c2338ea 100644 --- a/config-template.yaml +++ b/config-template.yaml @@ -1,4 +1,4 @@ -mkvtoolnixPath: C:\Program Files\MKVToolNix +mkvtoolnix: C:\Program Files\MKVToolNix # Recommendations for data stored on HDDs, increase when using SSDs threads: 2 #forcedKeywords: ["forced", "signs"] diff --git a/language-codes b/language-codes new file mode 100644 index 0000000..232f224 --- /dev/null +++ b/language-codes @@ -0,0 +1,487 @@ +aar +abk +ace +ach +ada +ady +afa +afh +afr +ain +aka +akk +alb +ale +alg +alt +ang +amh +anp +apa +ara +arc +arg +arm +arn +arp +art +arw +asm +ast +ath +aus +ava +ave +awa +aym +aze +bad +bai +bak +bal +bam +ban +baq +bas +bat +bej +bel +bem +ben +ber +bho +bih +bik +bin +bis +bla +bnt +bos +bra +bre +btk +bua +bug +bul +bur +byn +cad +cai +car +cat +cau +ceb +cel +cha +chb +che +chg +chi +chk +chm +chn +cho +chp +chr +chu +chv +chy +cmc +cnr +cop +cor +cos +cpe +cpf +cpp +cre +crh +crp +csb +cus +cze +dak +dan +dar +day +del +den +dgr +din +div +doi +dra +dsb +dua +dum +dut +dyu +dzo +efi +egy +eka +elx +eng +enm +epo +est +ewe +ewo +fan +fao +fat +fij +fil +fin +fiu +fon +fre +frm +fro +frr +frs +fry +ful +fur +gaa +gay +gba +gem +geo +ger +gez +gil +gla +gle +glg +glv +gmh +goh +gon +gor +got +grb +grc +gre +grn +gsw +guj +gwi +hai +hat +hau +haw +heb +her +hil +him +hin +hit +hmn +hmo +hrv +hsb +hun +hup +iba +ibo +ice +ido +iii +ijo +iku +ile +ilo +ina +inc +ind +ine +inh +ipk +ira +iro +ita +jav +jbo +jpn +jpr +jrb +kaa +kab +kac +kal +kam +kan +kar +kas +kau +kaw +kaz +kbd +kha +khi +khm +kho +kik +kin +kir +kmb +kok +kom +kon +kor +kos +kpe +krc +krl +kro +kru +kua +kum +kur +kut +lad +lah +lam +lao +lat +lav +lez +lim +lin +lit +lol +loz +ltz +lua +lub +lug +lui +lun +luo +lus +mac +mad +mag +mah +mai +mak +mal +man +mao +map +mar +mas +may +mdf +mdr +men +mga +mic +min +mis +mkh +mlg +mlt +mnc +mni +mno +moh +mon +mos +mul +mun +mus +mwl +mwr +myn +myv +nah +nai +nap +nau +nav +nbl +nde +ndo +nds +nep +new +nia +nic +niu +nno +nob +nog +non +nor +nqo +nso +nub +nwc +nya +nym +nyn +nyo +nzi +oci +oji +ori +orm +osa +oss +ota +oto +paa +pag +pal +pam +pan +pap +pau +peo +per +phi +phn +pli +pol +pon +por +pra +pro +pus +que +raj +rap +rar +roa +roh +rom +rum +run +rup +rus +sad +sag +sah +sai +sal +sam +san +sas +sat +scn +sco +sel +sem +sga +sgn +shn +sid +sin +sio +sit +sla +slo +slv +sma +sme +smi +smj +smn +smo +sms +sna +snd +snk +sog +som +son +sot +spa +srd +srn +srp +srr +ssa +ssw +suk +sun +sus +sux +swa +swe +syc +syr +tah +tai +tam +tat +tel +tem +ter +tet +tgk +tgl +tha +tib +tig +tir +tiv +tkl +tlh +tli +tmh +tog +ton +tpi +tsi +tsn +tso +tuk +tum +tup +tur +tut +tvl +twi +tyv +udm +uga +uig +ukr +umb +und +urd +uzb +vai +ven +vie +vol +vot +wak +wal +war +was +wel +wen +wln +wol +xal +xho +yao +yap +yid +yor +ypk +zap +zbl +zen +zgh +zha +znd +zul +zun +zxx +zza +OFF \ No newline at end of file diff --git a/pom.xml b/pom.xml index 69584ec..65e1b37 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,12 @@ src/main/resources + + ./ + + language-codes + + @@ -76,8 +82,8 @@ org.apache.maven.plugins maven-compiler-plugin - 9 - 9 + 11 + 11 diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java index 0c30167..6e26216 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java @@ -4,64 +4,12 @@ import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileCollector; import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileProcessor; import lombok.extern.log4j.Log4j2; -import org.apache.commons.cli.*; - -import java.util.List; - -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf; -import static java.lang.Integer.parseInt; @Log4j2 public class Main { public static void main(String[] args) { - initConfig(args); + Config.getInstance().initConfig(args); AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(new MkvFileCollector(), new MkvFileProcessor()); kernel.execute(); } - - private static void initConfig(String[] args) { - Options options = initOptions(); - CommandLineParser parser = new DefaultParser(); - HelpFormatter formatter = new HelpFormatter(); - try { - CommandLine cmd = parser.parse(options, args); - - if (cmd.hasOption("help")) { - formatter.printHelp("java -jar MKVAudioSubtitlesChanger.jar -p ", options); - System.exit(0); - } - - Config config = Config.getInstance(); - config.loadConfig(cmd.getOptionValue(CONFIG_PATH.prop(), "config.yaml")); // use cmd input - config.setLibraryPath(cmd.getOptionValue("library")); - config.setSafeMode(cmd.hasOption("safe-mode")); - if (cmd.hasOption("threads")) config.setThreadCount(parseInt(cmd.getOptionValue("threads"))); - if (cmd.hasOption(FORCED_KEYWORDS.prop())) - config.getForcedKeywords().addAll(List.of(cmd.getOptionValues(FORCED_KEYWORDS.prop()))); - if (cmd.hasOption(EXCLUDE_DIRECTORY.prop())) - config.getExcludedDirectories().addAll(List.of(cmd.getOptionValues(EXCLUDE_DIRECTORY.prop()))); - if (cmd.hasOption(INCLUDE_PATTERN.prop())) { - config.setIncludePattern(Config.compilePattern(cmd.getOptionValue(INCLUDE_PATTERN.prop()), INCLUDE_PATTERN)); - } - config.isValid(); - } catch (ParseException e) { - log.error(e); - formatter.printHelp("java -jar MKVAudioSubtitlesChanger.jar -p ", options); - System.exit(1); - } - } - - private static Options initOptions() { - Options options = new Options(); - options.addOption(optionOf(HELP, "h", false)); - options.addOption(optionOf(LIBRARY, "l", true, true)); - options.addOption(optionOf(CONFIG_PATH, "c", false)); - options.addOption(optionOf(THREADS, "t", true)); - options.addOption(optionOf(SAFE_MODE, "s", false)); - options.addOption(optionOf(FORCED_KEYWORDS, "k", Option.UNLIMITED_VALUES, false)); - options.addOption(optionOf(EXCLUDE_DIRECTORY, "e", Option.UNLIMITED_VALUES, false)); - options.addOption(optionOf(INCLUDE_PATTERN, "i", true)); - return options; - } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java index 7a056a5..7209343 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java @@ -1,45 +1,57 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix; import at.pcgamingfreaks.yaml.YAML; import at.pcgamingfreaks.yaml.YamlInvalidContentException; -import at.pcgamingfreaks.yaml.YamlKeyNotFoundException; import lombok.AccessLevel; import lombok.Getter; -import lombok.Setter; +import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; +import org.apache.commons.cli.*; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.function.Function; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*; +import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf; +import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LanguageValidatorUtil.isLanguageValid; @Log4j2 @Getter -@Setter public class Config { @Getter(AccessLevel.NONE) - @Setter(AccessLevel.NONE) + CommandLineParser parser = new DefaultParser(); + @Getter(AccessLevel.NONE) + HelpFormatter formatter = new HelpFormatter(); + + @Getter(AccessLevel.NONE) private static Config config = null; - private List attributeConfig; - private int threadCount; - private Set forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs")); - private Set excludedDirectories = new HashSet<>(); - private Pattern includePattern; - @Getter(AccessLevel.NONE) - private String mkvtoolnixPath; + private File configPath; private String libraryPath; private boolean isSafeMode; + + private int threadCount; + private Pattern includePattern; + @Getter(AccessLevel.NONE) + private String mkvToolNixPath; + private boolean isWindows; + private final Set forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs")); + private final Set excludedDirectories = new HashSet<>(); + + private List attributeConfig; + public static Config getInstance() { if (config == null) { config = new Config(); @@ -47,99 +59,155 @@ public class Config { return config; } - public void isValid() throws RuntimeException { - boolean isValid = true; - if (attributeConfig == null || attributeConfig.isEmpty() - || !attributeConfig.stream().allMatch(AttributeConfig::isValid)) { - isValid = false; - System.out.println("Audio & subtitle configuration invalid!"); - } - if (threadCount <= 0) { - isValid = false; - System.out.println("Thread count needs to be at least 1!"); - } - if (mkvtoolnixPath.isEmpty() - || !new File(getPathFor(MkvToolNix.MKV_MERGER)).isFile() - || !new File(getPathFor(MkvToolNix.MKV_PROP_EDIT)).isFile()) { - isValid = false; - System.out.println("MkvToolNix installation path invalid!"); + public void initConfig(String[] args) throws InvalidConfigException { + ConfigErrors errors = new ConfigErrors(); + CommandLine cmd = null; + Options options = initOptions(); + + try { + cmd = parser.parse(options, args); + if (cmd == null) throw new NullPointerException(); + } catch (ParseException | NullPointerException e) { + formatter.printHelp(106, "java -jar MKVAudioSubtitlesChanger.jar -l ", + "\nParameters:", options, + "\nFeature requests and bug reports: https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/issues"); + System.exit(1); } - if (!isValid) { - throw new RuntimeException("Invalid configuration"); + exitIfHelp(cmd, options); + + configPath = loadConfigPath(cmd, errors); + libraryPath = loadLibraryPath(cmd, errors); + isSafeMode = cmd.hasOption(SAFE_MODE.prop()); + + try (YAML config = new YAML(configPath)) { + threadCount = loadThreadCount(cmd, config); + includePattern = loadIncludePattern(cmd, config, errors); + mkvToolNixPath = loadMkvToolNixPath(cmd, config, errors); + + isWindows = loadOperatingSystem(); + + loadForcedKeywords(cmd, config); + loadExcludedDirectories(cmd, config); + + attributeConfig = loadAttributeConfig(config, errors); + } catch (IOException | YamlInvalidContentException ignored) {} + + if (errors.hasErrors()) { + throw new InvalidConfigException(errors); } } - public void loadConfig(String configPath) { - try (YAML config = new YAML(new File(configPath))) { - setAttributeConfig(loadAttributeConfig(config)); - setThreadCount(loadThreadCount(config)); - setMkvtoolnixPath(loadMkvToolNixPath(config)); - setWindows(System.getProperty("os.name").toLowerCase().contains("windows")); - getForcedKeywords().addAll(loadForcedKeywords(config)); - getExcludedDirectories().addAll(loadExcludeDirectories(config)); - loadIncludePattern(config); - } catch (YamlInvalidContentException | YamlKeyNotFoundException | IOException e) { - log.fatal("Config could not be loaded: {}", e.getMessage()); + private static Options initOptions() { + Options options = new Options(); + options.addOption(optionOf(HELP, "h", false)); + options.addOption(optionOf(LIBRARY, "l", true)); + options.addOption(optionOf(MKV_TOOL_NIX, "m", true)); + options.addOption(optionOf(CONFIG_PATH, "c", true)); + options.addOption(optionOf(THREADS, "t", true)); + options.addOption(optionOf(SAFE_MODE, "s", false)); + options.addOption(optionOf(FORCED_KEYWORDS, "k", Option.UNLIMITED_VALUES, false)); + options.addOption(optionOf(EXCLUDE_DIRECTORY, "e", Option.UNLIMITED_VALUES, false)); + options.addOption(optionOf(INCLUDE_PATTERN, "i", true)); + return options; + } + + private void exitIfHelp(CommandLine cmd, Options options) { + if (cmd.hasOption("help")) { + formatter.printHelp(106, "java -jar MKVAudioSubtitlesChanger.jar -l ", + "\nParameters:", options, + "\nFeature requests and bug reports: https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/issues"); + System.exit(0); } } - private List loadAttributeConfig(YAML config) { + private File loadConfigPath(CommandLine cmd, ConfigErrors errors) { + File configPath = new File(cmd.getOptionValue(CONFIG_PATH.prop(), "config.yaml")); + if (configPath.isFile()) return configPath; + + errors.add("invalid config path"); + return null; + } + + private String loadLibraryPath(CommandLine cmd, ConfigErrors errors) { + if (cmd.hasOption(LIBRARY.prop())) { + File libraryPath = new File(cmd.getOptionValue(LIBRARY.prop())); + if (libraryPath.isFile() || libraryPath.isDirectory()) { + return libraryPath.getAbsolutePath(); + } else { + errors.add("invalid library path"); + } + } else { + errors.add("missing library path"); + } + return null; + } + + private int loadThreadCount(CommandLine cmd, YAML config) { + return cmd.hasOption(THREADS.prop()) + ? Integer.parseInt(cmd.getOptionValue(THREADS.prop())) + : config.getInt(THREADS.prop(), 2); + } + + private Pattern loadIncludePattern(CommandLine cmd, YAML config, ConfigErrors errors) { + try { + return Pattern.compile(cmd.hasOption(INCLUDE_PATTERN.prop()) + ? cmd.getOptionValue(INCLUDE_PATTERN.prop()) + : config.getString(INCLUDE_PATTERN.prop(), ".*")); + } catch (PatternSyntaxException e) { + errors.add("invalid regex pattern"); + } + return null; + } + + @SneakyThrows + private String loadMkvToolNixPath(CommandLine cmd, YAML config, ConfigErrors errors){ + if (cmd.hasOption(MKV_TOOL_NIX.prop())) return cmd.getOptionValue(MKV_TOOL_NIX.prop()); + if (config.isSet(MKV_TOOL_NIX.prop())) return config.getString(MKV_TOOL_NIX.prop()); + errors.add("path to mkv tool nix installation missing"); + return null; + } + + private boolean loadOperatingSystem() { + return System.getProperty("os.name").toLowerCase().contains("windows"); + } + + @SneakyThrows + private void loadForcedKeywords(CommandLine cmd, YAML config) { + if (cmd.hasOption(FORCED_KEYWORDS.prop())) forcedKeywords.addAll(List.of(cmd.getOptionValues(FORCED_KEYWORDS.prop()))); + if (config.isSet(FORCED_KEYWORDS.prop())) forcedKeywords.addAll(config.getStringList(FORCED_KEYWORDS.prop())); + } + + @SneakyThrows + private void loadExcludedDirectories(CommandLine cmd, YAML config) { + if (cmd.hasOption(EXCLUDE_DIRECTORY.prop())) excludedDirectories.addAll(List.of(cmd.getOptionValues(EXCLUDE_DIRECTORY.prop()))); + if (config.isSet(EXCLUDE_DIRECTORY.prop())) excludedDirectories.addAll(config.getStringList(EXCLUDE_DIRECTORY.prop())); + } + + private List loadAttributeConfig(YAML config, ConfigErrors errors) { Function audio = key -> config.getString(key + ".audio", null); Function subtitle = key -> config.getString(key + ".subtitle", null); - return config.getKeysFiltered(".*audio.*").stream() + List attributeConfigs = config.getKeysFiltered(".*audio.*").stream() .sorted() .map(key -> key.replace(".audio", "")) .map(key -> new AttributeConfig(audio.apply(key), subtitle.apply(key))) .collect(Collectors.toList()); - } - private int loadThreadCount(YAML config) throws YamlKeyNotFoundException { - return config.isSet(ConfigProperty.THREADS.prop()) - ? Integer.parseInt(config.getString(ConfigProperty.THREADS.prop())) - : 1; - } - - private List loadForcedKeywords(YAML config) { - return config.getStringList(ConfigProperty.FORCED_KEYWORDS.prop(), new ArrayList<>()); - } - - private List loadExcludeDirectories(YAML config) { - return config.getStringList(ConfigProperty.EXCLUDE_DIRECTORY.prop(), new ArrayList<>()); - } - - private void loadIncludePattern(YAML config) throws YamlKeyNotFoundException { - if (config.isSet(INCLUDE_PATTERN.prop())) { - includePattern = compilePattern(config.getString(INCLUDE_PATTERN.prop()), INCLUDE_PATTERN); + if (attributeConfigs.isEmpty()) { + errors.add("no language configuration"); } else { - includePattern = Pattern.compile(".*"); + for (AttributeConfig attributeConfig : attributeConfigs) { + isLanguageValid(attributeConfig.getAudioLanguage(), errors); + isLanguageValid(attributeConfig.getSubtitleLanguage(), errors); + } } - } - public static Pattern compilePattern(String pattern, ConfigProperty origin) { - try { - return Pattern.compile(pattern); - } catch (PatternSyntaxException e) { - log.error("{} is not a valid regex pattern!", origin.prop()); - throw new RuntimeException(String.format("%s is not a valid regex pattern!%n", origin.prop())); - } - } - - private String loadMkvToolNixPath(YAML config) throws YamlKeyNotFoundException { - return config.isSet(MKV_TOOL_NIX.prop()) - ? config.getString(MKV_TOOL_NIX.prop()) - : defaultMkvToolNixPath(); - } - - private String defaultMkvToolNixPath() { - return System.getProperty("os.name").toLowerCase().contains("windows") - ? "C:/Program Files/MKVToolNix/" - : "/usr/bin/"; + return attributeConfigs; } public String getPathFor(MkvToolNix exe) { - return mkvtoolnixPath.endsWith("/") ? mkvtoolnixPath + exe : mkvtoolnixPath + "/" + exe; + return mkvToolNixPath.endsWith("/") ? mkvToolNixPath + exe : mkvToolNixPath + "/" + exe; } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigErrors.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigErrors.java new file mode 100644 index 0000000..50cecae --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigErrors.java @@ -0,0 +1,22 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; + +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class ConfigErrors { + private final List errors = new ArrayList<>(); + + public void add(String errorMessage) { + errors.add(errorMessage); + } + + public boolean hasErrors() { + return !errors.isEmpty(); + } + + public String toString() { + return StringUtils.capitalize(String.join(", ", errors)); + } +} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/InvalidConfigException.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/InvalidConfigException.java new file mode 100644 index 0000000..9a42eb9 --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/InvalidConfigException.java @@ -0,0 +1,7 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; + +public class InvalidConfigException extends RuntimeException{ + public InvalidConfigException(ConfigErrors errors) { + super("Errors in config: " + errors); + } +} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java index afd685f..fc68e25 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java @@ -14,10 +14,6 @@ public class AttributeConfig { this.subtitleLanguage = subtitleLanguage; } - public boolean isValid() { - return audioLanguage != null && subtitleLanguage != null; - } - @Override public String toString() { final StringBuffer sb = new StringBuffer("AttributeConfig{"); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java index 92433e8..358719d 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java @@ -1,15 +1,15 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; public enum ConfigProperty { - MKV_TOOL_NIX("mkvtoolnixPath", "Path to mkv tool nix installation"), - THREADS("threads", "thread count"), - FORCED_KEYWORDS("forcedKeywords", "Additional keywords to identify forced tracks\""), - CONFIG_PATH("config", "path to config"), - LIBRARY("library", "path to library"), + CONFIG_PATH("config", "Path to config file"), + LIBRARY("library", "Path to library"), SAFE_MODE("safe-mode", "Test run (no files will be changes)"), - HELP("help", "\"for help this is\" - Yoda"), - EXCLUDE_DIRECTORY("exclude-directories", "Directories to exclude"), - INCLUDE_PATTERN("include-pattern", "Include files matching pattern"); + THREADS("threads", "thread count (default: 2)"), + INCLUDE_PATTERN("include-pattern", "Include files matching pattern"), + MKV_TOOL_NIX("mkvtoolnix", "Path to mkv tool nix installation"), + FORCED_KEYWORDS("forcedKeywords", "Additional keywords to identify forced tracks, combines with config file"), + EXCLUDE_DIRECTORY("exclude-directories", "Directories to be excluded, combines with config file"), + HELP("help", "\"for help this is\" - Yoda"); private final String property; private final String description; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java new file mode 100644 index 0000000..815e90c --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java @@ -0,0 +1,44 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; + +import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ConfigErrors; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +public class LanguageValidatorUtil { + private static Set ISO3_LANGUAGES; + + static { + try { + ISO3_LANGUAGES = load("language-codes"); + } catch (IOException ignored) {} + } + + private static Set load(String path) throws IOException{ + if (new File(path).isFile()) { + return Files.lines(Path.of(path)).collect(Collectors.toSet()); + } else { + try(BufferedReader bf = new BufferedReader(new InputStreamReader( + Objects.requireNonNull(LanguageValidatorUtil.class.getClassLoader().getResourceAsStream(path))))) { + return bf.lines().collect(Collectors.toSet()); + } + } + } + + public static boolean isLanguageValid(String language) { + return ISO3_LANGUAGES.contains(language); + } + + public static void isLanguageValid(String language, ConfigErrors errors) { + if (!isLanguageValid(language)) { + errors.add(String.format("%s is not a valid language", language)); + } + } +} From bfb6cab62ce008edd6610dca69b318c7deeed4f4 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Tue, 19 Apr 2022 21:03:14 +0200 Subject: [PATCH 33/38] Add version parameter --- pom.xml | 2 ++ .../mkvaudiosubtitlechanger/config/Config.java | 10 ++++++++++ .../model/ConfigProperty.java | 3 ++- .../util/LanguageValidatorUtil.java | 17 +++++------------ .../util/VersionUtil.java | 18 ++++++++++++++++++ version.properties | 1 + 6 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/VersionUtil.java create mode 100644 version.properties diff --git a/pom.xml b/pom.xml index 65e1b37..4189cd7 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,9 @@ ./ language-codes + version.properties + true diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java index 7209343..9f2ae3e 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java @@ -2,6 +2,7 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.VersionUtil; import at.pcgamingfreaks.yaml.YAML; import at.pcgamingfreaks.yaml.YamlInvalidContentException; import lombok.AccessLevel; @@ -75,6 +76,7 @@ public class Config { } exitIfHelp(cmd, options); + exitIfVersion(cmd); configPath = loadConfigPath(cmd, errors); libraryPath = loadLibraryPath(cmd, errors); @@ -101,6 +103,7 @@ public class Config { private static Options initOptions() { Options options = new Options(); options.addOption(optionOf(HELP, "h", false)); + options.addOption(optionOf(VERSION, "v", false)); options.addOption(optionOf(LIBRARY, "l", true)); options.addOption(optionOf(MKV_TOOL_NIX, "m", true)); options.addOption(optionOf(CONFIG_PATH, "c", true)); @@ -121,6 +124,13 @@ public class Config { } } + private void exitIfVersion(CommandLine cmd) { + if (cmd.hasOption(VERSION.prop())) { + System.out.printf("MKV Audio Subtitle Changer Version %s%n", VersionUtil.getVersion()); + System.exit(0); + } + } + private File loadConfigPath(CommandLine cmd, ConfigErrors errors) { File configPath = new File(cmd.getOptionValue(CONFIG_PATH.prop(), "config.yaml")); if (configPath.isFile()) return configPath; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java index 358719d..77ee777 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java @@ -9,7 +9,8 @@ public enum ConfigProperty { MKV_TOOL_NIX("mkvtoolnix", "Path to mkv tool nix installation"), FORCED_KEYWORDS("forcedKeywords", "Additional keywords to identify forced tracks, combines with config file"), EXCLUDE_DIRECTORY("exclude-directories", "Directories to be excluded, combines with config file"), - HELP("help", "\"for help this is\" - Yoda"); + HELP("help", "\"for help this is\" - Yoda"), + VERSION("version", "Display version"); private final String property; private final String description; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java index 815e90c..1ba46b4 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java @@ -3,11 +3,8 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ConfigErrors; import java.io.BufferedReader; -import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -17,18 +14,14 @@ public class LanguageValidatorUtil { static { try { - ISO3_LANGUAGES = load("language-codes"); + ISO3_LANGUAGES = loadLanguageCodes(); } catch (IOException ignored) {} } - private static Set load(String path) throws IOException{ - if (new File(path).isFile()) { - return Files.lines(Path.of(path)).collect(Collectors.toSet()); - } else { - try(BufferedReader bf = new BufferedReader(new InputStreamReader( - Objects.requireNonNull(LanguageValidatorUtil.class.getClassLoader().getResourceAsStream(path))))) { - return bf.lines().collect(Collectors.toSet()); - } + private static Set loadLanguageCodes() throws IOException { + try (BufferedReader bf = new BufferedReader(new InputStreamReader( + Objects.requireNonNull(LanguageValidatorUtil.class.getClassLoader().getResourceAsStream("language-codes"))))) { + return bf.lines().collect(Collectors.toSet()); } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/VersionUtil.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/VersionUtil.java new file mode 100644 index 0000000..e1e5e3a --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/VersionUtil.java @@ -0,0 +1,18 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +public class VersionUtil { + public static String getVersion() { + try (InputStream propertiesStream = VersionUtil.class.getClassLoader().getResourceAsStream("version.properties")) { + Properties properties = new Properties(); + properties.load(propertiesStream); + + return properties.getProperty("version"); + } catch (IOException e) { + throw new RuntimeException(e.getMessage()); + } + } +} diff --git a/version.properties b/version.properties new file mode 100644 index 0000000..e5683df --- /dev/null +++ b/version.properties @@ -0,0 +1 @@ +version=${project.version} \ No newline at end of file From f70d1649a09d0608eaa065c07f9a77977a6c1727 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Tue, 19 Apr 2022 23:04:48 +0200 Subject: [PATCH 34/38] Zip release files in maven package --- README.md | 53 +++++++++++++++++++++++++------------------- config-template.yaml | 18 +++++++++------ maven/assembly.xml | 25 +++++++++++++++++++++ pom.xml | 20 ++++++++++++++++- 4 files changed, 85 insertions(+), 31 deletions(-) create mode 100644 maven/assembly.xml diff --git a/README.md b/README.md index 2889947..95de9a9 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,12 @@ - Introduction - Requirements - Running - - config.yml example + - Configuration + - Additional parameters ### Introduction -This program helps changing audio and subtitle lines of mkv files. +This program helps to change audio and subtitle lines of mkv files. ### Requirements @@ -15,32 +16,22 @@ This program helps changing audio and subtitle lines of mkv files. ### Running -Opening terminal / cmd in the directory of the jar and the config file and execute following command: +1. Extract downloaded archive +2. Copy `config-template.yaml` to `config.yaml` +3. Update `config.yaml` to fit your needs +4. Open terminal / cmd in the directory of the jar and the config file +5. Execute following commands: + 1. (Optional) `java -jar mkvaudiosubtitleschanger.jar -l [path to mkv or dir with mkv] --safe-mode` + 2. To permanently apply changes: `java -jar mkvaudiosubtitleschanger.jar -l [path to mkv or dir with mkv]` -`java -jar mkvaudiosubtitleschanger.jar -l [path to mkv or dir with mkv]` +### Configuration -### Additional arameters -These properties overwrite already existing values in the config file. -```properties - -c,--config path to config - -e,--exclude-directories Directories to exclude - -h,--help "for help this is" - Yoda - -i,--include-pattern Include files matching pattern - -k,--forcedKeywords Additional keywords to identify forced tracks" - -l,--library path to library - -s,--safe-mode Test run (no files will be changes) - -t,--threads thread count -``` - -### config.yml example -Config file needs to be placed in the same directory as the jar or path to config has to be passed via command line +Config file needs to be placed in the same directory as the jar or path to config has to be passed via command line argument. +The list of language configurations can be expanded. Use `OFF` if you want to turn of the audio or subtitle lane. +Players probably will display forced subtitles nonetheless. ```yaml -mkvtoolnixPath: C:\Program Files\MKVToolNix -# Recommendations for data stored on HDDs, increase when using SSDs -threads: 2 -#forcedKeywords: ["forced", "signs"] config: 1: audio: ger @@ -50,3 +41,19 @@ config: subtitle: ger ``` Subtitle lanes recognized as forced will be set as one. Already existing ones will not be overwritten or changed. + + +### Additional arameters +These properties overwrite already existing values in the config file. +```properties + -c,--config Path to config file + -e,--exclude-directories Directories to be excluded, combines with config file + -h,--help "for help this is" - Yoda + -i,--include-pattern Include files matching pattern + -k,--forcedKeywords Additional keywords to identify forced tracks, combines with config file + -l,--library Path to library + -m,--mkvtoolnix Path to mkv tool nix installation + -s,--safe-mode Test run (no files will be changes) + -t,--threads thread count (default: 2) + -v,--version Display version +``` \ No newline at end of file diff --git a/config-template.yaml b/config-template.yaml index c2338ea..5647685 100644 --- a/config-template.yaml +++ b/config-template.yaml @@ -1,14 +1,18 @@ mkvtoolnix: C:\Program Files\MKVToolNix -# Recommendations for data stored on HDDs, increase when using SSDs -threads: 2 -#forcedKeywords: ["forced", "signs"] -#exclude-directories: -# - "D:/Path/To/File.mkv" -# - "D:/Path/To/Directory" + config: 1: audio: ger subtitle: OFF 2: audio: eng - subtitle: ger \ No newline at end of file + subtitle: ger + +# Recommendations for data stored on HDDs, increase when using SSDs +#threads: 2 +#forcedKeywords: ["forced", "signs"] +#exclude-directories: +# - "D:/Path/To/File.mkv" +# - "D:/Path/To/Directory" +#include-pattern: "regex" + diff --git a/maven/assembly.xml b/maven/assembly.xml new file mode 100644 index 0000000..5d51bfd --- /dev/null +++ b/maven/assembly.xml @@ -0,0 +1,25 @@ + + zip + true + + + zip + tar + + + + ${project.build.directory}/${project.artifactId}-${project.version}.jar + ${project.artifactId}.jar + / + + + ${project.basedir}/config-template.yaml + / + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4189cd7..ac31c61 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,6 @@ 1.8 - org.apache.maven.plugins maven-jar-plugin @@ -88,6 +87,25 @@ 11 + + org.apache.maven.plugins + maven-assembly-plugin + 3.3.0 + + + package + + single + + + false + + maven/assembly.xml + + + + + From 7140528441d60e67828c67fcd6c6b546f81efdb4 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Tue, 19 Apr 2022 23:31:00 +0200 Subject: [PATCH 35/38] Differentiate between already fits config and no suitable config found --- .../AttributeUpdaterKernel.java | 9 +++- .../model/FileInfoDto.java | 8 ++++ .../model/ResultStatistic.java | 45 ++++++++++++------- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index 2e484c7..abc013e 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -54,6 +54,7 @@ public class AttributeUpdaterKernel { statistic.stopTimer(); System.out.println(statistic); + log.info(statistic); } private void process(File file, ProgressBar progressBar) { @@ -67,12 +68,16 @@ public class AttributeUpdaterKernel { processor.update(file, fileInfo); statistic.success(); } catch (IOException e) { - statistic.failure(); + statistic.failedChanging(); log.warn("File couldn't be updated: {}", file.getAbsoluteFile()); } } + } else if (fileInfo.isUnableToApplyConfig()) { + statistic.noSuitableConfigFound(); + } else if (fileInfo.isAlreadySuitable()){ + statistic.alreadyFits(); } else { - statistic.fits(); + statistic.failure(); } progressBar.step(); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java index 81f4123..ff50017 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java @@ -14,6 +14,14 @@ public class FileInfoDto { private FileAttribute desiredAudioLane; private FileAttribute desiredSubtitleLane; + public boolean isUnableToApplyConfig() { + return desiredAudioLane == null && desiredSubtitleLane == null; + } + + public boolean isAlreadySuitable() { + return desiredAudioLane == defaultAudioLane && desiredSubtitleLane == defaultSubtitleLane; + } + public boolean isChangeNecessary() { return isAudioDifferent() || isSubtitleDifferent() || areForcedTracksDifferent(); } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java index 3cc4cee..49a1974 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ResultStatistic.java @@ -3,22 +3,27 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; import lombok.AccessLevel; import lombok.Getter; -import java.io.File; - @Getter public class ResultStatistic { private static final String result = "Total files: %s%n" + "├─ Should change: %s%n" + - "├─ Successfully changed: %s%n" + + "│ ├─ Failed changing: %s%n" + + "│ └─ Successfully changed: %s%n" + + "├─ No suitable config found: %s%n" + "├─ Already fit config: %s%n" + "└─ Failed: %s%n" + "Runtime: %ss"; private int filesTotal = 0; - private int filesShouldChange = 0; - private int filesSuccessfullyChanged = 0; - private int filesFailed = 0; - private int filesAlreadyFit = 0; + + private int shouldChange = 0; + private int failedChanging = 0; + private int successfullyChanged = 0; + + private int noSuitableConfigFound = 0; + private int alreadyFits = 0; + private int failed = 0; + @Getter(AccessLevel.NONE) private long startTime = 0; private long runtime = 0; @@ -28,19 +33,27 @@ public class ResultStatistic { } public synchronized void shouldChange() { - filesShouldChange++; + shouldChange++; } public synchronized void success() { - filesSuccessfullyChanged++; + successfullyChanged++; + } + + public synchronized void failedChanging() { + failedChanging++; + } + + public synchronized void noSuitableConfigFound() { + noSuitableConfigFound++; + } + + public synchronized void alreadyFits() { + alreadyFits++; } public synchronized void failure() { - filesFailed++; - } - - public synchronized void fits() { - filesAlreadyFit++; + failed++; } public void startTimer() { @@ -53,7 +66,7 @@ public class ResultStatistic { @Override public String toString() { - return String.format(result, filesTotal, filesShouldChange, filesSuccessfullyChanged, filesAlreadyFit, - filesFailed, runtime / 1000); + return String.format(result, filesTotal, shouldChange, failedChanging, successfullyChanged, + noSuitableConfigFound, alreadyFits, failed, runtime / 1000); } } From 1b62e151a5b15fa75ce3d3e3e92212477931afac Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Wed, 20 Apr 2022 23:55:52 +0200 Subject: [PATCH 36/38] Update logging --- .../AttributeUpdaterKernel.java | 3 +- .../impl/MkvFileProcessor.java | 8 ++++-- .../model/FileAttribute.java | 13 +++++++++ .../model/FileInfoDto.java | 12 ++++++++ .../util/LogUtils.java | 12 ++++++++ src/main/resources/log4j2-dev.yml | 28 +++++++++++++++++++ src/main/resources/log4j2.yaml | 2 +- 7 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java create mode 100644 src/main/resources/log4j2-dev.yml diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java index abc013e..99a7681 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java @@ -58,15 +58,16 @@ public class AttributeUpdaterKernel { } private void process(File file, ProgressBar progressBar) { - statistic.total(); List attributes = processor.loadAttributes(file); FileInfoDto fileInfo = processor.filterAttributes(attributes); + statistic.total(); if (fileInfo.isChangeNecessary()) { statistic.shouldChange(); if (!Config.getInstance().isSafeMode()) { try { processor.update(file, fileInfo); statistic.success(); + log.info("Updated {}", file.getAbsolutePath()); } catch (IOException e) { statistic.failedChanging(); log.warn("File couldn't be updated: {}", file.getAbsoluteFile()); diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java index 78d2657..bfb63c5 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java @@ -2,6 +2,7 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.*; +import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LogUtils; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.StringUtils; @@ -60,6 +61,8 @@ public class MkvFileProcessor implements FileProcessor { LaneType.valueOf(((String) attribute.get("type")).toUpperCase(Locale.ENGLISH)))); } } + + LogUtils.ifDebug(log, fileAttributes); } catch (IOException e) { e.printStackTrace(); log.error("File could not be found or loaded!"); @@ -76,6 +79,7 @@ public class MkvFileProcessor implements FileProcessor { detectCurrentConfiguration(attributes, info, nonForcedTracks); detectDesiredConfiguration(info, nonForcedTracks); + LogUtils.ifDebug(log, info); return info; } @@ -117,7 +121,7 @@ public class MkvFileProcessor implements FileProcessor { @Override public void update(File file, FileInfoDto fileInfo) throws IOException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(format("\"%s\" ", Config.getInstance().getPathFor(MkvToolNix.MKV_PROP_EDIT))); sb.append(format("\"%s\" ", file.getAbsolutePath())); if (fileInfo.isAudioDifferent()) { @@ -139,6 +143,6 @@ public class MkvFileProcessor implements FileProcessor { } InputStream inputstream = Runtime.getRuntime().exec(sb.toString()).getInputStream(); - log.debug(IOUtils.toString(new InputStreamReader(inputstream))); + LogUtils.ifDebug(log, IOUtils.toString(new InputStreamReader(inputstream))); } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java index 4f2090d..1a5b449 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java @@ -21,4 +21,17 @@ public class FileAttribute { this.forcedTrack = forcedTrack; this.type = type; } + + @Override + public String toString() { + final StringBuffer sb = new StringBuffer("["); + sb.append("id=").append(id); + sb.append(", language='").append(language).append('\''); + sb.append(", trackName='").append(trackName).append('\''); + sb.append(", defaultTrack=").append(defaultTrack); + sb.append(", forcedTrack=").append(forcedTrack); + sb.append(", type=").append(type); + sb.append(']'); + return sb.toString(); + } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java index ff50017..8fd9e0f 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java @@ -39,4 +39,16 @@ public class FileInfoDto { public boolean areForcedTracksDifferent() { return desiredForcedSubtitleLanes.size() > 0; } + + @Override + public String toString() { + final StringBuffer sb = new StringBuffer("["); + sb.append("defaultAudioLane=").append(defaultAudioLane); + sb.append(", defaultSubtitleLane=").append(defaultSubtitleLane); + sb.append(", desiredForcedSubtitleLanes=").append(desiredForcedSubtitleLanes); + sb.append(", desiredAudioLane=").append(desiredAudioLane); + sb.append(", desiredSubtitleLane=").append(desiredSubtitleLane); + sb.append(']'); + return sb.toString(); + } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java new file mode 100644 index 0000000..2dec9c8 --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java @@ -0,0 +1,12 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; + +import org.apache.logging.log4j.Logger; + +public class LogUtils { + + public static void ifDebug(Logger log, T object) { + if (log.isDebugEnabled()) { + log.debug(object); + } + } +} diff --git a/src/main/resources/log4j2-dev.yml b/src/main/resources/log4j2-dev.yml new file mode 100644 index 0000000..bd94532 --- /dev/null +++ b/src/main/resources/log4j2-dev.yml @@ -0,0 +1,28 @@ +Configuration: + name: DefaultLogger + Appenders: + Console: + name: Console_Out + PatternLayout: + Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable" + ThresholdFilter: + level: debug + File: + name: FileAppender + fileName: default.log + PatternLayout: + Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable" + ThresholdFilter: + level: debug + Loggers: + Root: + level: debug + AppenderRef: + - ref: Console_Out + - ref: FileAppender + Logger: + name: "com.zaxxer.hikari.HikariConfig" + level: info + AppenderRef: + - ref: Console_Out + - ref: FileAppender \ No newline at end of file diff --git a/src/main/resources/log4j2.yaml b/src/main/resources/log4j2.yaml index 14026cc..371b601 100644 --- a/src/main/resources/log4j2.yaml +++ b/src/main/resources/log4j2.yaml @@ -10,7 +10,7 @@ Configuration: level: info Loggers: Root: - level: debug + level: info AppenderRef: - ref: FileAppender Logger: From a99abd5989f5de78c2824cc34aa97c2c50d9259a Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Thu, 21 Apr 2022 00:16:44 +0200 Subject: [PATCH 37/38] Add issue templates --- .github/ISSUE_TEMPLATE/default-bug-report.md | 26 +++++++++++++++++++ .../ISSUE_TEMPLATE/default-feature-request.md | 12 +++++++++ 2 files changed, 38 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/default-bug-report.md create mode 100644 .github/ISSUE_TEMPLATE/default-feature-request.md diff --git a/.github/ISSUE_TEMPLATE/default-bug-report.md b/.github/ISSUE_TEMPLATE/default-bug-report.md new file mode 100644 index 0000000..e8b0645 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/default-bug-report.md @@ -0,0 +1,26 @@ +--- +name: Bug Report +about: Create a report to help me improve +title: '' +labels: bug +assignees: RatzzFatzz + +--- + +**Environment** + +Java Version: [e.g. 8, 11, 17] + +MKV Audio Subtitle Changer version: [e.g. v1.1, v2.0] + +**Describe the bug** + +A clear and concise description of what the bug is. + +**Expected behavior** + +A clear and concise description of what you expected to happen. + +**Additional context** + +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/default-feature-request.md b/.github/ISSUE_TEMPLATE/default-feature-request.md new file mode 100644 index 0000000..3aad13b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/default-feature-request.md @@ -0,0 +1,12 @@ +--- +name: Feature Request +about: Tell me about something you would want me to add +title: '' +labels: feature-request + +--- + +**Describe your feature** + +A clear and concise description of the expected behaviour. + From 10954f07a412f7582f72cbcba7e61a1f66571af7 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Sun, 24 Apr 2022 16:47:55 +0200 Subject: [PATCH 38/38] Improve general code quality --- .github/ISSUE_TEMPLATE/default-bug-report.md | 7 ++-- .../ISSUE_TEMPLATE/default-feature-request.md | 1 - README.md | 2 +- pom.xml | 8 ----- .../impl/FileFilter.java | 13 ++++++++ .../impl/MkvFileCollector.java | 27 +++++----------- .../impl/MkvFileProcessor.java | 32 +++++++++++-------- .../model/AttributeConfig.java | 16 ++++------ .../model/ConfigProperty.java | 8 ++--- .../model/FileAttribute.java | 27 ++++++---------- .../model/FileInfoDto.java | 25 +++++++-------- .../model/LaneType.java | 8 ----- .../model/MkvToolNix.java | 7 ++-- .../util/LogUtils.java | 12 ------- 14 files changed, 75 insertions(+), 118 deletions(-) create mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileFilter.java delete mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java diff --git a/.github/ISSUE_TEMPLATE/default-bug-report.md b/.github/ISSUE_TEMPLATE/default-bug-report.md index e8b0645..a9fe01e 100644 --- a/.github/ISSUE_TEMPLATE/default-bug-report.md +++ b/.github/ISSUE_TEMPLATE/default-bug-report.md @@ -8,19 +8,16 @@ assignees: RatzzFatzz --- **Environment** - Java Version: [e.g. 8, 11, 17] - MKV Audio Subtitle Changer version: [e.g. v1.1, v2.0] **Describe the bug** - A clear and concise description of what the bug is. **Expected behavior** - A clear and concise description of what you expected to happen. **Additional context** - Add any other context about the problem here. + +### Please attach logs diff --git a/.github/ISSUE_TEMPLATE/default-feature-request.md b/.github/ISSUE_TEMPLATE/default-feature-request.md index 3aad13b..995d547 100644 --- a/.github/ISSUE_TEMPLATE/default-feature-request.md +++ b/.github/ISSUE_TEMPLATE/default-feature-request.md @@ -7,6 +7,5 @@ labels: feature-request --- **Describe your feature** - A clear and concise description of the expected behaviour. diff --git a/README.md b/README.md index 95de9a9..3ac781c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This program helps to change audio and subtitle lines of mkv files. ### Requirements - - Java 8 or higher + - Java 11 or higher - mkvtoolnix installation ### Running diff --git a/pom.xml b/pom.xml index ac31c61..858dec5 100644 --- a/pom.xml +++ b/pom.xml @@ -32,14 +32,6 @@ - - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - org.apache.maven.plugins maven-jar-plugin diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileFilter.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileFilter.java new file mode 100644 index 0000000..94f5012 --- /dev/null +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileFilter.java @@ -0,0 +1,13 @@ +package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; + +import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; + +public class FileFilter { + static boolean accept(File pathName, String[] fileExtensions) { + return StringUtils.endsWithAny(pathName.getAbsolutePath().toLowerCase(), fileExtensions) + && Config.getInstance().getIncludePattern().matcher(pathName.getName()).matches(); + } +} diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java index 0023dce..cdd739e 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java @@ -1,6 +1,5 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import lombok.extern.log4j.Log4j2; import java.io.File; @@ -15,27 +14,17 @@ import java.util.stream.Stream; @Log4j2 public class MkvFileCollector implements FileCollector { + private static final String[] fileExtensions = new String[]{".mkv", ".mka", ".mks", ".mk3d"}; @Override public List loadFiles(String path) { - File file = new File(path); - if (file.isFile() && file.getAbsolutePath().endsWith(".mkv")) { - return new ArrayList<>() {{ - add(file); - }}; - } else if (file.isDirectory()) { - try (Stream paths = Files.walk(Paths.get(path))) { - return paths - .filter(Files::isRegularFile) - .map(Path::toFile) - .filter(f -> f.getAbsolutePath().endsWith(".mkv")) - .filter(f -> Config.getInstance().getIncludePattern().matcher(f.getName()).matches()) - .collect(Collectors.toList()); - } catch (IOException e) { - log.error("Couldn't find file or directory!", e); - return new ArrayList<>(); - } - } else { + try (Stream paths = Files.walk(Paths.get(path))) { + return paths.filter(Files::isRegularFile) + .map(Path::toFile) + .filter(file -> FileFilter.accept(file, fileExtensions)) + .collect(Collectors.toList()); + } catch (IOException e) { + log.error("Couldn't find file or directory!", e); return new ArrayList<>(); } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java index bfb63c5..3b7c10d 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java @@ -2,7 +2,6 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl; import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.*; -import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LogUtils; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.StringUtils; @@ -62,7 +61,7 @@ public class MkvFileProcessor implements FileProcessor { } } - LogUtils.ifDebug(log, fileAttributes); + log.debug(fileAttributes); } catch (IOException e) { e.printStackTrace(); log.error("File could not be found or loaded!"); @@ -77,19 +76,20 @@ public class MkvFileProcessor implements FileProcessor { .filter(elem -> !StringUtils.containsAnyIgnoreCase(elem.getTrackName(), forcedKeywords)) .collect(Collectors.toList()); - detectCurrentConfiguration(attributes, info, nonForcedTracks); - detectDesiredConfiguration(info, nonForcedTracks); - LogUtils.ifDebug(log, info); + detectDefaultTracks(attributes, info, nonForcedTracks); + detectDesiredTracks(info, nonForcedTracks); + log.debug(info); return info; } - private void detectCurrentConfiguration(List attributes, FileInfoDto info, List nonForcedTracks) { + private void detectDefaultTracks(List attributes, FileInfoDto info, List nonForcedTracks) { Set detectedForcedSubtitleLanes = new HashSet<>(); for (FileAttribute attribute : attributes) { - if (attribute.isDefaultTrack() && AUDIO.equals(attribute.getType())) info.setDefaultAudioLane(attribute); + if (attribute.isDefaultTrack() && AUDIO.equals(attribute.getType())) + info.getDefaultAudioLanes().add(attribute); if (attribute.isDefaultTrack() && SUBTITLES.equals(attribute.getType())) - info.setDefaultSubtitleLane(attribute); + info.getDefaultSubtitleLanes().add(attribute); if (attribute.isForcedTrack() && SUBTITLES.equals(attribute.getType())) detectedForcedSubtitleLanes.add(attribute); } @@ -101,7 +101,7 @@ public class MkvFileProcessor implements FileProcessor { ); } - private void detectDesiredConfiguration(FileInfoDto info, List nonForcedTracks) { + private void detectDesiredTracks(FileInfoDto info, List nonForcedTracks) { for (AttributeConfig config : Config.getInstance().getAttributeConfig()) { FileAttribute desiredAudio = null; FileAttribute desiredSubtitle = null; @@ -125,14 +125,18 @@ public class MkvFileProcessor implements FileProcessor { sb.append(format("\"%s\" ", Config.getInstance().getPathFor(MkvToolNix.MKV_PROP_EDIT))); sb.append(format("\"%s\" ", file.getAbsolutePath())); if (fileInfo.isAudioDifferent()) { - if (fileInfo.getDefaultAudioLane() != null) { - sb.append(format(DISABLE_DEFAULT_TRACK, fileInfo.getDefaultAudioLane().getId())); + if (fileInfo.getDefaultAudioLanes() != null && !fileInfo.getDefaultSubtitleLanes().isEmpty()) { + for (FileAttribute track: fileInfo.getDefaultAudioLanes()) { + sb.append(format(DISABLE_DEFAULT_TRACK, track.getId())); + } } sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredAudioLane().getId())); } if (fileInfo.isSubtitleDifferent()) { - if (fileInfo.getDefaultSubtitleLane() != null) { - sb.append(format(DISABLE_DEFAULT_TRACK, fileInfo.getDefaultSubtitleLane().getId())); + if (fileInfo.getDefaultSubtitleLanes() != null && !fileInfo.getDefaultSubtitleLanes().isEmpty()) { + for (FileAttribute track: fileInfo.getDefaultSubtitleLanes()) { + sb.append(format(DISABLE_DEFAULT_TRACK, track.getId())); + } } sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredSubtitleLane().getId())); } @@ -143,6 +147,6 @@ public class MkvFileProcessor implements FileProcessor { } InputStream inputstream = Runtime.getRuntime().exec(sb.toString()).getInputStream(); - LogUtils.ifDebug(log, IOUtils.toString(new InputStreamReader(inputstream))); + log.debug(IOUtils.toString(new InputStreamReader(inputstream))); } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java index fc68e25..3208cc6 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/AttributeConfig.java @@ -1,25 +1,21 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; +import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.log4j.Log4j2; @Log4j2 @Getter +@AllArgsConstructor public class AttributeConfig { private final String audioLanguage; private final String subtitleLanguage; - public AttributeConfig(String audioLanguage, String subtitleLanguage) { - this.audioLanguage = audioLanguage; - this.subtitleLanguage = subtitleLanguage; - } - @Override public String toString() { - final StringBuffer sb = new StringBuffer("AttributeConfig{"); - sb.append("audioLanguage='").append(audioLanguage).append('\''); - sb.append(", subtitleLanguage='").append(subtitleLanguage).append('\''); - sb.append('}'); - return sb.toString(); + return "AttributeConfig{" + + "audioLanguage='" + audioLanguage + '\'' + + ", subtitleLanguage='" + subtitleLanguage + '\'' + + '}'; } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java index 77ee777..203b4b2 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java @@ -1,5 +1,8 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; +import lombok.AllArgsConstructor; + +@AllArgsConstructor public enum ConfigProperty { CONFIG_PATH("config", "Path to config file"), LIBRARY("library", "Path to library"), @@ -15,11 +18,6 @@ public enum ConfigProperty { private final String property; private final String description; - ConfigProperty(String property, String description) { - this.property = property; - this.description = description; - } - public String desc() { return description; } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java index 1a5b449..cf115f5 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileAttribute.java @@ -1,10 +1,12 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; +import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.log4j.Log4j2; @Log4j2 @Getter +@AllArgsConstructor public class FileAttribute { private final int id; private final String language; @@ -13,25 +15,14 @@ public class FileAttribute { private final boolean forcedTrack; private final LaneType type; - public FileAttribute(int id, String language, String trackName, boolean defaultTrack, boolean forcedTrack, LaneType type) { - this.id = id; - this.language = language; - this.trackName = trackName; - this.defaultTrack = defaultTrack; - this.forcedTrack = forcedTrack; - this.type = type; - } - @Override public String toString() { - final StringBuffer sb = new StringBuffer("["); - sb.append("id=").append(id); - sb.append(", language='").append(language).append('\''); - sb.append(", trackName='").append(trackName).append('\''); - sb.append(", defaultTrack=").append(defaultTrack); - sb.append(", forcedTrack=").append(forcedTrack); - sb.append(", type=").append(type); - sb.append(']'); - return sb.toString(); + return "[" + "id=" + id + + ", language='" + language + '\'' + + ", trackName='" + trackName + '\'' + + ", defaultTrack=" + defaultTrack + + ", forcedTrack=" + forcedTrack + + ", type=" + type + + ']'; } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java index 8fd9e0f..e498689 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDto.java @@ -3,13 +3,14 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; import lombok.Getter; import lombok.Setter; +import java.util.HashSet; import java.util.Set; @Getter @Setter public class FileInfoDto { - private FileAttribute defaultAudioLane; - private FileAttribute defaultSubtitleLane; + private Set defaultAudioLanes = new HashSet<>(); + private Set defaultSubtitleLanes = new HashSet<>(); private Set desiredForcedSubtitleLanes; private FileAttribute desiredAudioLane; private FileAttribute desiredSubtitleLane; @@ -19,7 +20,7 @@ public class FileInfoDto { } public boolean isAlreadySuitable() { - return desiredAudioLane == defaultAudioLane && desiredSubtitleLane == defaultSubtitleLane; + return defaultAudioLanes.contains(desiredAudioLane) && defaultSubtitleLanes.contains(desiredSubtitleLane); } public boolean isChangeNecessary() { @@ -28,12 +29,12 @@ public class FileInfoDto { public boolean isAudioDifferent() { return desiredAudioLane != null && - (defaultAudioLane == null || defaultAudioLane.getId() != desiredAudioLane.getId()); + (defaultAudioLanes == null || !defaultAudioLanes.contains(desiredAudioLane)); } public boolean isSubtitleDifferent() { return desiredSubtitleLane != null && - (defaultSubtitleLane == null || defaultSubtitleLane.getId() != desiredSubtitleLane.getId()); + (defaultSubtitleLanes == null || !defaultSubtitleLanes.contains(desiredSubtitleLane)); } public boolean areForcedTracksDifferent() { @@ -42,13 +43,11 @@ public class FileInfoDto { @Override public String toString() { - final StringBuffer sb = new StringBuffer("["); - sb.append("defaultAudioLane=").append(defaultAudioLane); - sb.append(", defaultSubtitleLane=").append(defaultSubtitleLane); - sb.append(", desiredForcedSubtitleLanes=").append(desiredForcedSubtitleLanes); - sb.append(", desiredAudioLane=").append(desiredAudioLane); - sb.append(", desiredSubtitleLane=").append(desiredSubtitleLane); - sb.append(']'); - return sb.toString(); + return "[" + "defaultAudioLanes=" + defaultAudioLanes + + ", defaultSubtitleLanes=" + defaultSubtitleLanes + + ", desiredForcedSubtitleLanes=" + desiredForcedSubtitleLanes + + ", desiredAudioLane=" + desiredAudioLane + + ", desiredSubtitleLane=" + desiredSubtitleLane + + ']'; } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/LaneType.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/LaneType.java index 0145370..36f18b3 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/LaneType.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/LaneType.java @@ -3,12 +3,4 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; public enum LaneType { AUDIO, SUBTITLES; - - LaneType() { - } - - @Override - public String toString() { - return name(); - } } diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/MkvToolNix.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/MkvToolNix.java index a4ee572..5bf698b 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/MkvToolNix.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/MkvToolNix.java @@ -1,15 +1,14 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model; +import lombok.AllArgsConstructor; + +@AllArgsConstructor public enum MkvToolNix { MKV_MERGER("mkvmerge.exe"), MKV_PROP_EDIT("mkvpropedit.exe"); private final String file; - MkvToolNix(String file) { - this.file = file; - } - @Override public String toString() { return file; diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java deleted file mode 100644 index 2dec9c8..0000000 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LogUtils.java +++ /dev/null @@ -1,12 +0,0 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; - -import org.apache.logging.log4j.Logger; - -public class LogUtils { - - public static void ifDebug(Logger log, T object) { - if (log.isDebugEnabled()) { - log.debug(object); - } - } -}