Skip to content

ORF - more sources for (AT) urls #1124

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

Open
codingPF wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ORF - more sources for (AT) urls #1124

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
44 changes: 39 additions & 5 deletions src/main/java/mServer/crawler/sender/orfon/json/OrfOnEpisodeDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,17 @@ public OrfOnVideoInfoDTO deserialize(
private Optional<Map<Qualities, String>> optimizeUrls(Optional<Map<Qualities, String>> urls) {
if (urls.isPresent() && urls.get().size() == 1) {
final Map<Qualities, String> urlMap = urls.get();
final String urlToOptimize = urlMap.get(Qualities.NORMAL);
urlMap.put(Qualities.SMALL, urlToOptimize.replace("QXA", "Q4A"));
urlMap.put(Qualities.NORMAL, urlToOptimize.replace("QXA", "Q6A"));
urlMap.put(Qualities.HD, urlToOptimize.replace("QXA", "Q8C"));
String urlToOptimize = urlMap.get(Qualities.NORMAL);
for (String s : List.of("QXA","QXB")) {
urlToOptimize = urlToOptimize.replace(s, "#Q#");
}
urlMap.put(Qualities.SMALL, urlToOptimize.replace("#Q#", "Q4A"));
urlMap.put(Qualities.NORMAL, urlToOptimize.replace("#Q#", "Q6A"));
urlMap.put(Qualities.HD, urlToOptimize.replace("#Q#", "Q8C"));
}
return urls;
}


private Optional<String> buildOrResolveSubs(JsonElement jsonElement) {
Optional<String> subtitleSource = JsonUtils.getElementValueAsString(jsonElement, TAG_SUBTITLE);
Expand Down Expand Up @@ -185,7 +189,15 @@ private Optional<Map<Qualities, String>> parseVideoFromSources(JsonElement root)
}
}
}
return parseVideoFromThumbnail(root);
Optional<Map<Qualities, String>> fallbackThumbnail = parseVideoFromThumbnail(root);
if (fallbackThumbnail.isPresent()) {
return fallbackThumbnail;
}
Optional<Map<Qualities, String>> fallbackGapless = parseVideoFromGapless(root);
if (fallbackGapless.isPresent()) {
return fallbackGapless;
}
return Optional.empty();
}

private Optional<Map<Qualities, String>> parseVideoFromThumbnail(JsonElement root) {
Expand All @@ -212,6 +224,28 @@ private Optional<Map<Qualities, String>> parseVideoFromThumbnail(JsonElement roo
return Optional.of(urls);
}

private Optional<Map<Qualities, String>> parseVideoFromGapless(JsonElement root) {
Map<Qualities, String> urls = new EnumMap<>(Qualities.class);
try {
Optional<JsonElement> gaplessSourceAT = JsonUtils.getElement(root, "gapless_sources_austria", "hls");
if (gaplessSourceAT.isPresent()) {
gaplessSourceAT.get().getAsJsonArray().forEach( e -> {
Optional<String> url = JsonUtils.getElementValueAsString(e, "src");
Optional<String> drm = JsonUtils.getElementValueAsString(e, "is_drm_protected");
if (url.isPresent() && drm.orElse("").equalsIgnoreCase("false")) {
urls.put(Qualities.NORMAL, url.get());
}
});
}
} catch (Exception e) {
LOG.error("generateFallbackVideo {}", e);
}
if (urls.size() == 0) {
return Optional.empty();
}
return Optional.of(urls);
}

private Optional<Map<Qualities, String>> readVideoForTargetCodec(JsonElement urlArray, String targetCodec) {
Map<Qualities, String> urls = new EnumMap<>(Qualities.class);
for (JsonElement videoElement : urlArray.getAsJsonArray()) {
Expand Down