kika geo, dw old resolutions, ard fix typo, testcase and remove related

Author: codingPF

src/main/java/de/mediathekview/mserver/crawler/ard/json/ArdFilmDeserializer.java

@@ -248,10 +248,10 @@ private Optional<Map<Resolution, String>> fallbackToM3U(Optional<ArdVideoInfoDto
           resolutionUrlMapFromM3U.forEach((key, value) -> newUrls.put(key, value.toString()));
           //
           // TODO: FIXME
-          if (!resolutionUrlMapFromM3U.containsKey(Resolution.NORMAL)) {
-            Resolution anyResolution = resolutionUrlMapFromM3U.keySet().stream().findFirst().get();
-            resolutionUrlMapFromM3U.put(Resolution.NORMAL, resolutionUrlMapFromM3U.get(anyResolution));
-            resolutionUrlMapFromM3U.remove(anyResolution);
+          if (!newUrls.containsKey(Resolution.NORMAL)) {
+            Resolution anyResolution = newUrls.keySet().stream().findFirst().get();
+            newUrls.put(Resolution.NORMAL, newUrls.get(anyResolution));
+            newUrls.remove(anyResolution);
           }
           return Optional.of(newUrls);
         }

src/main/java/de/mediathekview/mserver/crawler/dw/parser/DwFilmDetailDeserializer.java

@@ -245,8 +245,14 @@ private Optional<Map<Resolution, FilmUrl>> getVideos(
         videoListe.remove(Resolution.HD);
       }
     }
+    // TODO: add more resolutions etc - but for backwards compatibility - set to the current once
+    final Map<Resolution, FilmUrl> videoListeBackwardsCompat = new ConcurrentHashMap<>();
+    videoListeBackwardsCompat.put(Resolution.HD, videoListe.get(Resolution.WQHD));
+    videoListeBackwardsCompat.put(Resolution.NORMAL, videoListe.get(Resolution.NORMAL));
+    videoListeBackwardsCompat.put(Resolution.SMALL, videoListe.get(Resolution.SMALL));
+    
     if (videoListe.size() > 0) {
-      return Optional.of(videoListe);
+      return Optional.of(videoListeBackwardsCompat);
     }
     LOG.error("No video url for video: {}", videoid);
     return Optional.empty();

src/main/java/de/mediathekview/mserver/crawler/kika/tasks/KikaApiFilmTask.java

@@ -11,6 +11,7 @@
 import java.util.Collection;
 import java.util.EnumMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Queue;
@@ -118,8 +119,13 @@ protected void postProcessing(KikaApiVideoInfoDto aResponseObj, KikaApiFilmDto a
     aFilm.setUrls(getVideoUrls(aResponseObj, aDTO));
     aFilm.addAllSubtitleUrls(getSubtitle(aResponseObj, aDTO));
     //
-    
-    
+    if(aFilm.getDefaultUrl().isPresent() && (
+       aFilm.getDefaultUrl().get().getUrl().toString().contains("/dach/") ||
+       aFilm.getDefaultUrl().get().getUrl().toString().contains("/deChAt/"))
+       ) {
+      aFilm.setGeoLocations(List.of(GeoLocations.GEO_DE_AT_CH));
+    }
+    //
     if (!taskResults.add(aFilm)) {
       LOG.debug("Rejected duplicate {}",aFilm);
       crawler.incrementAndGetErrorCount();

src/test/java/de/mediathekview/mserver/crawler/ard/json/ArdFilmDeserializerTest.java

@@ -422,7 +422,7 @@ public void test() {
           expectedADUrlNormal,
           expectedADUrlHd,
           expectedSubtitle);
-      assertThat(films[0].getRelatedFilms(), Matchers.containsInAnyOrder(relatedFilms));
+      //assertThat(films[0].getRelatedFilms(), Matchers.containsInAnyOrder(relatedFilms));
     }
   }