- remove all query parameters from an URL

- fixes a bug where downloads are not correctly detected as direct and might fail later
- see mediathekview/MServer#989

Author: derreisende77

src/main/java/mediathek/daten/DatenDownload.java

@@ -22,6 +22,8 @@
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -137,6 +139,12 @@ public DatenDownload(DatenPset pSet, DatenFilm film, byte quelle, DatenAbo abo,
         } else {
             arr[DOWNLOAD_URL] = film.getUrlFuerAufloesung(FilmResolution.Enum.fromLegacyString(aufloesung));
         }
+        //if URL contains query parameters
+        if (arr[DOWNLOAD_URL].contains("?")) {
+            //remove query parameters
+            arr[DOWNLOAD_URL] = getUrlWithoutParameters(arr[DOWNLOAD_URL]);
+        }
+
         arr[DatenDownload.DOWNLOAD_INFODATEI] = pSet.arr[DatenPset.PROGRAMMSET_INFODATEI];
         arr[DatenDownload.DOWNLOAD_SUBTITLE] = pSet.arr[DatenPset.PROGRAMMSET_SUBTITLE];
         arr[DatenDownload.DOWNLOAD_SPOTLIGHT] = pSet.arr[DatenPset.PROGRAMMSET_SPOTLIGHT];
@@ -265,6 +273,26 @@ private static String datumDatumZeitReinigen(String datum) {
         return ret;
     }
 
+    /**
+     * Remove all query parameters from url, e.g. ?explicit=true
+     * @param url the original url
+     * @return filtered url string
+     */
+    private String getUrlWithoutParameters(String url) {
+        try {
+            var uri = new URI(url);
+            return new URI(uri.getScheme(),
+                    uri.getAuthority(),
+                    uri.getPath(),
+                    null, // Ignore the query part of the input url
+                    uri.getFragment()).toString();
+        }
+        catch (URISyntaxException e) {
+            logger.error("Failed to parse url, returning unmodified", e);
+            return url;
+        }
+    }
+
     public void startDownload() {
         // Start erstellen und zur Liste hinzufügen
         this.start = new Start();