Quick fix for Ref #27

diff --git a/pom.xml b/pom.xml
index c836afe234cfe78b166ddcf3acb8e3fc1ccd69d0..5c21beb2555a506735b84a06e42017beac3cdd2e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.vanbest.xmltv.tv_grab_nl_java</groupId>
        <artifactId>tv_grab_nl_java</artifactId>
-       <version>1.7.2</version>
+       <version>1.7.3-dev</version>
        <scm>
                <connection>scm:git:git://github.com/janpascal/tv_grab_nl_java.git</connection>
                <developerConnection>scm:git:git://github.com/janpascal/tv_grab_nl_java.git</developerConnection>

diff --git a/src/main/java/org/vanbest/xmltv/Horizon.java b/src/main/java/org/vanbest/xmltv/Horizon.java
index 9937883d2c4276f66a25c3575c69467a95ec6c95..b9aff5ef132470b3c2e824acfcfba11f80df7392 100644 (file)
--- a/src/main/java/org/vanbest/xmltv/Horizon.java
+++ b/src/main/java/org/vanbest/xmltv/Horizon.java
@@ -23,6 +23,8 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
 
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamWriter;
@@ -37,7 +39,8 @@ import net.sf.json.JSONObject;
 
 public class Horizon extends AbstractEPGSource implements EPGSource {
 
-    static String config_url = "https://www.horizon.tv/content/orion-js-app/settings.js?countryhomepage=/content/www-horizon-tv/nl_nl";
+    static String base_url = "https://www.horizon.tv";
+    static String index_url = base_url + "/nl_nl/tv-gids.html";
 
     private String channels_url = null;
     private String listings_url = null;
@@ -55,6 +58,41 @@ public class Horizon extends AbstractEPGSource implements EPGSource {
 
     private void find_urls() {
         URL url = null;
+
+        /*
+        try {
+            url = new URL(index_url);
+        } catch (MalformedURLException e) {
+            logger.error("Exception creating horizon index url", e);
+            return;
+        }
+        String index_html;
+        try {
+            logger.debug("horizon url: " + url.toString());
+            index_html = fetchURL(url);
+        } catch (Exception e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+            return;
+        }
+        logger.debug("horizon index.html: " + index_html);
+
+        //Pattern p = Pattern.compile("/content/orion-js-app/settings.js/content/www-horizon-tv/nl_nl.*\\.js");
+        //Matcher m = p.matcher(index_html);
+        //if (!m.find()) {
+        //    logger.error("Config URL not found in Horizon index.html!");
+        //    return;
+        //}
+        //String config_url = base_url + m.group();
+        */
+
+        String config_url = "https://www.horizon.tv/content/orion-js-app/settings.js/content/www-horizon-tv/nl_nl.1471858095071.js";
+        logger.info("Horizon config URL: " + config_url);
+
+        // Looking for a line like this:
+        //   <script src="/content/orion-js-app/settings.js/content/www-horizon-tv/nl_nl.1471858095071.js"></script> 
+        // Config url should look something like this:
+        //   https://www.horizon.tv/content/orion-js-app/settings.js/content/www-horizon-tv/nl_nl.1471858095071.js
         try {
             url = new URL(config_url);
         } catch (MalformedURLException e) {