Merge branch 'release/3.1.0'

hinzugefuegt: GZIP für ZDF-Crawler closed #139
mediathekview · May 5, 2017 · 2fcb0dd · 2fcb0dd
2 parents a423e47 + 9c70f44
commit 2fcb0dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 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.11'
+version = '3.1.0'
 
 def jarName = 'MServer.jar'
 def mainClass = 'mServer.Main'

diff --git a/src/main/java/mServer/crawler/sender/newsearch/ZDFClient.java b/src/main/java/mServer/crawler/sender/newsearch/ZDFClient.java
@@ -8,6 +8,7 @@
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter;
 
 import de.mediathekview.mlib.Const;
 import de.mediathekview.mlib.tool.Log;
@@ -53,6 +54,7 @@ public class ZDFClient {
 
     public ZDFClient() {
         client = Client.create();
+        client.addFilter(new GZIPContentEncodingFilter(true));
         gson = new Gson();
     }
 
@@ -124,12 +126,11 @@ private String loadApiTokenVideos() {
     private JsonObject handleOk(ClientResponse response) {
         increment(RunSender.Count.ANZAHL);
 
-        String jsonOutput = response.getEntity(String.class);
-
-        long bytes = jsonOutput.length();
+        long bytes = response.getLength();
         increment(RunSender.Count.SUM_DATA_BYTE, bytes);
         increment(RunSender.Count.SUM_TRAFFIC_BYTE, bytes);
 
+        String jsonOutput = response.getEntity(String.class);
         return gson.fromJson(jsonOutput, JsonObject.class);
     }