From: Jan-Pascal van Best <janpascal@vanbest.org>
Date: Sat, 24 Mar 2012 22:35:37 +0000 (+0100)
Subject: Finish refactoring Channel, compiles and seems to work ok now
X-Git-Tag: 0.9.0~29
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=aaca45de9ae72410ac7950550e9e29c66d43a134;p=tv_grab_nl_java

Finish refactoring Channel, compiles and seems to work ok now
---

diff --git a/src/main/java/org/vanbest/xmltv/Channel.java b/src/main/java/org/vanbest/xmltv/Channel.java
index 4857561..f80ab6f 100644
--- a/src/main/java/org/vanbest/xmltv/Channel.java
+++ b/src/main/java/org/vanbest/xmltv/Channel.java
@@ -13,9 +13,10 @@ public class Channel {
 	List<String> names; // at least one name is obligatory
 	List<Icon> icons;
 	List<String> urls;
-	protected boolean selected;
+	protected boolean selected = true;
 	
-	protected Channel() {
+	protected Channel(String id) {
+		this.id = id;
 		names = new ArrayList<String>();
 		icons = new ArrayList<Icon>();
 		urls = new ArrayList<String>();
@@ -26,13 +27,13 @@ public class Channel {
 	}
 	
 	static Channel getChannel(String id, String name) {
-		Channel c = new Channel();
+		Channel c = new Channel(id);
 		c.names.add(name);
 		return c;
 	}
 
 	static Channel getChannel(String id, String name, String iconUrl) {
-		Channel c = new Channel();
+		Channel c = new Channel(id);
 		c.names.add(name);
 		c.icons.add(new Icon(iconUrl));
 		return c;
diff --git a/src/main/java/org/vanbest/xmltv/Icon.java b/src/main/java/org/vanbest/xmltv/Icon.java
new file mode 100644
index 0000000..e6cd5f1
--- /dev/null
+++ b/src/main/java/org/vanbest/xmltv/Icon.java
@@ -0,0 +1,27 @@
+package org.vanbest.xmltv;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+public class Icon {
+	final static int UNKNOWN_DIMENSION=-1;
+	String url;
+	int width = UNKNOWN_DIMENSION;
+	int height = UNKNOWN_DIMENSION;
+
+	public Icon(String url) {
+		this.url = url;
+	}
+
+	public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+		writer.writeStartElement("icon");
+		writer.writeAttribute("src", url);
+		if(width != UNKNOWN_DIMENSION) {
+			writer.writeAttribute("width", Integer.toString(width));
+		}
+		if(height!= UNKNOWN_DIMENSION) {
+			writer.writeAttribute("height", Integer.toString(height));
+		}
+		writer.writeEndElement();
+	}
+}
diff --git a/src/main/java/org/vanbest/xmltv/Main.java b/src/main/java/org/vanbest/xmltv/Main.java
index 39ad63e..c31f0de 100644
--- a/src/main/java/org/vanbest/xmltv/Main.java
+++ b/src/main/java/org/vanbest/xmltv/Main.java
@@ -76,10 +76,9 @@ public class Main {
 			if (!config.quiet) System.out.print("Fetching information for day " + day);
 			Set<Programme> programmes = new HashSet<Programme>();
 			for(Channel c: config.channels) {
+				if (!c.selected) continue;
 				if (!config.quiet) System.out.print(".");
-				ArrayList<TvGidsChannel> cs = new ArrayList<TvGidsChannel>(2);
-				cs.add(c);
-				Set<Programme> p = gids.getProgrammes(cs, day, true);
+				Set<Programme> p = gids.getProgrammes(c, day, true);
 				writer.writePrograms(p);
 				writer.flush();
 			}
@@ -107,8 +106,8 @@ public class Main {
 	public void configure() throws IOException {
 		TvGids gids = new TvGids(config);
 		
-		Set<Integer> oldChannels = new HashSet<Integer>();
-		for (TvGidsChannel c: config.channels) {
+		Set<String> oldChannels = new HashSet<String>();
+		for (Channel c: config.channels) {
 			oldChannels.add(c.id);
 		}
 		List<Channel> channels = gids.getChannels();
diff --git a/src/main/java/org/vanbest/xmltv/Programme.java b/src/main/java/org/vanbest/xmltv/Programme.java
index de8dce3..21c7e02 100644
--- a/src/main/java/org/vanbest/xmltv/Programme.java
+++ b/src/main/java/org/vanbest/xmltv/Programme.java
@@ -119,7 +119,7 @@ public class Programme {
 	  String highlight_afbeelding;
 	  String highlight_content;
 	  ProgrammeDetails details = null;
-	  TvGidsChannel channel = null;
+	  Channel channel = null;
 
 	  public void fixup(Config config) {
 		 this.titel = org.apache.commons.lang.StringEscapeUtils.unescapeHtml(titel);
diff --git a/src/main/java/org/vanbest/xmltv/TvGids.java b/src/main/java/org/vanbest/xmltv/TvGids.java
index 6d33c99..ee79ed8 100644
--- a/src/main/java/org/vanbest/xmltv/TvGids.java
+++ b/src/main/java/org/vanbest/xmltv/TvGids.java
@@ -130,14 +130,14 @@ public class TvGids {
 		
 	}
 	
-	public static URL programmeUrl(List<TvGidsChannel> channels, int day) throws Exception {
+	public static URL programmeUrl(List<Channel> channels, int day) throws Exception {
 		StringBuilder s = new StringBuilder(programme_base_url);
 		if (channels.size() < 1) {
 			throw new Exception("should have at least one channel");
 		}
 		s.append("?channels=");
 		boolean first = true;
-		for(TvGidsChannel i: channels) {
+		for(Channel i: channels) {
 			if (first) {
 				s.append(i.id);
 				first = false;
@@ -164,16 +164,23 @@ public class TvGids {
 		s.append("/");
 		return new URL(s.toString());
 	}
+	
+	// Convenience method
+	public Set<Programme> getProgrammes(Channel channel, int day, boolean fetchDetails) throws Exception {
+		ArrayList<Channel> list = new ArrayList<Channel>(2);
+		list.add(channel);
+		return getProgrammes(list, day, fetchDetails);
+	}
 		
-	public Set<Programme> getProgrammes(List<TvGidsChannel> channels, int day, boolean fetchDetails) throws Exception {
+	public Set<Programme> getProgrammes(List<Channel> channels, int day, boolean fetchDetails) throws Exception {
 		Set<Programme> result = new HashSet<Programme>();
 		URL url = programmeUrl(channels, day);
 
 		JSONObject jsonObject = fetchJSON(url);  
 		//System.out.println( jsonObject );  
 		
-		for( TvGidsChannel c: channels) {
-			JSON ps = (JSON) jsonObject.get(""+c.id);
+		for(Channel c: channels) {
+			JSON ps = (JSON) jsonObject.get(c.id);
 			if ( ps.isArray() ) {
 				JSONArray programs = (JSONArray) ps;
 				for( int i=0; i<programs.size(); i++ ) {
diff --git a/src/main/java/org/vanbest/xmltv/XmlTvWriter.java b/src/main/java/org/vanbest/xmltv/XmlTvWriter.java
index d56635f..6375b46 100644
--- a/src/main/java/org/vanbest/xmltv/XmlTvWriter.java
+++ b/src/main/java/org/vanbest/xmltv/XmlTvWriter.java
@@ -76,7 +76,7 @@ public class XmlTvWriter {
 			writer.writeStartElement("programme");
 				writer.writeAttribute("start", df.format(p.datum_start));
 				writer.writeAttribute("stop", df.format(p.datum_end));
-				writer.writeAttribute("channel", ""+p.channel.getChannelId());
+				writer.writeAttribute("channel", ""+p.channel.id);
 				writeln();				
 				
 				writer.writeStartElement("title");
@@ -208,7 +208,7 @@ public class XmlTvWriter {
 								case '4':writer.writeCharacters("Afgeraden voor kinderen jonger dan 16 jaar"); break;
 								default: if (!config.quiet) {
 									System.out.println("Unknown kijkwijzer character: " + p.details.kijkwijzer);
-									System.out.println("    for show " + p.titel + " at channel " + p.channel.name + " at " + p.datum_start);
+									System.out.println("    for show " + p.titel + " at channel " + p.channel.defaultName() + " at " + p.datum_start);
 								}
 								}
 							}