- add ip preference mode (dpm) CLI arg

Author: derreisende77

CHANGELOG.md

@@ -32,7 +32,9 @@
 - **FEATURE:** Fehlerhafte Downloads werden nun automatisch aus der Gesehen Datenbank entfernt.
 - **FEATURE(Windows/Linux):** Darkmode Button wird ab Windows 10 und unter Linux in der Menüzeile neben den window controls angezeigt.
 - **FEATURE(Windows/Linux):** Tab-Labels werden nun korrekt rotiert wenn die Tab-Position nicht oben ist.
-- 
+- **FEATURE:** Der bevorzugte DNS-IP-Auflösungsmodus kann nun via `-dpm <XXX>` oder `--dns-preference-mode <XXX>` geändert werden. Zulässige Werte sind `system`, `ip_v6`, `ip_v4`, `ip_v6_only`, `ip_v4_only` (Standardwert). Eine Änderung kann bei IPv6-only Internetanschlüssen notwendig sein. 
+
+
 # **14.0.0**
 - **ACHTUNG: macOS Sonoma 14.1 verursacht diverse Probleme und Programmhänger! Einige dieser Probleme konnten beseitigt werden, führen aber zu kleineren Einschränkungen.**
 - macOS: Speicherverbrauchsanzeige wurde deaktiviert. Sie verursacht bisher unbekannte Programmanomalien unter macOS Sonoma 14.1

src/main/java/mediathek/Main.java

@@ -13,6 +13,7 @@
 import mediathek.mainwindow.MediathekGui;
 import mediathek.tool.*;
 import mediathek.tool.affinity.Affinity;
+import mediathek.tool.dns.IPvPreferenceMode;
 import mediathek.tool.migrator.SettingsMigrator;
 import mediathek.windows.MediathekGuiWindows;
 import mediathek.x11.MediathekGuiX11;
@@ -364,6 +365,20 @@ private static void checkUiScaleSetting() {
         }
     }
 
+    private static void configureDnsPreferenceMode(CommandLine.ParseResult parseResult) {
+        var config = ApplicationConfiguration.getConfiguration();
+        if (parseResult.hasMatchedOption("dpm")) {
+            logger.trace("Dns preference mode set via CLI, storing config value");
+            config.setProperty(ApplicationConfiguration.APPLICATION_NETWORKING_DNS_MODE, String.valueOf(Config.getDnsIpPreferenceMode()));
+        }
+        else {
+            logger.trace("Dns preference mode NOT set, using config setting");
+            var mode = IPvPreferenceMode.fromString(config.getString(ApplicationConfiguration.APPLICATION_NETWORKING_DNS_MODE, String.valueOf(Config.getDnsIpPreferenceMode())));
+            Config.setDnsIpPreferenceMode(mode);
+        }
+        logger.trace("Setting DNS selector to mode: {}", Config.getDnsIpPreferenceMode().toString());
+    }
+
     /**
      * @param args the command line arguments
      */
