Skip to content

Commit 758f93a

Browse files
committed
zdf: fix ClassCastException if contentOwner missing
phoenix: optimization: filter noVideo entries ard: add url to log
2 parents 4b089e4 + ce0586b commit 758f93a

4 files changed

Lines changed: 8 additions & 5 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.260'
30+
version = '3.1.261'
3131

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

src/main/java/mServer/crawler/sender/ard/tasks/ArdFilmDetailTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected void processRestTarget(ArdFilmInfoDto aDTO, WebTarget aTarget) {
5656
}
5757
} catch (Exception e) {
5858
LOG.error("exception: " + aDTO.getUrl(), e);
59-
Log.errorLog(453455465, e);
59+
Log.errorLog(453455465, e, aDTO.getUrl());
6060
}
6161
}
6262

src/main/java/mServer/crawler/sender/phoenix/parser/PhoenixSendungOverviewDeserializer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ private static Set<String> parseItems(final JsonObject aContentObject) {
6767
for (final JsonElement itemElement : itemArray) {
6868

6969
final Optional<String> htmlUrl = JsonUtils.getAttributeAsString(itemElement.getAsJsonObject(), ATTRIBUTE_LINK);
70-
if (htmlUrl.isPresent() && !htmlUrl.get().isEmpty()) {
70+
final Optional<String> hasVideo = JsonUtils.getElementValueAsString(itemElement, "inhalt_video");
71+
if (htmlUrl.isPresent() && !htmlUrl.get().isEmpty() && (hasVideo.orElse("true").equalsIgnoreCase("true"))) {
7172
items.add(extractIdFromHtmlUrl(htmlUrl.get()));
7273
}
7374
}

src/main/java/mServer/crawler/sender/zdf/json/ZdfPubFormDeserializer.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ public ZdfPubFormResult deserialize(
2525

2626
for (JsonElement element : nodes) {
2727
JsonObject node = element.getAsJsonObject();
28-
final Optional<String> sender =
29-
JsonUtils.getElementValueAsString(node.getAsJsonObject("contentOwner"), "title");
28+
Optional<String> sender = Optional.empty();
29+
if (!node.get("contentOwner").isJsonNull()) {
30+
sender = JsonUtils.getElementValueAsString(node.getAsJsonObject("contentOwner"), "title");
31+
}
3032
final Optional<String> topic = JsonUtils.getElementValueAsString(node, "title");
3133
final Optional<String> countSeasons = JsonUtils.getElementValueAsString(node, "countSeasons");
3234
if (ZdfConstants.PARTNER_TO_SENDER.containsKey(sender.orElse("ZDF"))) {

0 commit comments

Comments
 (0)