From 9c41fb47c3812d2718907716d5c0977146206c6a Mon Sep 17 00:00:00 2001
From: Jan-Pascal van Best <janpascal@vanbest.org>
Date: Sat, 31 Mar 2012 20:13:51 +0200
Subject: [PATCH] Renamed TvGids to TvGidsLegacy

---
 src/main/java/org/vanbest/xmltv/Main.java             |  4 ++--
 .../vanbest/xmltv/{TvGids.java => TvGidsLegacy.java}  | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)
 rename src/main/java/org/vanbest/xmltv/{TvGids.java => TvGidsLegacy.java} (95%)

diff --git a/src/main/java/org/vanbest/xmltv/Main.java b/src/main/java/org/vanbest/xmltv/Main.java
index d05f132..dfdc4d6 100644
--- a/src/main/java/org/vanbest/xmltv/Main.java
+++ b/src/main/java/org/vanbest/xmltv/Main.java
@@ -73,7 +73,7 @@ public class Main {
 		XmlTvWriter writer = new XmlTvWriter(outputWriter, config);
 		writer.writeChannels(config.channels);
 
-		EPGSource gids = new TvGids(config);
+		EPGSource gids = new TvGidsLegacy(config);
 
 		for (int day=offset; day<offset+days; day++) {
 			if (!config.quiet) System.out.print("Fetching information for day " + day);
@@ -108,7 +108,7 @@ public class Main {
 	}
 	
 	public void configure() throws IOException {
-		EPGSource gids = new TvGids(config);
+		EPGSource gids = new TvGidsLegacy(config);
 		
 		Set<String> oldChannels = new HashSet<String>();
 		for (Channel c: config.channels) {
diff --git a/src/main/java/org/vanbest/xmltv/TvGids.java b/src/main/java/org/vanbest/xmltv/TvGidsLegacy.java
similarity index 95%
rename from src/main/java/org/vanbest/xmltv/TvGids.java
rename to src/main/java/org/vanbest/xmltv/TvGidsLegacy.java
index 2032d37..76eb622 100644
--- a/src/main/java/org/vanbest/xmltv/TvGids.java
+++ b/src/main/java/org/vanbest/xmltv/TvGidsLegacy.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -41,7 +42,7 @@ import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.util.JSONUtils;
 
-public class TvGids extends AbstractEPGSource implements EPGSource {
+public class TvGidsLegacy extends AbstractEPGSource implements EPGSource {
 
 	static String channels_url="http://www.tvgids.nl/json/lists/channels.php";
 	static String programme_base_url="http://www.tvgids.nl/json/lists/programs.php";
@@ -50,7 +51,7 @@ public class TvGids extends AbstractEPGSource implements EPGSource {
 
 	static boolean initialised = false;
 	
-	public TvGids(Config config) {
+	public TvGidsLegacy(Config config) {
 		super(config);
 		this.config = config;
 		if ( ! initialised ) {
@@ -194,6 +195,12 @@ public class TvGids extends AbstractEPGSource implements EPGSource {
 	}
 	
 	private TvGidsProgramme programmeFromJSON(JSONObject programme, boolean fetchDetails) throws Exception {
+		Programme result = new Programme();
+		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", new Locale("nl"));
+		result.startTime = df.parse(programme.getString("datum_start"));
+		result.endTime =  df.parse(programme.getString("datum_end"));
+		result.addTitle(programme.getString("titel"));
+		
 		TvGidsProgramme p = (TvGidsProgramme) JSONObject.toBean(programme, TvGidsProgramme.class);
 		p.fixup(config);
 		if (fetchDetails) {
-- 
2.39.5