Skip to content

Commit 58840d1

Browse files
committed
add all urls to default allocation instead of first found
2 parents 2e4b291 + b4e0ec6 commit 58840d1

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ sourceCompatibility = JavaVersion.VERSION_17
2727
targetCompatibility = JavaVersion.VERSION_17
2828
group = 'de.mediathekview'
2929
archivesBaseName = "MServer"
30-
version = '3.1.255'
30+
version = '3.1.256'
3131

3232
def jarName = 'MServer.jar'
3333
def mainClass = 'mServer.Main'

src/main/java/mServer/crawler/sender/orfon/json/OrfOnEpisodeDeserializer.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,16 @@ private Optional<Map<Qualities, String>> parseVideoFromSources(JsonElement root)
170170
if (codecs.isPresent() && codecs.get().isJsonArray()) {
171171
for (JsonElement singleVideo : codecs.get().getAsJsonArray()) {
172172
Optional<String> tgtUrl = JsonUtils.getElementValueAsString(singleVideo, TAG_VIDEO_FALLBACK_URL);
173-
if (tgtUrl.isPresent() && !tgtUrl.get().contains("/Jugendschutz") && !tgtUrl.get().contains("/no_drm_support") && !tgtUrl.get().contains("/schwarzung")) {
174-
urls.put(Qualities.NORMAL, tgtUrl.get());
175-
return Optional.of(urls);
173+
Optional<String> qualityValue = JsonUtils.getElementValueAsString(singleVideo, "quality_key");
174+
final Optional<Qualities> quality = OrfOnEpisodeDeserializer.getQuality(qualityValue.get());
175+
if (tgtUrl.isPresent() && !tgtUrl.get().contains("/Jugendschutz") && !tgtUrl.get().contains("/no_drm_support") && !tgtUrl.get().contains("/schwarzung") &&
176+
quality.isPresent()) {
177+
urls.put(quality.get(), tgtUrl.get());
176178
}
177179
}
180+
if (!urls.isEmpty()) {
181+
return Optional.of(urls);
182+
}
178183
}
179184
}
180185
}

0 commit comments

Comments
 (0)