@@ -393,6 +408,8 @@ public static void main(final String... args) {
                 setupLogging();
                 printPortableModeInfo();
 
+                configureDnsPreferenceMode(parseResult);
+
                 if (SystemUtils.IS_OS_LINUX) {
                     // enable custom window decorations
                     JFrame.setDefaultLookAndFeelDecorated( true );

src/main/java/mediathek/config/Config.java

@@ -19,13 +19,18 @@
  */
 package mediathek.config;
 
+import mediathek.tool.dns.IPvPreferenceMode;
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "MediathekView")
 public class Config {
-
     @CommandLine.Parameters(index = "0", paramLabel = "<Pfad zum Verzeichnis>", description = "Pfad zum Einstellungsverzeichnis für Portablen Betrieb", arity = "0..1")
     public static String baseFilePath;
+    /**
+     * Specify the preferred DNS IP mode for name resolutions. Defaults to IPv4 only.
+     */
+    @CommandLine.Option(names = {"-dpm", "--dns-preference-mode"}, description = "Bevorzugtes IP-Protokoll für DNS festlegen")
+    private static IPvPreferenceMode dnsIpPreferenceMode = IPvPreferenceMode.IPV4_ONLY;
     @CommandLine.Option(names = {"-d", "--debug"}, hidden = true, description = "Debug-Modus aktivieren (FÜR ENTWICKLER)")
     private static boolean debug; // Debugmodus
     /**
@@ -52,7 +57,6 @@ public class Config {
     private static boolean portableMode;
     @CommandLine.Option(names = {"-m", "--maximized"}, description = "Programmfenster beim Start maximieren")
     private static boolean startMaximized; // Fenster maximieren
-
     @CommandLine.Option(names = {"-h", "--help"}, usageHelp = true, description = "Hilfe anzeigen")
     private static boolean helpRequested;
     @CommandLine.Option(names = {"-f", "--disable-file-logging"}, description = "Speichern des Log output in Datei deaktivieren")
@@ -62,13 +66,19 @@ public class Config {
      */
     @CommandLine.Option(names = {"-nj", "--no-jvm-param-checks"}, description = "JVM Parameter-Prüfung deaktivieren")
     private static boolean disableJvmParameterChecks;
-
     @CommandLine.Option(names = {"-ns", "--no-splash"}, description = "Splash-Screen nicht anzeigen")
     private static boolean disableSplashScreen;
-
     @CommandLine.Option(names = {"-dq", "--download-quit"}, description = "Automatisch downloaden, dann beenden")
     private static boolean downloadAndQuit;
 
+    public static IPvPreferenceMode getDnsIpPreferenceMode() {
+        return dnsIpPreferenceMode;
+    }
+
+    public static void setDnsIpPreferenceMode(IPvPreferenceMode dnsIpPreferenceMode) {
+        Config.dnsIpPreferenceMode = dnsIpPreferenceMode;
+    }
+
     public static boolean shouldDownloadAndQuit() { return downloadAndQuit;}
     public static boolean isSplashScreenDisabled() { return disableSplashScreen;}
 

src/main/java/mediathek/tool/http/MVHttpClient.java

@@ -3,7 +3,6 @@
 import mediathek.config.Config;
 import mediathek.tool.ApplicationConfiguration;
 import mediathek.tool.dns.DnsSelector;
-import mediathek.tool.dns.IPvPreferenceMode;
 import okhttp3.Authenticator;
 import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
@@ -22,6 +21,7 @@ public class MVHttpClient {
     private static final MVHttpClient ourInstance = new MVHttpClient();
     private final Logger logger = LogManager.getLogger(MVHttpClient.class);
     private final ByteCounter byteCounter = new ByteCounter();
+    private final DnsSelector dnsSelector = new DnsSelector();
     private OkHttpClient httpClient;
 
     private MVHttpClient() {
@@ -84,17 +84,13 @@ private OkHttpClient.Builder getDefaultClientBuilder() {
             builder.connectionSpecs(Arrays.asList(ConnectionSpec.MODERN_TLS, ConnectionSpec.COMPATIBLE_TLS));
         }
 
-        var config = ApplicationConfiguration.getConfiguration();
-        IPvPreferenceMode mode = IPvPreferenceMode.fromString(config.getString(ApplicationConfiguration.APPLICATION_NETWORKING_DNS_MODE, String.valueOf(IPvPreferenceMode.IPV4_ONLY)));
-        logger.trace("Setting DNS selector to mode: {}", mode.toString());
-
         builder.connectTimeout(5, TimeUnit.SECONDS)
                 .writeTimeout(5, TimeUnit.SECONDS)
                 .readTimeout(2, TimeUnit.SECONDS)
                 .socketFactory(byteCounter.socketFactory())
                 .followRedirects(true)
                 .followSslRedirects(true)
-                .dns(new DnsSelector(mode));
+                .dns(dnsSelector);
         return builder;
     }
 

src/main/kotlin/mediathek/tool/dns/DnsSelector.kt

@@ -1,24 +1,29 @@
 package mediathek.tool.dns
 
+import mediathek.config.Config
 import okhttp3.Dns
 import org.apache.logging.log4j.LogManager
 import java.net.Inet4Address
 import java.net.Inet6Address
 import java.net.InetAddress
 
-class DnsSelector(private val preferenceMode: IPvPreferenceMode) : Dns {
+class DnsSelector : Dns {
     /**
      * return IP adresses based on preferred mode.
      */
     override fun lookup(hostname: String): List<InetAddress> {
         var addresses = Dns.SYSTEM.lookup(hostname)
 
-        addresses = when (preferenceMode) {
+        addresses = when (Config.getDnsIpPreferenceMode()) {
             IPvPreferenceMode.IPV6_FIRST -> addresses.sortedBy { Inet4Address::class.java.isInstance(it) }
             IPvPreferenceMode.IPV4_FIRST -> addresses.sortedBy { Inet6Address::class.java.isInstance(it) }
             IPvPreferenceMode.IPV6_ONLY -> addresses.filter { Inet6Address::class.java.isInstance(it) }
             IPvPreferenceMode.IPV4_ONLY -> addresses.filter { Inet4Address::class.java.isInstance(it) }
             IPvPreferenceMode.SYSTEM -> addresses
+            else -> {
+                logger.error("IP Preference Mode was null, returning SYSTEM adresses")
+                addresses
+            }
         }
 
         logger.trace("Dns ($hostname): " + addresses.joinToString(", ") { it.toString() })