From 241e7412b44a007c99de61a9f61b0ec949040186 Mon Sep 17 00:00:00 2001 From: pidoubleyou <22942659+pidoubleyou@users.noreply.github.com> Date: Thu, 21 Aug 2025 21:18:46 +0200 Subject: [PATCH 1/5] add exception handling while adding film --- .../mServer/crawler/sender/MediathekCrawler.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/mServer/crawler/sender/MediathekCrawler.java b/src/main/java/mServer/crawler/sender/MediathekCrawler.java index 607f57b1b..3e847fbfb 100644 --- a/src/main/java/mServer/crawler/sender/MediathekCrawler.java +++ b/src/main/java/mServer/crawler/sender/MediathekCrawler.java @@ -9,6 +9,7 @@ import java.util.concurrent.RecursiveTask; import java.util.concurrent.TimeUnit; import mServer.crawler.FilmeSuchen; +import mServer.crawler.RunSender; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -19,7 +20,7 @@ public abstract class MediathekCrawler extends MediathekReader { protected final ForkJoinPool forkJoinPool; - public MediathekCrawler(FilmeSuchen aMSearchFilmeSuchen, String aSendername, int aSenderMaxThread, int aSenderWartenSeiteLaden, int aStartPrio) { + protected MediathekCrawler(FilmeSuchen aMSearchFilmeSuchen, String aSendername, int aSenderMaxThread, int aSenderWartenSeiteLaden, int aStartPrio) { super(aMSearchFilmeSuchen, aSendername, aSenderMaxThread, aSenderWartenSeiteLaden, aStartPrio); forkJoinPool = createForkJoinPool(aSendername); @@ -61,13 +62,20 @@ protected void runCrawler() { Log.sysLog(getSendername() + ": Filme einsortieren..." + films.size()); if (films.isEmpty()) { - LOG.fatal(getSendername() + ": no films found!"); + LOG.fatal("{}: no films found!", getSendername()); } films.forEach(film -> { if (!Config.getStop()) { - prepareFilm(film); - addFilm(film); + try { + prepareFilm(film); + addFilm(film); + } catch (Exception e) { + final String index = film.getIndexAddOld(); + Log.errorLog(974513456, e, index); + LOG.error("{}: Error while processing film: {}: {}", getSendername(), index, e); + FilmeSuchen.listeSenderLaufen.inc(film.arr[DatenFilm.FILM_SENDER], RunSender.Count.FEHLER); + } } }); } From eb1f2230bc4a5bce1cbb1fdd6066c48ebb475e74 Mon Sep 17 00:00:00 2001 From: pidoubleyou <22942659+pidoubleyou@users.noreply.github.com> Date: Thu, 21 Aug 2025 21:19:29 +0200 Subject: [PATCH 2/5] add null check --- .../crawler/sender/srf/tasks/SrfTopicOverviewTask.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/mServer/crawler/sender/srf/tasks/SrfTopicOverviewTask.java b/src/main/java/mServer/crawler/sender/srf/tasks/SrfTopicOverviewTask.java index 019ed6031..1484fc86d 100644 --- a/src/main/java/mServer/crawler/sender/srf/tasks/SrfTopicOverviewTask.java +++ b/src/main/java/mServer/crawler/sender/srf/tasks/SrfTopicOverviewTask.java @@ -59,11 +59,13 @@ private AbstractRecursivConverterTask createNewOwnIn protected void processRestTarget(TopicUrlDTO aDTO, WebTarget aTarget) { PagedElementListDTO results = deserialize(aTarget, PAGED_ELEMENT_LIST_URL_TYPE_TOKEN); - taskResults.addAll(results.getElements()); + if (results != null) { + taskResults.addAll(results.getElements()); - Optional nextPageId = results.getNextPage(); - if (nextPageId.isPresent() && pageNumber < maxSubPages) { - processNextPage(aDTO.getTopic(), nextPageId.get()); + Optional nextPageId = results.getNextPage(); + if (nextPageId.isPresent() && pageNumber < maxSubPages) { + processNextPage(aDTO.getTopic(), nextPageId.get()); + } } } From 40e7ac720d01bfa896754520787141e58321e0d0 Mon Sep 17 00:00:00 2001 From: "Alexander F." Date: Fri, 22 Aug 2025 09:19:53 +0200 Subject: [PATCH 3/5] Version auf 3.1.262 angehoben --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 93c7b8f47..746d9c32b 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.261' +version = '3.1.262' def jarName = 'MServer.jar' def mainClass = 'mServer.Main' From 7bb71365f54292e53fb3fb228167467c4ceeb7d2 Mon Sep 17 00:00:00 2001 From: "Alexander F." Date: Fri, 22 Aug 2025 09:20:21 +0200 Subject: [PATCH 4/5] MLib auf 3.0.19 aktualisiert --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 746d9c32b..950a5bda5 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ def jarName = 'MServer.jar' def mainClass = 'mServer.Main' dependencies { - implementation 'de.mediathekview:MLib:3.0.18' + implementation 'de.mediathekview:MLib:3.0.19' implementation 'commons-net:commons-net:3.9.0' implementation 'org.apache.commons:commons-compress:1.22' implementation 'org.apache.commons:commons-text:1.10.0' From fe73c1db3a295019f9ded405d03e637a8a2254e0 Mon Sep 17 00:00:00 2001 From: "Alexander F." Date: Fri, 22 Aug 2025 09:44:33 +0200 Subject: [PATCH 5/5] Revert "MLib auf 3.0.19 aktualisiert" This reverts commit 7bb71365f54292e53fb3fb228167467c4ceeb7d2. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 950a5bda5..746d9c32b 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ def jarName = 'MServer.jar' def mainClass = 'mServer.Main' dependencies { - implementation 'de.mediathekview:MLib:3.0.19' + implementation 'de.mediathekview:MLib:3.0.18' implementation 'commons-net:commons-net:3.9.0' implementation 'org.apache.commons:commons-compress:1.22' implementation 'org.apache.commons:commons-text:1.10.0'