Merge branch 'hotfix/1056' into hotfix/3.1.258

Author: alex1702

src/main/java/mServer/crawler/sender/zdf/tasks/ZdfFilmTask.java

@@ -81,32 +81,16 @@ protected AbstractRestTask<DatenFilm, ZdfFilmDto> createNewOwnInstance(
 
   private void addFilm(final ZdfFilmDto zdfFilmDto, final DownloadDto downloadDto) {
 
-    String previousLanguage = null;
-    DatenFilm previousMainFilm = null;
     for (final String language : downloadDto.getLanguages().stream().sorted().toList()) {
 // todo deu-ad bei audiodescription passt nicht im title
-      // todo kann der auskommentierte code hier weg?
-/*      if (previousLanguage != null && language.startsWith(previousLanguage)) {
-        final DatenFilm currentFilm = previousMainFilm;
-
-        if (language.endsWith(ZdfConstants.LANGUAGE_SUFFIX_AD)) {
-          final Map<Qualities, String> urls =
-                  getOptimizedUrls(downloadDto.getDownloadUrls(language));
-          urls.forEach(currentFilm::addAudioDescription);
-        } else if (language.endsWith(ZdfConstants.LANGUAGE_SUFFIX_DGS)) {
-          final Map<Qualities, String> urls =
-                  getOptimizedUrls(downloadDto.getDownloadUrls(language));
-          urls.forEach(currentFilm::addSignLanguage);
-        } else {
-          LOG.debug("unknown language suffix: {}", language);
-        }
-      } else {*/
-        final DatenFilm filmWithLanguage = createFilm(zdfFilmDto, downloadDto, language);
+      DownloadDtoFilmConverter.getOptimizedUrls(
+              downloadDto.getDownloadUrls(language), Optional.of(optimizer));
+
+      final DatenFilm filmWithLanguage = createFilm(zdfFilmDto, downloadDto, language);
         setSubtitle(downloadDto, filmWithLanguage, language);
         setGeoLocation(downloadDto, filmWithLanguage);
 
-        final Map<Qualities, String> urls =
-                getOptimizedUrls(downloadDto.getDownloadUrls(language));
+      final Map<Qualities, String> urls = downloadDto.getDownloadUrls(language);
         if (urls.containsKey(Qualities.SMALL)) {
           CrawlerTool.addUrlKlein(filmWithLanguage, urls.get(Qualities.SMALL));
         }
@@ -117,35 +101,7 @@ private void addFilm(final ZdfFilmDto zdfFilmDto, final DownloadDto downloadDto)
         if (!taskResults.add(filmWithLanguage)) {
           LOG.error("Rejected duplicate {}", filmWithLanguage);
         }
-        previousMainFilm = filmWithLanguage;
-        previousLanguage = language;
-      //}
-    }
-  }
-
-  private Map<Qualities, String> getOptimizedUrls(Map<Qualities, String> urls) {
-    Map<Qualities, String> result = new EnumMap<>(Qualities.class);
-
-    for (final Map.Entry<Qualities, String> qualitiesEntry : urls.entrySet()) {
-      String url = qualitiesEntry.getValue();
-
-      if (qualitiesEntry.getKey() == Qualities.NORMAL) {
-        url = optimizer.getOptimizedUrlNormal(url);
-      } else if (qualitiesEntry.getKey() == Qualities.HD) {
-        url = optimizer.getOptimizedUrlHd(url);
-      }
-
-      result.put(qualitiesEntry.getKey(), url);
-    }
-
-    if (!result.containsKey(Qualities.HD)) {
-      final Optional<String> hdUrl = optimizer.determineUrlHd(result.get(Qualities.NORMAL));
-      if (hdUrl.isPresent()) {
-        result.put(
-                Qualities.HD, hdUrl.get());
-      }
     }
-    return result;
   }
 
   private static void setSubtitle(DownloadDto downloadDto, DatenFilm filmWithLanguage, String language) {
@@ -165,6 +121,12 @@ private static String updateTitle(final String aLanguage, final String aTitle) {
     switch (aLanguage) {
       case ZdfConstants.LANGUAGE_GERMAN:
         break;
+      case ZdfConstants.LANGUAGE_GERMAN_AD:
+        title += " (Audiodeskription)";
+        break;
+      case ZdfConstants.LANGUAGE_GERMAN_DGS:
+        title += " (Gebärdensprache)";
+        break;
       case ZdfConstants.LANGUAGE_ENGLISH:
         title += " (Englisch)";
         break;