From ae541e6fdff92aee02abb14719a427fcdb64b5cb Mon Sep 17 00:00:00 2001
From: RatzzFatzz <github@ratzloeffel.de>
Date: Sat, 6 Dec 2025 20:16:37 +0100
Subject: [PATCH] Improve attribute config converter

---
 .../config/InputConfig.java                   |  4 +-
 .../AttributeConfigConverter.java             | 38 +++++++------------
 .../AttributeConfigConverterTest.java         |  2 +-
 3 files changed, 16 insertions(+), 28 deletions(-)
 rename src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/{ => converter}/AttributeConfigConverter.java (56%)
 rename src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/{ => converter}/AttributeConfigConverterTest.java (95%)

diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/InputConfig.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/InputConfig.java
index e0f70c0..797b14c 100644
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/InputConfig.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/InputConfig.java
@@ -1,13 +1,11 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
 
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.converter.AttributeConfigConverter;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validation.ValidFile;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validation.ValidMkvToolNix;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.FileUtils;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ValidationUtil;
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.Validator;
 import jakarta.validation.constraints.Min;
 import lombok.AccessLevel;
 import lombok.Getter;
diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigConverter.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/converter/AttributeConfigConverter.java
similarity index 56%
rename from src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigConverter.java
rename to src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/converter/AttributeConfigConverter.java
index 927b6cf..1966828 100644
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigConverter.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/converter/AttributeConfigConverter.java
@@ -1,15 +1,17 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.converter;
 
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
 import picocli.CommandLine;
 
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LanguageValidatorUtil.isLanguageValid;
 
 public class AttributeConfigConverter implements CommandLine.ITypeConverter<AttributeConfig> {
-    private static final String SEPARATOR = ":";
-    private static final Pattern PATTERN = Pattern.compile("^.{3}:.{3}$");
+    private static final String AUDIO_GROUP = "audio";
+    private static final String SUB_GROUP = "sub";
+    private static final Pattern PATTERN = Pattern.compile(String.format("^(?<%s>.{3}):(?<%s>.{3})$", AUDIO_GROUP, SUB_GROUP));
 
     /**
      * Converts the input string into an AttributeConfig object.
@@ -20,38 +22,26 @@ public class AttributeConfigConverter implements CommandLine.ITypeConverter<Attr
      */
     @Override
     public AttributeConfig convert(String s) {
-        validateInput(s);
+        Matcher matcher =  PATTERN.matcher(s);
 
-        String[] split = s.split(SEPARATOR);
-        AttributeConfig attr = new AttributeConfig(split[0], split[1]);
+        if (!matcher.find()) throw new CommandLine.TypeConversionException("Invalid Attribute config: " + s);
 
-        validateResult(attr);
-
-        return attr;
+        return validateResult(new AttributeConfig(matcher.group("audio"), matcher.group("sub")));
     }
 
     /**
-     * Validates that the input string matches the expected pattern.
+     * Validates that both language codes in the {@link AttributeConfig} object are valid.
      *
-     * @param s String to validate
-     * @throws CommandLine.TypeConversionException if the value doesn't match the expected pattern
-     */
-    private static void validateInput(String s) {
-        if (!PATTERN.matcher(s).matches()) {
-            throw new CommandLine.TypeConversionException("Invalid Attribute config: " + s);
-        }
-    }
-
-    /**
-     * Validates that both language codes in the AttributeConfig object are valid.
-     *
-     * @param attr AttributeConfig object to validate
+     * @param attr {@link AttributeConfig} object to validate
      * @throws CommandLine.TypeConversionException if either language code is invalid
+     * @return valid {@link AttributeConfig}
      */
-    private static void validateResult(AttributeConfig attr) {
+    private static AttributeConfig validateResult(AttributeConfig attr) {
         if (!isLanguageValid(attr.getAudioLanguage()))
             throw new CommandLine.TypeConversionException("Audio language invalid: " + attr.getAudioLanguage());
         if (!isLanguageValid(attr.getSubtitleLanguage()))
             throw new CommandLine.TypeConversionException("Subtitle language invalid: " + attr.getSubtitleLanguage());
+
+        return attr;
     }
 }
diff --git a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigConverterTest.java b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/converter/AttributeConfigConverterTest.java
similarity index 95%
rename from src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigConverterTest.java
rename to src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/converter/AttributeConfigConverterTest.java
index acb1a33..315004e 100644
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigConverterTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/converter/AttributeConfigConverterTest.java
@@ -1,4 +1,4 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.converter;
 
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
 import org.junit.jupiter.params.ParameterizedTest;