Skip to content

Commit 639bda1

Browse files
committed
Merge branch 'bugfix/ard1047' into hotfix/3.1.259
2 parents aa34e6f + 389ecb2 commit 639bda1

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

src/main/java/mServer/crawler/sender/ard/json/ArdFilmDeserializer.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,9 @@ public List<ArdFilmDto> deserialize(
242242
}
243243
return films;
244244
}
245+
boolean subVideoPage = titleoriginal.get().contains(" - (Originalversion)") || titleoriginal.get().contains(" (OV)")
246+
|| titleoriginal.get().contains(" (mit Gebärdensprache)") || titleoriginal.get().contains(" mit Gebärdensprache")
247+
|| titleoriginal.get().contains("- Hörfassung") || titleoriginal.get().contains("(mit Audiodeskription)");
245248
// mainly funk
246249
if (videoInfoStandard.isEmpty() && videoInfoAD.isEmpty() && videoInfoDGS.isEmpty() && videoInfoOV.isEmpty() && videoInfoAdaptive.isPresent()) {
247250
videoInfoStandard = resolveFallbackFromPlaylist(videoInfoAdaptive);
@@ -261,7 +264,7 @@ public List<ArdFilmDto> deserialize(
261264
videoInfoStandard = Optional.empty();
262265
}
263266
//
264-
if (videoInfoStandard.isPresent() && videoInfoStandard.get().size() > 0) {
267+
if (!subVideoPage && videoInfoStandard.isPresent() && videoInfoStandard.get().size() > 0) {
265268
// add film standard
266269
final ArdFilmDto filmDto
267270
= new ArdFilmDto(
@@ -274,10 +277,10 @@ public List<ArdFilmDto> deserialize(
274277
duration,
275278
videoInfoStandard.get(),
276279
subtitles));
280+
films.add(filmDto);
277281
if (widgets.size() > 1) {
278282
parseRelatedFilms(filmDto, widgets.get(1).getAsJsonObject());
279283
}
280-
films.add(filmDto);
281284
}
282285
//
283286
if (videoInfoOV.isPresent() && videoInfoOV.get().size() > 0) {
@@ -309,9 +312,6 @@ public List<ArdFilmDto> deserialize(
309312
duration,
310313
videoInfoAD.get(),
311314
subtitles));
312-
if (widgets.size() > 1) {
313-
parseRelatedFilms(filmDto, widgets.get(1).getAsJsonObject());
314-
}
315315
films.add(filmDto);
316316
}
317317
//
@@ -328,9 +328,6 @@ public List<ArdFilmDto> deserialize(
328328
duration,
329329
videoInfoDGS.get(),
330330
subtitles));
331-
if (widgets.size() > 1) {
332-
parseRelatedFilms(filmDto, widgets.get(1).getAsJsonObject());
333-
}
334331
films.add(filmDto);
335332
}
336333

0 commit comments

Comments
 (0)