fix DW to always have normal url, fix testcase

mediathekview · Nov 18, 2023 · 2d6eb39 · 2d6eb39
1 parent a301a50
commit 2d6eb39
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/de/mediathekview/mserver/crawler/dw/parser/DwFilmDetailDeserializer.java b/src/main/java/de/mediathekview/mserver/crawler/dw/parser/DwFilmDetailDeserializer.java
@@ -234,7 +234,15 @@ private Optional<Map<Resolution, FilmUrl>> getVideos(
             LOG.error("Malformed video url for video: {}", videoid);
           }
         });
-
+    if (videoListe.size() > 0 && !videoListe.containsKey(Resolution.NORMAL)) {
+      if (videoListe.containsKey(Resolution.SMALL)) {
+        videoListe.put(Resolution.NORMAL, videoListe.get(Resolution.SMALL));
+        videoListe.remove(Resolution.SMALL);
+      } else {
+        videoListe.put(Resolution.NORMAL, videoListe.get(Resolution.HD));
+        videoListe.remove(Resolution.HD);
+      }
+    }
     if (videoListe.size() > 0) {
       return Optional.of(videoListe);
     }

diff --git a/src/main/java/de/mediathekview/mserver/crawler/srf/parser/SrfFilmJsonDeserializer.java b/src/main/java/de/mediathekview/mserver/crawler/srf/parser/SrfFilmJsonDeserializer.java
@@ -79,10 +79,6 @@ private void addUrls(final Map<Resolution, String> aVideoUrls, final Film aFilm,
             LOG.error(String.format("A found download URL \"%s\" isn't valid.", value), ex);
           }
         });
-    // we are not ready to have pure audiodescription entries
-    if (aFilm.getUrls().size() == 0 && aFilm.getAudioDescriptions().size() > 0) {
-      aFilm.addAllUrls(aFilm.getAudioDescriptions());
-    }
   }
 
   private static Optional<URL> buildWebsiteUrl(