Skip to content

ard: parse geo blocking #1138

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 1 commit into from
Apr 15, 2026
Merged

ard: parse geo blocking #1138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 29 additions & 6 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 @@ -51,7 +51,7 @@ public class ArdFilmDeserializer implements JsonDeserializer<List<ArdFilmDto>> {
private static final String ELEMENT_SHOW = "show";
private static final String ELEMENT_TEASERS = "teasers";
private static final String ELEMENT_WIDGETS = "widgets";
private static final String[] ELEMENT_SUBTITLES = {"mediaCollection","embedded","subtitles"};
private static final String[] ELEMENT_SUBTITLES = {ELEMENT_MEDIA_COLLECTION,ELEMENT_EMBEDDED,"subtitles"};
private static final String ELEMENT_SOURCES = "sources";
private static final String ELEMENT_STREAMS = "streams";
private static final String ELEMENT_MEDIA = "media";
Expand All @@ -71,6 +71,7 @@ public class ArdFilmDeserializer implements JsonDeserializer<List<ArdFilmDto>> {
private static final String ATTRIBUTE_MIME = "mimeType";
private static final String ATTRIBUTE_KIND = "kind";
private static final String ATTRIBUTE_ADUIO_LANG = "languageCode";
private static final String ATTRIBUTE_GEO_BLOCKED = "isGeoBlocked";

private static final String MARKER_VIDEO_MP4 = "video/mp4";
private static final String MARKER_VIDEO_STANDARD = "standard";
Expand Down Expand Up @@ -229,6 +230,7 @@ public List<ArdFilmDto> deserialize(
final Optional<LocalDateTime> date = parseDate(itemObject);
final Optional<Duration> duration = parseDuration(itemObject);
final Optional<String> partner = parsePartner(itemObject);
final Optional<Boolean> geoBlocked = parseGeoBlocked(itemObject);
Optional<Map<Qualities, String>> videoInfoStandard = parseVideoUrls(itemObject, MARKER_VIDEO_CATEGORY_MAIN, MARKER_VIDEO_STANDARD, MARKER_VIDEO_MP4, MARKER_VIDEO_DE);
Optional<Map<Qualities, String>> videoInfoAdaptive = parseVideoUrls(itemObject, MARKER_VIDEO_CATEGORY_MAIN, MARKER_VIDEO_STANDARD, MARKER_VIDEO_CATEGORY_MPEG, MARKER_VIDEO_DE);
Optional<Map<Qualities, String>> videoInfoAD = parseVideoUrls(itemObject, MARKER_VIDEO_CATEGORY_MAIN, MARKER_VIDEO_AD, MARKER_VIDEO_MP4, MARKER_VIDEO_DE);
Expand Down Expand Up @@ -276,7 +278,8 @@ public List<ArdFilmDto> deserialize(
date,
duration,
videoInfoStandard.get(),
subtitles));
subtitles,
geoBlocked.orElse(false)));
films.add(filmDto);
if (widgets.size() > 1) {
parseRelatedFilms(filmDto, widgets.get(1).getAsJsonObject());
Expand All @@ -295,7 +298,8 @@ public List<ArdFilmDto> deserialize(
date,
duration,
vid,
subtitles));
subtitles,
geoBlocked.orElse(false)));
films.add(filmDto);
}
//
Expand All @@ -311,7 +315,8 @@ public List<ArdFilmDto> deserialize(
date,
duration,
videoInfoAD.get(),
subtitles));
subtitles,
geoBlocked.orElse(false)));
films.add(filmDto);
}
//
Expand All @@ -327,13 +332,27 @@ public List<ArdFilmDto> deserialize(
date,
duration,
videoInfoDGS.get(),
subtitles));
subtitles,
geoBlocked.orElse(false)));
films.add(filmDto);
}

return films;
}

private Optional<Boolean> parseGeoBlocked(final JsonObject playerPageObject) {
final Optional<JsonObject> mediaCollectionObject = getMediaCollectionObject(playerPageObject);
if (mediaCollectionObject.isEmpty()) {
return Optional.empty();
}
final Optional<JsonElement> geoBlockedElement =
JsonUtils.getElement(mediaCollectionObject.get(), ATTRIBUTE_GEO_BLOCKED);
if (geoBlockedElement.isPresent() && geoBlockedElement.get().isJsonPrimitive()) {
return Optional.of(geoBlockedElement.get().getAsBoolean());
}
return Optional.empty();
}

private Optional<String> parsePartner(JsonObject playerPageObject) {
if (playerPageObject.has(ELEMENT_PUBLICATION_SERVICE)) {
JsonObject publicationServiceObject
Expand Down Expand Up @@ -379,7 +398,8 @@ private DatenFilm createFilm(
final Optional<LocalDateTime> date,
final Optional<Duration> duration,
final Map<Qualities, String> videoUrls,
final Optional<String> sub) {
final Optional<String> sub,
final boolean geoBlocking) {

LocalDateTime time = date.orElse(LocalDateTime.now());

Expand All @@ -397,6 +417,9 @@ private DatenFilm createFilm(
if (sub.isPresent()) {
CrawlerTool.addUrlSubtitle(film, sub.get());
}
if (geoBlocking) {
film.arr[DatenFilm.FILM_GEO] = DatenFilm.GEO_DE;
}

return film;
}
Expand Down
Loading