From 91be1f607cbf2445f8ca309402b329928a40ce1a Mon Sep 17 00:00:00 2001 From: Jan-Pascal van Best Date: Tue, 20 Mar 2012 21:03:20 +0100 Subject: [PATCH] Fix --configure using old channel list --- tv_grab_nl_java/src/org/vanbest/xmltv/Main.java | 7 ++++++- tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java b/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java index 6d65670..9aaf65d 100644 --- a/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java +++ b/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java @@ -86,6 +86,10 @@ public class Main { public void configure() throws IOException { TvGids gids = new TvGids(config); + Set oldChannels = new HashSet(); + for (Channel c: config.channels) { + oldChannels.add(c.id); + } List channels = gids.getChannels(); BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); @@ -93,7 +97,7 @@ public class Main { boolean none = false; boolean keep = false; for (Channel c: channels) { - boolean selected = config.channels.contains(c.id); + boolean selected = oldChannels.contains(c.id); System.out.print("add channel " + c.id + " (" + c.name + ") [[y]es,[n]o,[a]ll,[none],[k]eep selection (default=" + (selected?"yes":"no") + ")] "); if (keep) { c.selected = selected; @@ -114,6 +118,7 @@ public class Main { String s = reader.readLine().toLowerCase(); if (s.isEmpty()) { c.selected = selected; + break; } else if ( s.startsWith("k")) { c.selected = selected; keep = true; diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java b/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java index 3fc5f97..483b3c4 100644 --- a/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java +++ b/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java @@ -31,7 +31,7 @@ public class XmlTvWriter { writer.writeAttribute("generator-info-url","http://www.vanbest.org/"); writer.writeAttribute("source-info-url", "http://tvgids.nl/"); writer.writeAttribute("source-info-name", "TvGids.nl"); - writer.writeAttribute("generator-info-name", "tv_grab_nl_java $VERSION"); + writer.writeAttribute("generator-info-name", "tv_grab_nl_java release 0.4"); writeln(); } @@ -181,8 +181,7 @@ public class XmlTvWriter { writeln(); } - /* Icon attribuut gebruiken? - * Juiste formaat voor meerdere ratings? + /* TODO: Icon attribuut gebruiken? */ if (p.details.kijkwijzer != null && !p.details.kijkwijzer.isEmpty()) { writer.writeStartElement("rating"); -- 2.39.5