correct handling of dgs videotype (#1067)

pidoubleyou · pidoubleyou · commit 50deda446c86 · 2025-09-07T21:49:01.000+02:00
diff --git a/src/main/java/de/mediathekview/mserver/crawler/zdf/tasks/ZdfFilmTask.java b/src/main/java/de/mediathekview/mserver/crawler/zdf/tasks/ZdfFilmTask.java
@@ -13,52 +13,105 @@
 import de.mediathekview.mserver.crawler.zdf.json.DownloadDto;
 import de.mediathekview.mserver.crawler.zdf.json.ZdfDownloadDtoDeserializer;
 import jakarta.ws.rs.client.WebTarget;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import java.lang.reflect.Type;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.time.Duration;
 import java.util.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class ZdfFilmTask extends ZdfTaskBase<Film, ZdfFilmDto> {
 
   private static final Logger LOG = LogManager.getLogger(ZdfFilmTask.class);
 
   private static final Type OPTIONAL_DOWNLOAD_DTO_TYPE_TOKEN =
-          new TypeToken<Optional<DownloadDto>>() {}.getType();
+      new TypeToken<Optional<DownloadDto>>() {}.getType();
 
   private final transient ZdfVideoUrlOptimizer optimizer = new ZdfVideoUrlOptimizer(crawler);
 
-  public ZdfFilmTask(
-          AbstractCrawler aCrawler, Queue<ZdfFilmDto> aUrlToCrawlDtos, String authKey) {
+  public ZdfFilmTask(AbstractCrawler aCrawler, Queue<ZdfFilmDto> aUrlToCrawlDtos, String authKey) {
     super(aCrawler, aUrlToCrawlDtos, authKey);
     registerJsonDeserializer(OPTIONAL_DOWNLOAD_DTO_TYPE_TOKEN, new ZdfDownloadDtoDeserializer());
   }
 
-  private static Film createFilm(final ZdfFilmDto aFilm, final DownloadDto downloadDto) throws MalformedURLException {
+  private static Film createFilm(final ZdfFilmDto aFilm, final DownloadDto downloadDto)
+      throws MalformedURLException {
     final Film film =
-            new Film(
-                    UUID.randomUUID(),
-                    aFilm.getSender(),
-                    aFilm.getTitle(),
-                    aFilm.getTopic(),
-                    aFilm.getTime(),
-                    downloadDto.getDuration().orElse(Duration.ZERO));
+        new Film(
+            UUID.randomUUID(),
+            aFilm.getSender(),
+            aFilm.getTitle(),
+            aFilm.getTopic(),
+            aFilm.getTime(),
+            downloadDto.getDuration().orElse(Duration.ZERO));
 
     film.setBeschreibung(aFilm.getDescription());
     film.setWebsite(URI.create(aFilm.getWebsite()).toURL());
 
     return film;
   }
 
+  private static void setSubtitle(DownloadDto downloadDto, Film filmWithLanguage, String language)
+      throws MalformedURLException {
+    final Optional<String> subtitleUrl = downloadDto.getSubTitleUrl(language);
+    if (subtitleUrl.isPresent()) {
+      filmWithLanguage.addSubtitle(URI.create(subtitleUrl.get()).toURL());
+    }
+  }
+
+  private static void setGeoLocation(DownloadDto downloadDto, Film filmWithLanguage) {
+    final Optional<GeoLocations> geoLocation = downloadDto.getGeoLocation();
+    if (geoLocation.isPresent()) {
+      final Collection<GeoLocations> geo = new ArrayList<>();
+      geo.add(geoLocation.get());
+      filmWithLanguage.setGeoLocations(geo);
+    }
+  }
+
+  private static Film clone(final Film aFilm, final String aLanguage) {
+    final Film film =
+        new Film(
+            UUID.randomUUID(),
+            aFilm.getSender(),
+            aFilm.getTitel(),
+            aFilm.getThema(),
+            aFilm.getTime(),
+            aFilm.getDuration());
+
+    film.setBeschreibung(aFilm.getBeschreibung());
+    film.setWebsite(aFilm.getWebsite().orElse(null));
+
+    updateTitle(aLanguage, film);
+
+    return film;
+  }
+
+  private static void updateTitle(final String aLanguage, final Film aFilm) {
+    String title = aFilm.getTitel();
+    switch (aLanguage) {
+      case ZdfConstants.LANGUAGE_GERMAN:
+        return;
+      case ZdfConstants.LANGUAGE_ENGLISH:
+        title += " (Englisch)";
+        break;
+      case ZdfConstants.LANGUAGE_FRENCH:
+        title += " (Französisch)";
+        break;
+      default:
+        title += "(" + aLanguage + ")";
+    }
+
+    aFilm.setTitel(title);
+  }
+
   @Override
   protected void processRestTarget(ZdfFilmDto aDTO, WebTarget aTarget) {
-    final Optional<DownloadDto> downloadDto = deserialize(aTarget, OPTIONAL_DOWNLOAD_DTO_TYPE_TOKEN);
+    final Optional<DownloadDto> downloadDto =
+        deserialize(aTarget, OPTIONAL_DOWNLOAD_DTO_TYPE_TOKEN);
     if (downloadDto.isPresent()) {
       try {
-        addFilm(downloadDto.get(), createFilm(aDTO, downloadDto.get()));
+        addFilm(downloadDto.get(), createFilm(aDTO, downloadDto.get()), aDTO.getVideoType());
         crawler.incrementAndGetActualCount();
         crawler.updateProgress();
       } catch (final MalformedURLException e) {
@@ -67,7 +120,12 @@ protected void processRestTarget(ZdfFilmDto aDTO, WebTarget aTarget) {
         crawler.updateProgress();
       }
     } else {
-      LOG.error("ZdfFilmDetailTask: no video {} {} {} in {}",aDTO.getSender(), aDTO.getTitle(), aDTO.getTopic() , aDTO);
+      LOG.error(
+          "ZdfFilmDetailTask: no video {} {} {} in {}",
+          aDTO.getSender(),
+          aDTO.getTitle(),
+          aDTO.getTopic(),
+          aDTO);
       crawler.incrementAndGetErrorCount();
       crawler.updateProgress();
     }
@@ -79,8 +137,8 @@ protected AbstractRecursiveConverterTask<Film, ZdfFilmDto> createNewOwnInstance(
     return new ZdfFilmTask(crawler, aElementsToProcess, getAuthKey().orElse(null));
   }
 
-  private void addFilm(final DownloadDto downloadDto, final Film result)
-          throws MalformedURLException {
+  private void addFilm(final DownloadDto downloadDto, final Film result, String videoType)
+      throws MalformedURLException {
 
     String previousLanguage = null;
     Film previousMainFilm = null;
@@ -91,11 +149,12 @@ private void addFilm(final DownloadDto downloadDto, final Film result)
 
         if (language.endsWith(ZdfConstants.LANGUAGE_SUFFIX_AD)) {
           final Map<Resolution, FilmUrl> urls =
-                  getOptimizedUrls(downloadDto.getDownloadUrls(language));
+              getOptimizedUrls(downloadDto.getDownloadUrls(language));
           urls.forEach(currentFilm::addAudioDescription);
-        } else if (language.endsWith(ZdfConstants.LANGUAGE_SUFFIX_DGS)) {
+        } else if (language.endsWith(ZdfConstants.LANGUAGE_SUFFIX_DGS)
+            || "DGS".equalsIgnoreCase(videoType)) {
           final Map<Resolution, FilmUrl> urls =
-                  getOptimizedUrls(downloadDto.getDownloadUrls(language));
+              getOptimizedUrls(downloadDto.getDownloadUrls(language));
           urls.forEach(currentFilm::addSignLanguage);
         } else {
           LOG.debug("unknown language suffix: {}", language);
@@ -106,8 +165,12 @@ private void addFilm(final DownloadDto downloadDto, final Film result)
         setGeoLocation(downloadDto, filmWithLanguage);
 
         final Map<Resolution, FilmUrl> urls =
-                getOptimizedUrls(downloadDto.getDownloadUrls(language));
-        urls.forEach(filmWithLanguage::addUrl);
+            getOptimizedUrls(downloadDto.getDownloadUrls(language));
+        if ("DGS".equalsIgnoreCase(videoType)) {
+          urls.forEach(filmWithLanguage::addSignLanguage);
+        } else {
+          urls.forEach(filmWithLanguage::addUrl);
+        }
 
         if (!taskResults.add(filmWithLanguage)) {
           LOG.error("Rejected duplicate {}", filmWithLanguage);
@@ -119,7 +182,7 @@ private void addFilm(final DownloadDto downloadDto, final Film result)
   }
 
   private Map<Resolution, FilmUrl> getOptimizedUrls(Map<Resolution, String> urls)
-          throws MalformedURLException {
+      throws MalformedURLException {
     Map<Resolution, FilmUrl> result = new EnumMap<>(Resolution.class);
 
     for (final Map.Entry<Resolution, String> qualitiesEntry : urls.entrySet()) {
@@ -143,56 +206,4 @@ private Map<Resolution, FilmUrl> getOptimizedUrls(Map<Resolution, String> urls)
     }
     return result;
   }
-
-  private static void setSubtitle(DownloadDto downloadDto, Film filmWithLanguage, String language) throws MalformedURLException {
-    final Optional<String> subtitleUrl = downloadDto.getSubTitleUrl(language);
-    if (subtitleUrl.isPresent()) {
-      filmWithLanguage.addSubtitle(URI.create(subtitleUrl.get()).toURL());
-    }
-  }
-
-  private static void setGeoLocation(DownloadDto downloadDto, Film filmWithLanguage) {
-    final Optional<GeoLocations> geoLocation = downloadDto.getGeoLocation();
-    if (geoLocation.isPresent()) {
-      final Collection<GeoLocations> geo = new ArrayList<>();
-      geo.add(geoLocation.get());
-      filmWithLanguage.setGeoLocations(geo);
-    }
-  }
-
-  private static Film clone(final Film aFilm, final String aLanguage) {
-    final Film film =
-            new Film(
-                    UUID.randomUUID(),
-                    aFilm.getSender(),
-                    aFilm.getTitel(),
-                    aFilm.getThema(),
-                    aFilm.getTime(),
-                    aFilm.getDuration());
-
-    film.setBeschreibung(aFilm.getBeschreibung());
-    film.setWebsite(aFilm.getWebsite().orElse(null));
-
-    updateTitle(aLanguage, film);
-
-    return film;
-  }
-
-  private static void updateTitle(final String aLanguage, final Film aFilm) {
-    String title = aFilm.getTitel();
-    switch (aLanguage) {
-      case ZdfConstants.LANGUAGE_GERMAN:
-        return;
-      case ZdfConstants.LANGUAGE_ENGLISH:
-        title += " (Englisch)";
-        break;
-      case ZdfConstants.LANGUAGE_FRENCH:
-        title += " (Französisch)";
-        break;
-      default:
-        title += "(" + aLanguage + ")";
-    }
-
-    aFilm.setTitel(title);
-  }
 }
diff --git a/src/test/java/de/mediathekview/mserver/crawler/zdf/json/ZdfTopicSeasonDeserializerTest.java b/src/test/java/de/mediathekview/mserver/crawler/zdf/json/ZdfTopicSeasonDeserializerTest.java
@@ -45,6 +45,36 @@ void deserializeValidJson() {
                 "default",
                 "https://api.zdf.de/tmd/2/android_native_5/vod/ptmd/mediathek/240101_2015_sendung_trs/8")));
   }
+
+  @Test
+  void deserializeJsonWithDgs() {
+    final JsonObject json = JsonFileReader.readJson("/zdf/zdf_topic_page_with_dgs.json");
+    final PagedElementListDTO<ZdfFilmDto> actual = target.deserialize(json, null, null);
+
+    assertEquals(Optional.empty(), actual.getNextPage());
+    assertEquals(2, actual.getElements().size());
+    assertThat(
+            actual.getElements(),
+            Matchers.containsInAnyOrder(
+                    new ZdfFilmDto(
+                            Sender.ZDF,
+                            "Die Insel der Giganten (S01/E04)",
+                            "Die Knochen des Lusotitan Old Grande erzählen die Geschichte eines alten, aber ehrgeizigen Bullen, der sich aufmacht, eine Partnerin zu finden, und bereit ist, dafür alles zu riskieren.",
+                            "https://www.zdf.de/video/dokus/terra-x-unter-dinos-geheimnisse-der-urzeit-dokureihe-100/terra-x-unter-dinos-lusotitan-old-grande-die-insel-der-giganten-doku-100",
+                            LocalDateTime.of(2025, 8, 20, 4, 0, 0),
+                            "dgs",
+                            "https://api.zdf.de/tmd/2/android_native_5/vod/ptmd/mediathek/250914_dk_dinos_insel_giganten_tex_dgs/2?caption_source=250914_dk_dinos_insel_giganten_tex%2F5"),
+                    new ZdfFilmDto(
+                            Sender.ZDF,
+                            "Die Insel der Giganten (S01/E04)",
+                            "Die Knochen des Lusotitan Old Grande erzählen die Geschichte eines alten, aber ehrgeizigen Bullen, der sich aufmacht, eine Partnerin zu finden, und bereit ist, dafür alles zu riskieren.",
+                            "https://www.zdf.de/video/dokus/terra-x-unter-dinos-geheimnisse-der-urzeit-dokureihe-100/terra-x-unter-dinos-lusotitan-old-grande-die-insel-der-giganten-doku-100",
+                            LocalDateTime.of(2025, 8, 20, 4, 0, 0),
+                            "default",
+                            "https://api.zdf.de/tmd/2/android_native_5/vod/ptmd/mediathek/250914_dk_dinos_insel_giganten_tex/5")));
+  }
+
+
   @Test
   void deserializeZdfNeo() {
     final JsonObject json = JsonFileReader.readJson("/zdf/zdf_topic_page_neo.json");
diff --git a/src/test/resources/zdf/zdf_topic_page_with_dgs.json b/src/test/resources/zdf/zdf_topic_page_with_dgs.json
