Skip to content

Commit 6dfb24a

Browse files
committed
remove todo
1 parent 158193b commit 6dfb24a

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/main/java/de/mediathekview/mserver/crawler/zdf/json/ZdfTopicBaseClass.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616

1717
public class ZdfTopicBaseClass {
1818
private static final String PLACEHOLDER_PLAYER_ID = "{playerId}";
19-
// todo check if this is the correct player id
2019
private static final String PLAYER_ID = "android_native_5";
2120

21+
public static final String ELEMENT_EPISODE_INFO = "episodeInfo";
22+
public static final String ELEMENT_VIDEO = "video";
23+
2224
private static final Logger LOG = LogManager.getLogger(ZdfTopicBaseClass.class);
2325

2426
private static final DateTimeFormatter DATE_FORMATTER_EDITORIAL =
@@ -75,13 +77,13 @@ private Optional<String> parseTitle(final JsonObject episodeObject) {
7577
Optional<String> resultingTitle = formatTitle(title, subtitle);
7678

7779
if (resultingTitle.isPresent()) {
78-
if (episodeObject.has("episodeInfo")) {
80+
if (episodeObject.has(ELEMENT_EPISODE_INFO)) {
7981
final Optional<Integer> season =
8082
JsonUtils.getAttributeAsInt(
81-
episodeObject.getAsJsonObject("episodeInfo"), "seasonNumber");
83+
episodeObject.getAsJsonObject(ELEMENT_EPISODE_INFO), "seasonNumber");
8284
final Optional<Integer> episode =
8385
JsonUtils.getAttributeAsInt(
84-
episodeObject.getAsJsonObject("episodeInfo"), "episodeNumber");
86+
episodeObject.getAsJsonObject(ELEMENT_EPISODE_INFO), "episodeNumber");
8587
final Optional<String> seasonEpisodeTitle = formatEpisodeTitle(season, episode);
8688
return cleanupTitle((resultingTitle.get() + " " + seasonEpisodeTitle.orElse("")).trim());
8789
} else {
@@ -125,8 +127,8 @@ private Optional<String> cleanupTitle(String title) {
125127

126128
private JsonArray getMediaNodes(JsonObject episodeObject) {
127129
JsonObject videoRootObject = episodeObject;
128-
if (episodeObject.has("video") && !episodeObject.get("video").isJsonNull()) {
129-
videoRootObject = episodeObject.getAsJsonObject("video");
130+
if (episodeObject.has(ELEMENT_VIDEO) && !episodeObject.get(ELEMENT_VIDEO).isJsonNull()) {
131+
videoRootObject = episodeObject.getAsJsonObject(ELEMENT_VIDEO);
130132
}
131133
if (!videoRootObject.has("currentMedia")) {
132134
return new JsonArray();
@@ -140,7 +142,7 @@ private Optional<String> parseSender(JsonObject episodeObject) {
140142
return Optional.empty();
141143
}
142144
final Optional<JsonElement> trackingVideoElement =
143-
JsonUtils.getElement(episodeObject, "tracking", "piano", "video");
145+
JsonUtils.getElement(episodeObject, "tracking", "piano", ELEMENT_VIDEO);
144146
if (trackingVideoElement.isEmpty() || trackingVideoElement.get().isJsonNull()) {
145147
return Optional.empty();
146148
}

0 commit comments

Comments
 (0)