Skip to content

Commit

Permalink
BR: migrate to ARD crawler
Browse files Browse the repository at this point in the history
ARD: update topics search depth
  • Loading branch information
alex1702 committed Sep 28, 2023
2 parents 0eead7b + b2bd65d commit 9879f60
Show file tree
Hide file tree
Showing 25 changed files with 21 additions and 1,326 deletions.
2 changes: 1 addition & 1 deletion build.gradle
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.220'
version = '3.1.221'

def jarName = 'MServer.jar'
def mainClass = 'mServer.Main'
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/mServer/crawler/FilmeSuchen.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import mServer.crawler.sender.*;
import mServer.crawler.sender.ard.ArdCrawler;
import mServer.crawler.sender.arte.MediathekArte;
import mServer.crawler.sender.br.BrCrawler;
import mServer.crawler.sender.dreisat.DreiSatCrawler;
import mServer.crawler.sender.dw.DwCrawler;
import mServer.crawler.sender.funk.FunkCrawler;
Expand Down Expand Up @@ -81,7 +80,6 @@ public FilmeSuchen() {
mediathekListe.add(new FunkCrawler(this, 0));
// Spalte 2
mediathekListe.add(new SrCrawler(this, 1));
mediathekListe.add(new BrCrawler(this, 0));
mediathekListe.add(new SrfCrawler(this, 1));
mediathekListe.add(new MediathekSrfPod(this, 1));
mediathekListe.add(new OrfCrawler(this, 1));
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/mServer/crawler/sender/ard/ArdCrawler.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ protected synchronized void meldungThreadUndFertig() {
mlibFilmeSuchen.meldenFertig(Const.NDR);
mlibFilmeSuchen.meldenFertig(Const.WDR);
mlibFilmeSuchen.meldenFertig(Const.HR);
mlibFilmeSuchen.meldenFertig(Const.BR);
mlibFilmeSuchen.meldenFertig("rbtv");
}

Expand Down Expand Up @@ -74,9 +75,6 @@ private void addDayUrls(ConcurrentLinkedQueue<CrawlerUrlDTO> dayUrlsToCrawl, Loc
private void addSpecialDays(
ConcurrentLinkedQueue<CrawlerUrlDTO> dayUrlsToCrawl) {
final LocalDateTime[] specialDates = new LocalDateTime[] {
LocalDateTime.of(2021, 2, 7, 23, 59, 59),
LocalDateTime.of(2021, 2, 8, 23, 59, 59),
LocalDateTime.of(2021, 2, 9, 23, 59, 59)
};

final LocalDateTime minDayOnline = LocalDateTime.now().minusDays(MAX_DAYS_PAST_AVAILABLE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public class ArdFilmDeserializer implements JsonDeserializer<List<ArdFilmDto>> {
ADDITIONAL_SENDER.put("ndr", Const.NDR);
ADDITIONAL_SENDER.put("wdr", Const.WDR);
ADDITIONAL_SENDER.put("hr", Const.HR);
ADDITIONAL_SENDER.put("br", Const.BR);
ADDITIONAL_SENDER.put("radio_bremen", "rbtv");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ public class ArdTopicPageTask extends ArdTaskBase<ArdFilmInfoDto, CrawlerUrlDTO>
TOPICS_LOAD_ALL_PAGES.add("Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhdG9ydA");
// Filme im Ersten
TOPICS_LOAD_ALL_PAGES.add("Y3JpZDovL2Rhc2Vyc3RlLmRlL2Zlcm5zZWhmaWxtZSBpbSBlcnN0ZW4");
// temporary load all => remove if old entries exists
// Unter unserem Himmel
TOPICS_LOAD_ALL_PAGES.add("Y3JpZDovL2JyLmRlL2Jyb2FkY2FzdFNlcmllcy9icm9hZGNhc3RTZXJpZXM6L2JyZGUvZmVybnNlaGVuL2JheWVyaXNjaGVzLWZlcm5zZWhlbi9zZW5kdW5nZW4vdW50ZXItdW5zZXJlbS1oaW1tZWw");
// in aller freundschaft die jungen ärzte
TOPICS_LOAD_ALL_PAGES.add("Y3JpZDovL2Rhc2Vyc3RlLmRlL2luLWFsbGVyLWZyZXVuZHNjaGFmdC1kaWUtanVuZ2VuLWFlcnp0ZQ");
// Sportschau
TOPICS_LOAD_ALL_PAGES.add("Y3JpZDovL2Rhc2Vyc3RlLmRlL3Nwb3J0c2NoYXU");
// temporary load all => remove if old entries exists
// Morden im Norden
TOPICS_LOAD_ALL_PAGES.add("Y3JpZDovL2Rhc2Vyc3RlLmRlL21vcmRlbi1pbS1ub3JkZW4");
// Babylon Berlin
TOPICS_LOAD_ALL_PAGES.add("Y3JpZDovL2Rhc2Vyc3RlLmRlL2JhYnlsb24tYmVybGlu");
// Watzmann ermittelt
TOPICS_LOAD_ALL_PAGES.add("Y3JpZDovL2Rhc2Vyc3RlLmRlL3dhdHptYW5uLWVybWl0dGVsdA");
}

public ArdTopicPageTask(MediathekReader aCrawler,
Expand Down
78 changes: 0 additions & 78 deletions src/main/java/mServer/crawler/sender/br/BrAllSendungenTask.java

This file was deleted.

72 changes: 0 additions & 72 deletions src/main/java/mServer/crawler/sender/br/BrCrawler.java

This file was deleted.

Loading

0 comments on commit 9879f60

Please sign in to comment.