support neo/info in short run

Author: pidoubleyou

src/main/java/mServer/crawler/sender/zdf/ZdfCrawler.java

@@ -162,7 +162,7 @@ private Set<CrawlerUrlDTO> getDaysEntries(ZdfConfiguration configuration)
 
   private ConcurrentLinkedQueue<CrawlerUrlDTO> getDayUrls() {
 
-    int daysPast = 10;
+    int daysPast = 7;
     int daysFuture = 5;
 
     final ConcurrentLinkedQueue<CrawlerUrlDTO> urls = new ConcurrentLinkedQueue<>();

src/main/java/mServer/crawler/sender/zdf/ZdfFilmDtoOld.java

@@ -9,6 +9,7 @@
 
 public class ZdfFilmDtoOld extends CrawlerUrlDTO {
 
+  private final String sender;
   private final Optional<String> topic;
   private final String title;
   private final Optional<String> description;
@@ -17,10 +18,11 @@ public class ZdfFilmDtoOld extends CrawlerUrlDTO {
   private final Optional<Duration> duration;
   private final Optional<String> urlSignLanguage;
 
-  public ZdfFilmDtoOld(String url, Optional<String> topic, String title,
+  public ZdfFilmDtoOld(String sender, String url, Optional<String> topic, String title,
                     Optional<String> description, Optional<String> website,
                     Optional<LocalDateTime> time, Optional<Duration> duration, String urlSignLanguage) {
     super(url);
+    this.sender = sender;
     this.topic = topic;
     this.title = title;
     this.description = description;
@@ -35,6 +37,10 @@ public ZdfFilmDtoOld(String url, Optional<String> topic, String title,
     }
   }
 
+  public String getSender() {
+    return sender;
+  }
+
   public Optional<String> getTopic() {
     return topic;
   }

src/main/java/mServer/crawler/sender/zdf/json/ZdfFilmDetailDeserializer.java

@@ -1,8 +1,10 @@
 package mServer.crawler.sender.zdf.json;
 
 import com.google.gson.*;
+import de.mediathekview.mlib.Const;
 import mServer.crawler.sender.base.JsonUtils;
 import mServer.crawler.sender.base.UrlUtils;
+import mServer.crawler.sender.zdf.ZdfConstants;
 import mServer.crawler.sender.zdf.ZdfFilmDtoOld;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -69,6 +71,12 @@ public Optional<ZdfFilmDtoOld> deserialize(
     JsonObject programItemTarget = null;
     JsonObject mainVideoTarget = null;
 
+    final Optional<String> tvService = JsonUtils.getAttributeAsString(rootNode, "tvService");
+    if (tvService.isPresent() && !ZdfConstants.PARTNER_TO_SENDER.containsKey(tvService.get())) {
+      LOG.debug("ZdfFilmDetailDeserializer: ignore film of sender {}", tvService.orElse("EMPTY"));
+      return Optional.empty();
+    }
+
     if (rootNode.has(JSON_ELEMENT_PROGRAM_ITEM)
             && !rootNode.get(JSON_ELEMENT_PROGRAM_ITEM).isJsonNull()) {
       JsonArray programItem = rootNode.getAsJsonArray(JSON_ELEMENT_PROGRAM_ITEM);
@@ -98,7 +106,7 @@ public Optional<ZdfFilmDtoOld> deserialize(
     final Map<String, String> downloadUrl = parseDownloadUrls(mainVideoTarget);
 
     if (title.isPresent() && downloadUrl.containsKey(DOWNLOAD_URL_DEFAULT)) {
-      return Optional.of(new ZdfFilmDtoOld(downloadUrl.get(DOWNLOAD_URL_DEFAULT), topic, title.get(), description, website, time, duration, downloadUrl.get(DOWNLOAD_URL_DGS)));
+      return Optional.of(new ZdfFilmDtoOld(tvService.orElse(Const.ZDF), downloadUrl.get(DOWNLOAD_URL_DEFAULT), topic, title.get(), description, website, time, duration, downloadUrl.get(DOWNLOAD_URL_DGS)));
     } else {
       LOG.error("ZdfFilmDetailDeserializer: no title or url found");
     }

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

@@ -157,7 +157,7 @@ private DatenFilm createFilm(final ZdfFilmDtoOld zdfFilmDto, final DownloadDto d
 
     Duration duration = zdfFilmDto.getDuration().orElse(downloadDto.getDuration().orElse(Duration.ZERO));
 
-    DatenFilm film = new ZdfDatenFilm(crawler.getSendername(),
+    DatenFilm film = new ZdfDatenFilm(zdfFilmDto.getSender(),
       zdfFilmDto.getTopic().orElse(title),
       zdfFilmDto.getWebsite().orElse(""),
       title, downloadUrls.get(Qualities.NORMAL), "", dateValue, timeValue, duration.getSeconds(), zdfFilmDto.getDescription().orElse(""));