Skip to content

Bugfixes #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex1702 merged 5 commits into from
Aug 22, 2025
Merged

Bugfixes #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
241e741
add exception handling while adding film
pidoubleyou Aug 21, 2025
eb1f223
add null check
pidoubleyou Aug 21, 2025
40e7ac7
Version auf 3.1.262 angehoben
alex1702 Aug 22, 2025
7bb7136
MLib auf 3.0.19 aktualisiert
alex1702 Aug 22, 2025
fe73c1d
Revert "MLib auf 3.0.19 aktualisiert"
alex1702 Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
16 changes: 12 additions & 4 deletions src/main/java/mServer/crawler/sender/MediathekCrawler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand Down Expand Up @@ -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);
}
}
});
}
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/mServer/crawler/sender/srf/tasks/SrfTopicOverviewTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,13 @@ private AbstractRecursivConverterTask<CrawlerUrlDTO, TopicUrlDTO> createNewOwnIn
protected void processRestTarget(TopicUrlDTO aDTO, WebTarget aTarget) {
PagedElementListDTO<CrawlerUrlDTO> results
= deserialize(aTarget, PAGED_ELEMENT_LIST_URL_TYPE_TOKEN);
taskResults.addAll(results.getElements());
if (results != null) {
taskResults.addAll(results.getElements());

Optional<String> nextPageId = results.getNextPage();
if (nextPageId.isPresent() && pageNumber < maxSubPages) {
processNextPage(aDTO.getTopic(), nextPageId.get());
Optional<String> nextPageId = results.getNextPage();
if (nextPageId.isPresent() && pageNumber < maxSubPages) {
processNextPage(aDTO.getTopic(), nextPageId.get());
}
}
}

Expand Down