Skip to content

ARD: own sender for ONE, ARDalpha and tagesschau24 #1046

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
May 16, 2025
Merged

ARD: own sender for ONE, ARDalpha and tagesschau24 #1046

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
e548df8
tagesschau24 als eigener Sender
pidoubleyou Mar 10, 2025
28eb691
tagesschau24 als eigener Sender
pidoubleyou Apr 27, 2025
7fcb64d
add todo
pidoubleyou May 16, 2025
762641e
add test for one entries
pidoubleyou May 16, 2025
c3a28f0
remove todo
pidoubleyou May 16, 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
10 changes: 10 additions & 0 deletions src/main/java/mServer/crawler/AddToFilmlist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ private void performInitialCleanup() {
updateAudioDescriptionSrf(listeEinsortieren);
updateTitle(listeEinsortieren);
updateArdWebsite(listeEinsortieren);
updateSenderTagesschau24(listeEinsortieren);
updateFunkMissingHost(listeEinsortieren);
removeSrfUrlParameter(listeEinsortieren);
}
Expand Down Expand Up @@ -196,6 +197,15 @@ private void updateArdWebsite(ListeFilme listeEinsortieren) {
list.forEach(film -> film.arr[DatenFilm.FILM_WEBSEITE] = film.arr[DatenFilm.FILM_WEBSEITE].replace("/ard/player/", "/video/").trim());
}

private void updateSenderTagesschau24(ListeFilme listeEinsortieren) {
final List<String> whiteListTagesschau24 = Arrays.stream(new String[] { "Ulrich Timm im Gespräch", "tagesschau in Einfacher Sprache", "tagesschau in 100 Sekunden", "tagesschau24" }).toList();
final List<DatenFilm> list = listeEinsortieren.parallelStream()
.filter(film -> film.arr[DatenFilm.FILM_SENDER].equals(Const.ARD) && whiteListTagesschau24.contains(film.arr[DatenFilm.FILM_THEMA]))
.collect(Collectors.toList());
Log.sysLog("ARD: set sender tagesschau24 für " + list.size() + " Einträge.");

list.forEach(film -> film.arr[DatenFilm.FILM_SENDER] = Const.TAGESSCHAU24);
}

private void updateAudioDescriptionOrf(ListeFilme listeEinsortieren) {
final List<DatenFilm> list = listeEinsortieren.parallelStream()
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/mServer/crawler/sender/ard/ArdCrawler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ protected synchronized void meldungThreadUndFertig() {
mlibFilmeSuchen.meldenFertig(Const.WDR);
mlibFilmeSuchen.meldenFertig(Const.HR);
mlibFilmeSuchen.meldenFertig(Const.BR);
mlibFilmeSuchen.meldenFertig("rbtv");
mlibFilmeSuchen.meldenFertig("ONE");
mlibFilmeSuchen.meldenFertig("ARD-alpha");
mlibFilmeSuchen.meldenFertig(Const.RBTV);
mlibFilmeSuchen.meldenFertig(Const.ONE);
mlibFilmeSuchen.meldenFertig(Const.ARD_ALPHA);
mlibFilmeSuchen.meldenFertig("Funk.net");
mlibFilmeSuchen.meldenFertig(Const.TAGESSCHAU24);
mlibFilmeSuchen.meldenFertig(Const.SR);
mlibFilmeSuchen.meldenFertig(Const.PHOENIX);
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/mServer/crawler/sender/ard/json/ArdFilmDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ public class ArdFilmDeserializer implements JsonDeserializer<List<ArdFilmDto>> {
ADDITIONAL_SENDER.put("wdr", Const.WDR);
ADDITIONAL_SENDER.put("hr", Const.HR);
ADDITIONAL_SENDER.put("br", Const.BR);
ADDITIONAL_SENDER.put("radio_bremen", "rbtv");
ADDITIONAL_SENDER.put("tagesschau24", Const.ARD);
ADDITIONAL_SENDER.put("radio_bremen", Const.RBTV);
ADDITIONAL_SENDER.put("tagesschau24", Const.TAGESSCHAU24);
ADDITIONAL_SENDER.put("das_erste", Const.ARD);
ADDITIONAL_SENDER.put("one", Const.ARD); // ONE
ADDITIONAL_SENDER.put("ard-alpha", Const.ARD); // ARD-alpha
ADDITIONAL_SENDER.put("one", Const.ONE); // ONE
ADDITIONAL_SENDER.put("ard-alpha", Const.ARD_ALPHA); // ARD-alpha
ADDITIONAL_SENDER.put("funk", "Funk.net"); // Funk.net
ADDITIONAL_SENDER.put("sr", Const.SR);
ADDITIONAL_SENDER.put("phoenix", Const.PHOENIX);
Expand Down
47 changes: 47 additions & 0 deletions src/test/developTest/java/mServer/crawler/AddToFilmlistTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,53 @@ public void testArdEntriesOfZdfArteKikaRemoved() {
assertFalse(list.contains(testFilmZdf));
}

@Test
public void testArdEntriesNotAddedIfOneEntryExists() {
final DatenFilm testFilmOne = createTestFilm(Const.ARD, "one topic", "one title", FILM_NAME_ONLINE);
final DatenFilm testFilmArdOk = createTestFilm(Const.ARD, "ardtopic", "ard title", FILM_NAME_ONLINE2);
listToAdd.add(testFilmOne);
listToAdd.add(testFilmArdOk);
list.add(createTestFilm(Const.ONE, "one topic", "one title", FILM_NAME_ONLINE));

AddToFilmlist target =new AddToFilmlist(list, listToAdd);
target.addOldList();

assertEquals(list.size(),4);
assertFalse(list.contains(testFilmOne));
assertTrue(list.contains(testFilmArdOk));
assertEquals(Const.ARD, testFilmArdOk.arr[DatenFilm.FILM_SENDER]);
}

@Test
public void testArdTagesschau24EntriesNotAdded() {
final DatenFilm testFilmArd24 = createTestFilm(Const.ARD, "tagesschau24", "film title", FILM_NAME_ONLINE);
final DatenFilm testFilmArdOk = createTestFilm(Const.ARD, "tagesschau", "film title", FILM_NAME_ONLINE2);
listToAdd.add(testFilmArd24);
listToAdd.add(testFilmArdOk);
list.add(createTestFilm(Const.TAGESSCHAU24, "tagesschau24", "film title", FILM_NAME_ONLINE));

AddToFilmlist target =new AddToFilmlist(list, listToAdd);
target.addOldList();

assertEquals(list.size(),4);
assertFalse(list.contains(testFilmArd24));
assertTrue(list.contains(testFilmArdOk));
assertEquals(Const.ARD, testFilmArdOk.arr[DatenFilm.FILM_SENDER]);
}

@Test
public void testArdTagesschau24UpdateSender() {
final DatenFilm testFilmArd24 = createTestFilm(Const.ARD, "tagesschau24", "film title", FILM_NAME_ONLINE);
listToAdd.add(testFilmArd24);

AddToFilmlist target =new AddToFilmlist(list, listToAdd);
target.addOldList();

assertEquals(list.size(),3);
assertTrue(list.contains(testFilmArd24));
assertEquals(Const.TAGESSCHAU24, testFilmArd24.arr[DatenFilm.FILM_SENDER]);
}

private static DatenFilm createTestFilm(String sender, String topic, String title,
String filmUrl) {
DatenFilm film = new DatenFilm(sender, topic, "url", title, baseUrl + filmUrl, "", "", "", 12,
Expand Down
Loading