Skip to content

Commit 17d689d

Browse files
committed
Merge branch 'hotfix/sr_missing_host' into hotfix/3.1.279
2 parents 0338e91 + e1b6750 commit 17d689d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/main/java/mServer/crawler/sender/sr/SrCrawler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ protected RecursiveTask<Set<DatenFilm>> createCrawlerTask() {
3939
} catch (InterruptedException | ExecutionException exception) {
4040
Log.errorLog(56146546, exception);
4141
}
42-
return new SrFilmDetailTask(this, filmDtos);
42+
return new SrFilmDetailTask(this, filmDtos, SrConstants.URL_BASE);
4343
}
4444
}

src/main/java/mServer/crawler/sender/sr/tasks/SrFilmDetailTask.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import de.mediathekview.mlib.Const;
66
import de.mediathekview.mlib.daten.DatenFilm;
77
import de.mediathekview.mlib.tool.Log;
8+
import mServer.crawler.sender.base.*;
89
import mServer.crawler.sender.sr.SrTopicUrlDTO;
910
import org.apache.logging.log4j.LogManager;
1011
import org.jsoup.nodes.Document;
@@ -25,10 +26,6 @@
2526
import mServer.crawler.sender.MediathekReader;
2627
import mServer.crawler.sender.ard.json.ArdVideoInfoDto;
2728
import mServer.crawler.sender.ard.json.ArdVideoInfoJsonDeserializer;
28-
import mServer.crawler.sender.base.AbstractUrlTask;
29-
import mServer.crawler.sender.base.DateUtils;
30-
import mServer.crawler.sender.base.Qualities;
31-
import mServer.crawler.sender.base.HtmlDocumentUtils;
3229

3330
public class SrFilmDetailTask extends SrRateLimitedDocumentTask<DatenFilm, SrTopicUrlDTO> {
3431

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

5553
public SrFilmDetailTask(
56-
final MediathekReader aCrawler, final ConcurrentLinkedQueue<SrTopicUrlDTO> aUrlToCrawlDTOs) {
54+
final MediathekReader aCrawler, final ConcurrentLinkedQueue<SrTopicUrlDTO> aUrlToCrawlDTOs, String baseUrl) {
5755
super(aCrawler, aUrlToCrawlDTOs);
56+
this.baseUrl = baseUrl;
5857
}
5958

6059
private static Optional<String> parseDescription(final Document aDocument) {
@@ -172,7 +171,7 @@ protected void processDocument(final SrTopicUrlDTO aUrlDTO, final Document aDocu
172171
@Override
173172
protected AbstractUrlTask<DatenFilm, SrTopicUrlDTO> createNewOwnInstance(
174173
final ConcurrentLinkedQueue<SrTopicUrlDTO> aURLsToCrawl) {
175-
return new SrFilmDetailTask(crawler, aURLsToCrawl);
174+
return new SrFilmDetailTask(crawler, aURLsToCrawl, baseUrl);
176175
}
177176

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

200199
String url = videoDetailUrl.get();
201200
url = addMissingProtocol(url);
201+
url = UrlUtils.addDomainIfMissing(url, baseUrl);
202202

203203
try {
204204
final ArdVideoInfoDto dto

0 commit comments

Comments
 (0)