From 25f9f56ce8246e38189a28eb037eb6f7ca939e37 Mon Sep 17 00:00:00 2001 From: pidoubleyou Date: Thu, 26 Sep 2024 11:34:39 +0200 Subject: [PATCH 1/3] Authorization only for urls with /api/opa/ --- src/main/java/mServer/crawler/sender/arte/ArteHttpClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mServer/crawler/sender/arte/ArteHttpClient.java b/src/main/java/mServer/crawler/sender/arte/ArteHttpClient.java index 367f9a0f0..ca062ee8b 100644 --- a/src/main/java/mServer/crawler/sender/arte/ArteHttpClient.java +++ b/src/main/java/mServer/crawler/sender/arte/ArteHttpClient.java @@ -41,7 +41,7 @@ public class ArteHttpClient { private static Request createRequest(String aUrl) { Builder b; - if (aUrl.contains("/opa/")) { + if (aUrl.contains("/api/opa/")) { b = BUILDER_OPA; } else { b = BUILDER; From cb52fc812ff62ef33983b4aa18c28a82ddc18f36 Mon Sep 17 00:00:00 2001 From: pidoubleyou Date: Thu, 26 Sep 2024 11:35:13 +0200 Subject: [PATCH 2/3] change video url to fix 403 #1009 --- .../sender/arte/ArteProgramIdToDatenFilmCallable.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/mServer/crawler/sender/arte/ArteProgramIdToDatenFilmCallable.java b/src/main/java/mServer/crawler/sender/arte/ArteProgramIdToDatenFilmCallable.java index c23252e82..100c258a1 100644 --- a/src/main/java/mServer/crawler/sender/arte/ArteProgramIdToDatenFilmCallable.java +++ b/src/main/java/mServer/crawler/sender/arte/ArteProgramIdToDatenFilmCallable.java @@ -28,7 +28,7 @@ public class ArteProgramIdToDatenFilmCallable implements Callable private static final Logger LOG = LogManager.getLogger(ArteProgramIdToDatenFilmCallable.class); - private static final String ARTE_VIDEO_INFORMATION_URL_PATTERN = "https://api.arte.tv/api/opa/v3/videoStreams?programId=%s&limit=100&language=%s&protocol=HTTPS&kind=SHOW"; + private static final String ARTE_VIDEO_INFORMATION_URL_PATTERN = "https://www.arte.tv/hbbtvv2/services/web/index.php/OPA/v3/streams/%s/SHOW/%s"; private static final String ARTE_VIDEO_INFORMATION_URL_PATTERN_2 = "https://api.arte.tv/api/opa/v3/programs/%s/%s"; // Für broadcastBeginRounded private final FastDateFormat broadcastDateFormat = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ssX");//2016-10-29T16:15:00Z @@ -93,7 +93,11 @@ public Set call() throws Exception { if (video.getVideoUrlsOriginalWithSubtitle().containsKey(Qualities.NORMAL)) { films.add(createFilm(details.getTheme(), details.getWebsite(), details.getTitle() + " (Originalversion mit Untertitel)", video.getVideoUrlsOriginalWithSubtitle(), details, durationAsTime, details.getDescription())); } + } else { + Log.errorLog(8572677, "arte: no program found " + programId); } + } else { + Log.errorLog(84572678, "arte: no video found " + programId); } return films; From 4c3c53c4c17bb08d4b63d9c60c39f413524800f5 Mon Sep 17 00:00:00 2001 From: "Alexander F." Date: Thu, 26 Sep 2024 12:29:57 +0200 Subject: [PATCH 3/3] Version auf 3.1.239 angehoben --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6599bf3e0..97a4a9a9f 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 group = 'de.mediathekview' archivesBaseName = "MServer" -version = '3.1.238' +version = '3.1.239' def jarName = 'MServer.jar' def mainClass = 'mServer.Main'