Skip to content

Commit 94be6d1

Browse files
committed
clean title for UT,AD
1 parent 1ba399b commit 94be6d1

File tree

1 file changed

+11
-24
lines changed

1 file changed

+11
-24
lines changed

src/main/java/de/mediathekview/mserver/crawler/ard/json/ArdFilmDeserializer.java

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ public List<ArdFilmDto> deserialize(
185185
return films;
186186
}
187187

188-
189188
// add film to ARD
190189
final ArdFilmDto filmDto =
191190
new ArdFilmDto(
@@ -223,31 +222,19 @@ private Optional<Map<Resolution, String>> fallbackToM3U(Optional<ArdVideoInfoDto
223222
}
224223

225224
private Optional<String> parseTitle(final JsonObject playerPageObject) {
226-
final Optional<String> title =
227-
JsonUtils.getAttributeAsString(playerPageObject, ATTRIBUTE_TITLE);
228-
return title.map(nonNullTitle -> nonNullTitle.replace("Hörfassung", "Audiodeskription"));
229-
}
230-
231-
/*
232-
private Sender determinePartner(JsonObject playerPageObject) {
233-
final Optional<String> partner = parsePartner(playerPageObject);
234-
// If partner is present and an existing sender set it. Like for RBB
235-
Sender partnerSender = null;
236-
if (partner.isPresent()) {
237-
partnerSender = ArdConstants.PARTNER_TO_SENDER.get(partner.get());
238-
if (partnerSender != null) {
239-
return partnerSender;
240-
} else {
241-
partnerSender = Sender.ARD;
242-
LOG.info("unkown partner {}", partner.get() );
225+
Optional<String> title = JsonUtils.getAttributeAsString(playerPageObject, ATTRIBUTE_TITLE);
226+
if (title.isPresent()) {
227+
String[] replaceWords = {" - Hörfassung", " (mit Gebärdensprache)", " mit Gebärdensprache"," (mit Audiodeskription)", "Audiodeskription"};
228+
String cleanTitle = title.get().trim();
229+
for (String replaceWord : replaceWords) {
230+
cleanTitle = cleanTitle.replace(replaceWord, "");
243231
}
244-
} else {
245-
partnerSender = Sender.ARD;
246-
LOG.info("missing partner {}", playerPageObject);
232+
cleanTitle = cleanTitle.trim();
233+
return Optional.of(cleanTitle);
247234
}
248-
return partnerSender;
249-
250-
} */
235+
return title;
236+
}
237+
251238

252239
private Optional<String> parsePartner(final JsonObject playerPageObject) {
253240
if (playerPageObject.has(ELEMENT_PUBLICATION_SERVICE)) {

0 commit comments

Comments
 (0)