Merge branch 'hotfix/3.0.9'

fixed: ARTE Sendungen werden ausgelassen closed #157
mediathekview · May 2, 2017 · 33684f6 · 33684f6
2 parents 162879d + f5114a0
commit 33684f6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ apply from: "${project.rootDir}/gradle/eclipse.gradle"
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 group = 'de.mediathekview'
-version = '3.0.8'
+version = '3.0.9'
 
 def jarName = 'MServer.jar'
 def mainClass = 'mServer.Main'

diff --git a/src/main/java/mServer/crawler/sender/arte/ArteJsonObjectToDatenFilmCallable.java b/src/main/java/mServer/crawler/sender/arte/ArteJsonObjectToDatenFilmCallable.java
@@ -30,7 +30,7 @@ public class ArteJsonObjectToDatenFilmCallable implements Callable<DatenFilm>
     private static final String JSON_ELEMENT_KEY_SUBTITLE = "subtitle";
     private static final String JSON_ELEMENT_KEY_URL = "url";
     private static final String JSON_ELEMENT_KEY_PROGRAM_ID = "programId";
-    private static final String ARTE_VIDEO_INFORMATION_URL_PATTERN = "https://api.arte.tv/api/player/v1/config/%s/%s";
+    private static final String ARTE_VIDEO_INFORMATION_URL_PATTERN = "https://api.arte.tv/api/player/v1/config/%s/%s?platform=ARTE_NEXT";
     private static final String JSON_ELEMENT_KEY_SHORT_DESCRIPTION = "shortDescription";
     private static final String JSON_ELEMENT_BROADCAST = "broadcastBeginRounded";
 

diff --git a/src/main/java/mServer/crawler/sender/arte/ArteVideoDeserializer.java b/src/main/java/mServer/crawler/sender/arte/ArteVideoDeserializer.java
@@ -28,15 +28,26 @@ public ArteVideoDTO deserialize(JsonElement aJsonElement, Type aType, JsonDeseri
             JsonObject vsrJsonObject = playerObject.get(JSON_OBJECT_KEY_VSR).getAsJsonObject();
             if(vsrJsonObject.has("HTTPS_HQ_1"))//small 640*360
             {
-              arteVideoDTO.addVideo(Qualities.SMALL, vsrJsonObject.get("HTTPS_HQ_1").getAsJsonObject().get("url").getAsString());
+              arteVideoDTO.addVideo(Qualities.SMALL, getVideoUrl(vsrJsonObject, "HTTPS_HQ_1"));
+            } else if(vsrJsonObject.has("HTTPS_MP4_HQ_1")) 
+            {
+                arteVideoDTO.addVideo(Qualities.SMALL, getVideoUrl(vsrJsonObject, "HTTPS_MP4_HQ_1"));
             }
+
             if(vsrJsonObject.has("HTTPS_EQ_1"))//norm 720*406
             {
-                arteVideoDTO.addVideo(Qualities.NORMAL, vsrJsonObject.get("HTTPS_EQ_1").getAsJsonObject().get("url").getAsString());
+                arteVideoDTO.addVideo(Qualities.NORMAL, getVideoUrl(vsrJsonObject, "HTTPS_EQ_1"));
+            } else if(vsrJsonObject.has("HTTPS_MP4_EQ_1")) 
+            {
+                arteVideoDTO.addVideo(Qualities.NORMAL, getVideoUrl(vsrJsonObject, "HTTPS_MP4_EQ_1"));
             }
+
             if(vsrJsonObject.has("HTTPS_SQ_1"))//hd 1280*720
             {
-                arteVideoDTO.addVideo(Qualities.HD, vsrJsonObject.get("HTTPS_SQ_1").getAsJsonObject().get("url").getAsString());
+                arteVideoDTO.addVideo(Qualities.HD, getVideoUrl(vsrJsonObject, "HTTPS_SQ_1"));
+            } else if(vsrJsonObject.has("HTTPS_MP4_SQ_1")) 
+            {
+                arteVideoDTO.addVideo(Qualities.HD, getVideoUrl(vsrJsonObject, "HTTPS_MP4_SQ_1"));
             }
 
             if(!playerObject.get(JSON_ELEMENT_KEY_VIDEO_DURATION_SECONDS).isJsonNull())
@@ -48,4 +59,8 @@ public ArteVideoDTO deserialize(JsonElement aJsonElement, Type aType, JsonDeseri
 
         return arteVideoDTO;
     }
+
+    private static String getVideoUrl(JsonObject vsrJsonObject, String qualityTag) {
+        return vsrJsonObject.get(qualityTag).getAsJsonObject().get("url").getAsString();   
+    }
 }