Fix ZiggoGids timezone issue, Closes #17

diff --git a/Changelog b/Changelog
index d0bac6bdeef43e81ce775438af78ff9da4807ba3..a9f61f812be9d31594d25544d1bd407e286c4f8e 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,10 @@
 Changelog for tv_grab_nl_java
 =============================
 
+tv_grab_nl_java-1.6.4 (2015-02-22)
+- Ziggo: Fixed timezone issue, which caused all programmes to be off by one
+  hour. Closes #17
+
 tv_grab_nl_java-1.6.3 (2015-02-20)
 - Ziggo: rewritten completely after complete breakage, use JSON interface
 

diff --git a/pom.xml b/pom.xml
index b509884ca356043b27891922cc7bccb1aa5e1478..685afb6dbb842f207d9082b8f5b6ba90ff03d4ab 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,12 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.vanbest.xmltv.tv_grab_nl_java</groupId>
        <artifactId>tv_grab_nl_java</artifactId>
-       <version>1.6.3</version>
+       <version>1.6.4</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>
                <url>scm:git:git://github.com/janpascal/tv_grab_nl_java.git</url>
-         <tag>v1.6.3</tag>
+         <tag>v1.6.4</tag>
   </scm>
        <dependencies>
                <dependency>

diff --git a/src/main/java/org/vanbest/xmltv/ZiggoGids.java b/src/main/java/org/vanbest/xmltv/ZiggoGids.java
index 3de4d5fb83b38ba2d95b806c498e400668e51490..45017215de8d5271eccb248f79a554218f6d963b 100644 (file)
--- a/src/main/java/org/vanbest/xmltv/ZiggoGids.java
+++ b/src/main/java/org/vanbest/xmltv/ZiggoGids.java
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -61,7 +62,7 @@ public class ZiggoGids extends AbstractEPGSource implements EPGSource {
     // IDs, icon base urls, and kijkwijzer IDs
 
        private static final int MAX_PROGRAMMES_PER_DAY = 9999;
-       private static final int MAX_DAYS_AHEAD_SUPPORTED_BY_ZIGGOGIDS = 3;
+       private static final int MAX_DAYS_AHEAD_SUPPORTED_BY_ZIGGOGIDS = 7;
         //private static final int MAX_CHANNELS_PER_REQUEST = 25;
        public final static String NAME="ziggogids.nl";
 
@@ -228,12 +229,15 @@ public class ZiggoGids extends AbstractEPGSource implements EPGSource {
                         result.addUrl(info);
                     }
                 }
+                /*
+                ppe: some kind of pay-per-view
                 if (details.has("ppeUrl")) {
                     String ppe = details.getString("ppeUrl");
                     if (ppe != null && ! ppe.isEmpty()) {
                         logger.debug("    FIXME ppe URL: " + ppe);
                     }
                 }
+                */
         }
         /*
           {
@@ -268,6 +272,11 @@ public class ZiggoGids extends AbstractEPGSource implements EPGSource {
 
                 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss",
                                 new Locale("nl"));
+                //Calendar cal = df.getCalendar();
+                //cal.setTimeZone(TimeZone.getTimeZone("UTC"));
+                //df.setCalendar(cal);
+                df.setTimeZone(TimeZone.getTimeZone("UTC"));
+
                 result.startTime = df.parse(json.getString("startDateTime"));
                 result.endTime = df.parse(json.getString("endDateTime"));
 
@@ -339,9 +348,9 @@ public class ZiggoGids extends AbstractEPGSource implements EPGSource {
                        writer.writeDTD("<!DOCTYPE tv SYSTEM \"xmltv.dtd\">");
                        writer.writeCharacters("\n");
                        writer.writeStartElement("tv");
-                       List<Channel> my_channels = channels;
+                       //List<Channel> my_channels = channels;
                        //List<Channel> my_channels = channels.subList(0, 15);
-                       //List<Channel> my_channels = channels.subList(0, 6);
+                       List<Channel> my_channels = channels.subList(0, 4);
                        for (Channel c : my_channels) {
                                c.serialize(writer, true);
                        }