Merge branch 'hotfix/arte_limit' into hotfix/3.1.277

Author: alex1702

src/main/java/mServer/crawler/FilmeSuchen.java

@@ -89,7 +89,7 @@ public FilmeSuchen() {
     }
     if (crawlerList.contains("ARTE")) {
       mediathekListe.add(new ArteCrawler(this, 0));
-      mediathekListe.add(new ArteCrawler_FR(this, 0));
+      mediathekListe.add(new ArteCrawler_FR(this, 1));
       mediathekListe.add(new ArteCrawler_EN(this, 1));
       mediathekListe.add(new ArteCrawler_ES(this, 1));
       mediathekListe.add(new ArteCrawler_PL(this, 1));

src/main/java/mServer/crawler/sender/arte/ArteConstants.java

@@ -1,8 +1,8 @@
 package mServer.crawler.sender.arte;
 
 public class ArteConstants {
-  public static final String VIDEOS_URL ="https://api.arte.tv/api/opa/v3/videos?limit=100&page=%s&sort=-broadcastBegin&language=%s";
-  public static final String VIDEOS_URL_ALT ="https://api.arte.tv/api/opa/v3/videos?limit=100&page=%s&sort=broadcastBegin&language=%s";
+  public static final String VIDEOS_URL ="https://api.arte.tv/api/opa/v3/videos?limit=100&page=%s&sort=-broadcastBegin&language=%s&kind=SHOW,MANUAL_CLIP,BONUS";
+  public static final String VIDEOS_URL_ALT ="https://api.arte.tv/api/opa/v3/videos?limit=100&page=%s&sort=broadcastBegin&language=%s&kind=SHOW,MANUAL_CLIP,BONUS";
   public static final String VIDEO_URL ="https://www.arte.tv/hbbtvv2/services/web/index.php/OPA/v3/streams/%s/%s/%s"; //PROGRAMID/KIND/LANG
   public static final String API_TOKEN = "Bearer Nzc1Yjc1ZjJkYjk1NWFhN2I2MWEwMmRlMzAzNjI5NmU3NWU3ODg4ODJjOWMxNTMxYzEzZGRjYjg2ZGE4MmIwOA";
   public static final int MAX_POSSIBLE_SUBPAGES = 100;

src/main/java/mServer/crawler/sender/arte/ArteCrawler.java

@@ -111,9 +111,9 @@ private int getNumberOfAvailablePages(String lang) {
     return ArteConstants.MAX_POSSIBLE_SUBPAGES;
   }
 
-  private int getMaximumSubpages() {
+  protected int getMaximumSubpages() {
     if (CrawlerTool.loadLongMax()) {
-      return 30;
+      return 20;
     } else {
       return 10;
     }

src/main/java/mServer/crawler/sender/arte/ArteCrawler_EN.java

@@ -1,6 +1,7 @@
 package mServer.crawler.sender.arte;
 
 import de.mediathekview.mlib.Const;
+import mServer.crawler.CrawlerTool;
 import mServer.crawler.FilmeSuchen;
 
 public class ArteCrawler_EN extends ArteCrawler {
@@ -14,4 +15,12 @@ protected ArteLanguage getLanguage() {
     return ArteLanguage.EN;
   }
 
+  @Override
+  protected int getMaximumSubpages() {
+    if (CrawlerTool.loadLongMax()) {
+      return 6;
+    } else {
+      return 2;
+    }
+  }
 }

src/main/java/mServer/crawler/sender/arte/ArteCrawler_ES.java

@@ -1,6 +1,7 @@
 package mServer.crawler.sender.arte;
 
 import de.mediathekview.mlib.Const;
+import mServer.crawler.CrawlerTool;
 import mServer.crawler.FilmeSuchen;
 
 public class ArteCrawler_ES extends ArteCrawler {
@@ -14,4 +15,12 @@ protected ArteLanguage getLanguage() {
     return ArteLanguage.ES;
   }
 
+  @Override
+  protected int getMaximumSubpages() {
+    if (CrawlerTool.loadLongMax()) {
+      return 6;
+    } else {
+      return 2;
+    }
+  }
 }

src/main/java/mServer/crawler/sender/arte/ArteCrawler_FR.java

@@ -1,6 +1,7 @@
 package mServer.crawler.sender.arte;
 
 import de.mediathekview.mlib.Const;
+import mServer.crawler.CrawlerTool;
 import mServer.crawler.FilmeSuchen;
 
 public class ArteCrawler_FR extends ArteCrawler {
@@ -14,4 +15,13 @@ protected ArteLanguage getLanguage() {
     return ArteLanguage.FR;
   }
 
+
+  @Override
+  protected int getMaximumSubpages() {
+    if (CrawlerTool.loadLongMax()) {
+      return 10;
+    } else {
+      return 4;
+    }
+  }
 }

src/main/java/mServer/crawler/sender/arte/ArteCrawler_IT.java

@@ -1,6 +1,7 @@
 package mServer.crawler.sender.arte;
 
 import de.mediathekview.mlib.Const;
+import mServer.crawler.CrawlerTool;
 import mServer.crawler.FilmeSuchen;
 
 public class ArteCrawler_IT extends ArteCrawler {
@@ -14,4 +15,12 @@ protected ArteLanguage getLanguage() {
     return ArteLanguage.IT;
   }
 
+  @Override
+  protected int getMaximumSubpages() {
+    if (CrawlerTool.loadLongMax()) {
+      return 6;
+    } else {
+      return 2;
+    }
+  }
 }

src/main/java/mServer/crawler/sender/arte/ArteCrawler_PL.java

@@ -1,6 +1,7 @@
 package mServer.crawler.sender.arte;
 
 import de.mediathekview.mlib.Const;
+import mServer.crawler.CrawlerTool;
 import mServer.crawler.FilmeSuchen;
 
 public class ArteCrawler_PL extends ArteCrawler {
@@ -13,4 +14,12 @@ protected ArteLanguage getLanguage() {
     return ArteLanguage.PL;
   }
 
+  @Override
+  protected int getMaximumSubpages() {
+    if (CrawlerTool.loadLongMax()) {
+      return 6;
+    } else {
+      return 2;
+    }
+  }
 }

src/main/java/mServer/crawler/sender/arte/tasks/ArteRateLimitedJsonRestTask.java

@@ -13,14 +13,19 @@
 public abstract class ArteRateLimitedJsonRestTask<T, R, D extends CrawlerUrlDTO> extends AbstractJsonRestTask<T, R, D> {
   private static final long serialVersionUID = 1L;
   private static final RateLimiter rateLimiter = RateLimiter.create(MserverDaten.getArteRateLimit());
+  private static final RateLimiter opaApirateLimiter = RateLimiter.create(1.0);
 
   protected ArteRateLimitedJsonRestTask(MediathekReader aCrawler, ConcurrentLinkedQueue<D> urlToCrawlDTOs, Optional<String> authKey) {
     super(aCrawler, urlToCrawlDTOs, authKey);
   }
 
   @Override
   protected void processRestTarget(final D aDTO, final WebTarget aTarget) {
-    rateLimiter.acquire();
+    if (aTarget.getUri().toString().contains("api.arte.tv/api/opa/")) {
+      opaApirateLimiter.acquire();
+    } else {
+      rateLimiter.acquire();
+    }
     super.processRestTarget(aDTO, aTarget);
   }
 }