Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/main/java/mServer/crawler/sender/sr/SrCrawler.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ protected RecursiveTask<Set<DatenFilm>> createCrawlerTask() {
} catch (InterruptedException | ExecutionException exception) {
Log.errorLog(56146546, exception);
}
return new SrFilmDetailTask(this, filmDtos);
return new SrFilmDetailTask(this, filmDtos, SrConstants.URL_BASE);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import de.mediathekview.mlib.Const;
import de.mediathekview.mlib.daten.DatenFilm;
import de.mediathekview.mlib.tool.Log;
import mServer.crawler.sender.base.*;
import mServer.crawler.sender.sr.SrTopicUrlDTO;
import org.apache.logging.log4j.LogManager;
import org.jsoup.nodes.Document;
Expand All @@ -25,10 +26,6 @@
import mServer.crawler.sender.MediathekReader;
import mServer.crawler.sender.ard.json.ArdVideoInfoDto;
import mServer.crawler.sender.ard.json.ArdVideoInfoJsonDeserializer;
import mServer.crawler.sender.base.AbstractUrlTask;
import mServer.crawler.sender.base.DateUtils;
import mServer.crawler.sender.base.Qualities;
import mServer.crawler.sender.base.HtmlDocumentUtils;

public class SrFilmDetailTask extends SrRateLimitedDocumentTask<DatenFilm, SrTopicUrlDTO> {

Expand All @@ -51,10 +48,12 @@ public class SrFilmDetailTask extends SrRateLimitedDocumentTask<DatenFilm, SrTop
private static final String DESCRIPTION_SELECTOR = "h1.background-title";
private static final String VIDEO_DETAIL_ATTRIBUTE = "data-mediacollection-ardplayer";
private static final String VIDEO_DETAIL_SELECTOR = "div[" + VIDEO_DETAIL_ATTRIBUTE + "]";
private final String baseUrl;

public SrFilmDetailTask(
final MediathekReader aCrawler, final ConcurrentLinkedQueue<SrTopicUrlDTO> aUrlToCrawlDTOs) {
final MediathekReader aCrawler, final ConcurrentLinkedQueue<SrTopicUrlDTO> aUrlToCrawlDTOs, String baseUrl) {
super(aCrawler, aUrlToCrawlDTOs);
this.baseUrl = baseUrl;
}

private static Optional<String> parseDescription(final Document aDocument) {
Expand Down Expand Up @@ -172,7 +171,7 @@ protected void processDocument(final SrTopicUrlDTO aUrlDTO, final Document aDocu
@Override
protected AbstractUrlTask<DatenFilm, SrTopicUrlDTO> createNewOwnInstance(
final ConcurrentLinkedQueue<SrTopicUrlDTO> aURLsToCrawl) {
return new SrFilmDetailTask(crawler, aURLsToCrawl);
return new SrFilmDetailTask(crawler, aURLsToCrawl, baseUrl);
}

/**
Expand All @@ -199,6 +198,7 @@ private Optional<ArdVideoInfoDto> parseUrls(final Document aDocument) {

String url = videoDetailUrl.get();
url = addMissingProtocol(url);
url = UrlUtils.addDomainIfMissing(url, baseUrl);

try {
final ArdVideoInfoDto dto
Expand Down