Version auf 3.1.13 angehoben.

mediathekview · Jul 24, 2017 · 0b10bb6 · 0b10bb6
2 parents 935084d + 943ce54
commit 0b10bb6
Show file tree

Hide file tree

Showing 4 changed files with 3 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.1.12'
+version = '3.1.13'
 
 def jarName = 'MServer.jar'
 def mainClass = 'mServer.Main'

diff --git a/src/main/java/mServer/crawler/sender/arte/ArteVideoDetailsDeserializer.java b/src/main/java/mServer/crawler/sender/arte/ArteVideoDetailsDeserializer.java
@@ -80,7 +80,7 @@ private GeoLocations getGeoLocation(JsonObject programElement) {
                             geo = GeoLocations.GEO_DE_FR;
                             break;
                         case "SAT":
-                            geo = GeoLocations.GEO_EU;
+                            geo = GeoLocations.GEO_DE_AT_CH_EU;
                             break;
                         case "ALL":
                             geo = GeoLocations.GEO_NONE;

diff --git a/src/main/java/mServer/crawler/sender/newsearch/GeoLocations.java b/src/main/java/mServer/crawler/sender/newsearch/GeoLocations.java
@@ -10,7 +10,6 @@ public enum GeoLocations
     GEO_DE_FR("DE-FR"),
     GEO_AT("AT"),
     GEO_CH("CH"),
-    GEO_EU("EU"),
     GEO_WELT("WELT"),
     GEO_DE_AT_CH("DE-AT-CH"),
     GEO_DE_AT_CH_EU("DE-AT-CH-EU");

diff --git a/src/test/developTest/java/mServer/crawler/sender/arte/ArteVideoDetailsDeserializerTest.java b/src/test/developTest/java/mServer/crawler/sender/arte/ArteVideoDetailsDeserializerTest.java
@@ -21,7 +21,7 @@ public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][] {   
             { "/arte/arte_video_details_first_several_minors_geo_defr.json", "2017-07-10T18:15:00Z", GeoLocations.GEO_DE_FR },
             { "/arte/arte_video_details_several_majors_minors_geo_null.json", "2017-08-01T16:25:00Z", GeoLocations.GEO_NONE },
-            { "/arte/arte_video_details_first_with_catchuprights_past_geo_sat.json", "2017-05-22T11:36:00Z", GeoLocations.GEO_EU },
+            { "/arte/arte_video_details_first_with_catchuprights_past_geo_sat.json", "2017-05-22T11:36:00Z", GeoLocations.GEO_DE_AT_CH_EU },
             { "/arte/arte_video_details_first_without_catchuprights_geo_eudefr.json", "2017-07-16T23:30:00Z", GeoLocations.GEO_DE_FR },
             { "/arte/arte_video_details_no_broadcastprogrammings_geo_all.json", "2017-06-30T13:00:00Z", GeoLocations.GEO_NONE },
         });