zdf: fix sender erkennung

remove protected videos

Author: alex1702

build.gradle

@@ -27,7 +27,7 @@ sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 group = 'de.mediathekview'
 archivesBaseName = "MServer"
-version = '3.1.264'
+version = '3.1.265'
 
 def jarName = 'MServer.jar'
 def mainClass = 'mServer.Main'

src/main/java/mServer/crawler/sender/orfon/OrfOnVideoInfoDTO.java

@@ -14,6 +14,7 @@ public class OrfOnVideoInfoDTO {
   private Optional<String> titleWithDate;
   private Optional<String> topic;
   private Optional<String> topicForArchive;
+  private Optional<String> drmProtected;
   private Optional<LocalDateTime> aired;
   private Optional<Duration> duration;
   private Optional<String> description;
@@ -28,6 +29,7 @@ public OrfOnVideoInfoDTO(
       Optional<String> titleWithDate, 
       Optional<String> topic,
       Optional<String> topicForArchive,
+      Optional<String> drmProtected,
       Optional<LocalDateTime> aired, 
       Optional<Duration> duration, 
       Optional<String> description, 
@@ -41,6 +43,7 @@ public OrfOnVideoInfoDTO(
     this.titleWithDate = titleWithDate;
     this.topic = topic;
     this.topicForArchive = topicForArchive;
+    this.drmProtected = drmProtected;
     this.aired = aired;
     this.duration = duration;
     this.description = description;
@@ -67,6 +70,9 @@ public Optional<String> getTopic() {
   public Optional<String> getTopicForArchive() {
     return topicForArchive;
   }
+  public Optional<String> getDrmProtected() {
+    return drmProtected;
+  }
   public Optional<LocalDateTime> getAired() {
     return aired;
   }

src/main/java/mServer/crawler/sender/orfon/json/OrfOnEpisodeDeserializer.java

@@ -41,6 +41,7 @@ public class OrfOnEpisodeDeserializer implements JsonDeserializer<OrfOnVideoInfo
   private static final String TAG_VIDEO_QUALITY = "quality";
   private static final String TAG_VIDEO_FALLBACK = "sources";
   private static final String TAG_VIDEO_FALLBACK_URL = "src";
+  private static final String TAG_DRM_PROTECTED = "is_drm_protected";
 
   private static final String[] TAG_SUBTITLE_SECTION = {"_embedded", "subtitle"};
   private static final String TAG_SUBTITLE_TTML = "ttml_url";
@@ -88,6 +89,7 @@ public OrfOnVideoInfoDTO deserialize(
             JsonUtils.getElementValueAsString(jsonElement, TAG_TITLE_WITH_DATE),
             JsonUtils.getElementValueAsString(jsonElement, TAG_TOPIC),
             JsonUtils.getElementValueAsString(jsonElement, TAG_TOPIC_ARCHIVE),
+            JsonUtils.getElementValueAsString(jsonElement, TAG_DRM_PROTECTED),
             parseAiredDate(JsonUtils.getElementValueAsString(jsonElement, TAG_AIRED)),
             parseDuration(JsonUtils.getElementValueAsString(jsonElement, TAG_DURATION)),
             JsonUtils.getElementValueAsString(jsonElement, TAG_DESCRIPTION),

src/main/java/mServer/crawler/sender/orfon/task/OrfOnEpisodeTask.java

@@ -68,6 +68,10 @@ protected void postProcessing(OrfOnVideoInfoDTO aResponseObj, OrfOnBreadCrumsUrl
       LOG.warn("Missing videoUrls for {}", aDTO);
       return;
     }
+    if (aResponseObj.getDrmProtected().orElse("false").equalsIgnoreCase("true")) {
+      LOG.warn("Ignore DRM Protected {}", aDTO);
+      return;
+    }
     if (aResponseObj.getDuration().isEmpty()) {
       LOG.warn("Missing duration for {}", aDTO);
     }

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

@@ -27,7 +27,13 @@ public ZdfPubFormResult deserialize(
       JsonObject node = element.getAsJsonObject();
       Optional<String> sender = Optional.empty();
       if (!node.get("contentOwner").isJsonNull()) {
-        sender = JsonUtils.getElementValueAsString(node.getAsJsonObject("contentOwner"), "title");
+        final JsonObject contentOwner = node.getAsJsonObject("contentOwner");
+        final Optional<String> details = JsonUtils.getAttributeAsString(contentOwner, "details");
+        if (details.isPresent()) {
+          sender = details;
+        } else {
+          sender = JsonUtils.getElementValueAsString(contentOwner, "title");
+        }
       }
       final Optional<String> topic = JsonUtils.getElementValueAsString(node, "title");
       final Optional<String> countSeasons = JsonUtils.getElementValueAsString(node, "countSeasons");