add attribute to filter

Author: codingPF

src/main/java/de/mediathekview/mserver/crawler/orfon/OrfOnVideoInfoDTO.java

@@ -20,6 +20,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;
@@ -36,6 +37,7 @@ public OrfOnVideoInfoDTO(
       Optional<String> titleWithDate, 
       Optional<String> topic,
       Optional<String> topicForArchive,
+      Optional<String> drmProtected,
       Optional<LocalDateTime> aired, 
       Optional<Duration> duration, 
       Optional<String> description, 
@@ -51,6 +53,7 @@ public OrfOnVideoInfoDTO(
     this.titleWithDate = titleWithDate;
     this.topic = topic;
     this.topicForArchive = topicForArchive;
+    this.drmProtected = drmProtected;
     this.aired = aired;
     this.duration = duration;
     this.description = description;
@@ -79,6 +82,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/de/mediathekview/mserver/crawler/orfon/json/OrfOnEpisodeDeserializer.java

@@ -51,6 +51,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_SMI = "sami_url";
@@ -78,6 +79,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/de/mediathekview/mserver/crawler/orfon/task/OrfOnEpisodeTask.java

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

src/test/java/de/mediathekview/mserver/crawler/orfon/OrfOnEpisodeTaskTest.java

@@ -190,7 +190,7 @@ Resolution.VERY_SMALL, new FilmUrl("https://apasfiis.sf.apa.at/ipad/cms-worldwid
   }
 
   @Test
-  public void testDummyUrls() {
+  public void testIgnoreDRM() {
     setupSuccessfulJsonResponse("/episodeDummyUrl", "/orfOn/episode_noDrm.json");
     setupSuccessfulJsonResponse("/cms-austria/online/6b2d672267c81e196472b564abf8c8fe/1713132000/2024-03-13_2349_in_01_Spektakulaere-R_____14216629__o__1333685799__s15595990_Q8C.mp4", "/orfOn/episode_noDrm.json");
     setupSuccessfulJsonResponse("/cms-austria/online/de9bd8775f46ea293a9db4b0711d4de5/1713132000/2024-03-13_2349_in_01_Spektakulaere-R_____14216629__o__1333685799__s15595990_Q6A.mp4", "/orfOn/episode_noDrm.json");
@@ -199,36 +199,7 @@ public void testDummyUrls() {
     setupHeadRequestForFileSize();
     //
     Set<Film> result = executeTask("/episodeDummyUrl");
-    assertTrue(result.size() == 1);
-    Film actual = result.toArray(new Film[1])[0];
-    //
-    try {
-    assertEquals("Spektakuläre Raubüberfälle mit Pierce Brosnan: Bankeinbruch in Kalifornien",actual.getTitel());
-    assertEquals("Spektakuläre Raubüberfälle mit Pierce Brosnan",actual.getThema());
-    assertEquals(LocalDateTime.of(2024,03,13,23,49,50),actual.getTime());
-    assertEquals("Pierce Brosnan präsentiert in der spannenden Krimi-Doku-Reihe die spektakulärsten Raubüberfälle der Geschichte.",actual.getBeschreibung());
-    assertEquals(Duration.parse("PT40M46S"),actual.getDuration());
-    assertEquals(Optional.of(new URL("https://tvthek.orf.at/profile/Spektakulaere-Raubueberfaelle-mit-Pierce-Brosnan/13896153/Spektakulaere-Raubueberfaelle-mit-Pierce-Brosnan-Bankeinbruch-in-Kalifornien/14216629")),actual.getWebsite());
-    assertTrue(List.of(GeoLocations.GEO_AT).containsAll(actual.getGeoLocations()));
-    assertTrue(Set.of(
-        new URL("https://api-tvthek.orf.at/assets/subtitles/0171/15/e83f6eabbdbcf49e894d1a58d77fcf3a9b951f3c.smi"),
-        new URL("https://api-tvthek.orf.at/assets/subtitles/0171/15/c95472a931fe3ea8407734f95df242bce2f06b09.ttml"),
-        new URL("https://api-tvthek.orf.at/assets/subtitles/0171/15/13759cf0d408fe11965ff16d03a564bbabbf5bc1.vtt"),
-        new URL("https://api-tvthek.orf.at/assets/subtitles/0171/15/e2536ac2b80a5152e54b047073ab327c223579ec.srt"),
-        new URL("https://api-tvthek.orf.at/assets/subtitles/0171/15/be922c3765a25ec3d7fa13e9265dabad7f986b75.xml")
-        ).containsAll(actual.getSubtitles()));
-    assertEquals(Map.of(
-        Resolution.HD, new FilmUrl(getWireMockBaseUrlSafe()+"/cms-austria/online/6b2d672267c81e196472b564abf8c8fe/1713132000/2024-03-13_2349_in_01_Spektakulaere-R_____14216629__o__1333685799__s15595990_Q8C.mp4", 0L),
-        Resolution.NORMAL, new FilmUrl(getWireMockBaseUrlSafe()+"/cms-austria/online/de9bd8775f46ea293a9db4b0711d4de5/1713132000/2024-03-13_2349_in_01_Spektakulaere-R_____14216629__o__1333685799__s15595990_Q6A.mp4", 0L),
-        Resolution.SMALL, new FilmUrl(getWireMockBaseUrlSafe()+"/cms-austria/online/a96476a0eab40b11ef517feefe0d2973/1713132000/2024-03-13_2349_in_01_Spektakulaere-R_____14216629__o__1333685799__s15595990_Q4A.mp4", 0L),
-        Resolution.VERY_SMALL, new FilmUrl(getWireMockBaseUrlSafe()+"/cms-austria/online/440102b9f68434fbb577d17114dd9182/1713132000/2024-03-13_2349_in_01_Spektakulaere-R_____14216629__o__1333685799__s15595990_Q1A.3gp", 0L)
-        ), actual.getUrls());
-    } catch (Exception e) {
-      assertTrue(false);
-    }
-    
-    
-    
+    assertTrue(result.size() == 0);
   }
 
   private Set<Film> executeTask(String... requestUrl) {