Merge branch 'release/2.0.0'

mediathekview · Nov 14, 2016 · ce04fb2 · ce04fb2
2 parents b91983f + 7f9cd0a
commit ce04fb2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 64 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ apply from: "${project.rootDir}/gradle/eclipse.gradle"
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 mainClassName = 'mSearch.Main'
-version = '13'
+version = '2.0.0'
 
 compileJava {
     options.encoding = "UTF-8"
@@ -17,57 +17,6 @@ compileTestJava {
     options.compilerArgs = ['-Xlint:all']
 }
 
-ext {
-    propsFile = file('src/main/resources/version.properties').absoluteFile
-}
-
-def loadVersionProperties() {
-    Properties props = new Properties()
-    props.load(propsFile.newDataInputStream())
-    return props
-}
-
-task updateVersion << {
-    Properties props = loadVersionProperties()
-    int nr = Integer.parseInt(props.getProperty('NR')) + 1
-    String buildDate = new Date().format('dd.MM.yyyy HH:mm:ss')
-
-	logger.lifecycle "==msearch======================"
-	logger.lifecycle "Version: $version"
-	logger.lifecycle "Nr-nach: $nr"
-	logger.lifecycle "Date:    $buildDate"
-	logger.lifecycle "==msearch======================"
-
-	props.setProperty('VERSION', project.version)
-	props.setProperty('NR', "$nr")
-	props.setProperty('BUILD', "${project.version}-${nr}")
-	props.setProperty('DATE', buildDate)
-
-	props.store(propsFile.newWriter(), null)
-}
-
-processResources.dependsOn updateVersion
-
-task renameAndFillBuildFile(dependsOn: updateVersion) << {
-	Properties props = loadVersionProperties()
-
-	String nr = props.getProperty('NR')
-	String buildInfo = "${project.version}-$nr"
-	File buildFile = file("res/info/${buildInfo}.build").absoluteFile
-    String date = new Date().format('dd.MM.yyyy HH:mm:ss')
-    logger.lifecycle "Writing build info to $buildFile"
-
-    project.delete(fileTree('res/info') {
-      include '*.build'
-    })
-
-    def buildFileWriter = buildFile.newWriter() 
-	buildFileWriter << "Datum: ${date}\n"
-	buildFileWriter << "MSearch Buildnummer: ${buildInfo}\n"
-	buildFileWriter.close()
-}
-
-processResources.dependsOn renameAndFillBuildFile
 
 task copyRuntimeLibs(type: Copy) {
     into "libs"
@@ -89,7 +38,7 @@ dependencies {
 
 distributions {
     main {
-        baseName = 'MSearch_'+new Date().format('dd.MM.yyyy')
+        baseName = 'MSearch'
         contents {
             from{'res'}
         }

diff --git a/res/info/13-1198.build b/res/info/13-1198.build
diff --git a/src/main/java/mSearch/daten/DatenFilm.java b/src/main/java/mSearch/daten/DatenFilm.java
@@ -229,14 +229,16 @@ public void setGeo() {
             case MediathekZdfTivi.SENDERNAME:
             case Mediathek3Sat.SENDERNAME:
                 if (arr[DatenFilm.FILM_URL].startsWith("http://nrodl.zdf.de/de/")
-                        || arr[DatenFilm.FILM_URL].startsWith("http://rodl.zdf.de/de/")) {
+                        || arr[DatenFilm.FILM_URL].startsWith("http://rodl.zdf.de/de/")
+                        || arr[DatenFilm.FILM_URL].startsWith("https://nrodlzdf-a.akamaihd.net/de/")) {
                     arr[DatenFilm.FILM_GEO] = GEO_DE;
                 } else if (arr[DatenFilm.FILM_URL].startsWith("http://nrodl.zdf.de/dach/")
                         || arr[DatenFilm.FILM_URL].startsWith("http://rodl.zdf.de/dach/")
                         || arr[DatenFilm.FILM_URL].startsWith("https://nrodlzdf-a.akamaihd.net/dach")) {
                     arr[DatenFilm.FILM_GEO] = GEO_DE + "-" + GEO_AT + "-" + GEO_CH;
                 } else if (arr[DatenFilm.FILM_URL].startsWith("http://nrodl.zdf.de/ebu/")
-                        || arr[DatenFilm.FILM_URL].startsWith("http://rodl.zdf.de/ebu/")) {
+                        || arr[DatenFilm.FILM_URL].startsWith("http://rodl.zdf.de/ebu/")
+                        || arr[DatenFilm.FILM_URL].startsWith("https://nrodlzdf-a.akamaihd.net/ebu/")) {
                     arr[DatenFilm.FILM_GEO] = GEO_DE + "-" + GEO_AT + "-" + GEO_CH + "-" + GEO_EU;
                 }
                 break;

diff --git a/src/main/java/mSearch/filmeSuchen/sender/MediathekZdf.java b/src/main/java/mSearch/filmeSuchen/sender/MediathekZdf.java
@@ -138,8 +138,6 @@ private void addFilmePage(String url) {
                 if (thema.contains("|")) {
                     thema = thema.substring(thema.indexOf("|") + 1).trim();
                     //thema = thema.substring(0, thema.indexOf("|")).trim();
-                } else {
-                    titel = thema;
                 }
                 String dauer = seite1.extract("<dd class=\"video-duration defdesc m-border\">", "<");
                 dauer = dauer.replace("min", "").trim();
@@ -302,6 +300,12 @@ private String convertTime(String zeit) {
     public static void urlTauschen(DatenFilm film, String urlSeite, FilmeSuchen mSFilmeSuchen) {
         // manuell die Auflösung hochsetzen
         changeUrl("1456k_p13v11.mp4", "2256k_p14v11.mp4", film, urlSeite, mSFilmeSuchen);
+        changeUrl("1496k_p13v13.mp4", "2328k_p35v13.mp4", film, urlSeite, mSFilmeSuchen);
+
+        changeUrl("2256k_p14v12.mp4", "2328k_p35v12.mp4", film, urlSeite, mSFilmeSuchen);
+
+        changeUrl("1456k_p13v12.mp4", "2328k_p35v12.mp4", film, urlSeite, mSFilmeSuchen);
+        //wenns nicht geht, dann vielleicht so
         changeUrl("1456k_p13v12.mp4", "2256k_p14v12.mp4", film, urlSeite, mSFilmeSuchen);
 
         // manuell die Auflösung für HD setzen

diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties