From: JP <jp@here>
Date: Tue, 20 Mar 2012 16:59:19 +0000 (+0100)
Subject: First try at keeping the previously selected channels when doing
X-Git-Tag: 0.5~6
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=10a422e8f43f8ffb561d3a419921557b1b31a701;p=tv_grab_nl_java

First try at keeping the previously selected channels when doing
--configure. Does not work yet.
---

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 475cfb3..6d65670 100644
--- a/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java
+++ b/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java
@@ -91,8 +91,15 @@ public class Main {
 		BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
 		boolean all = false;
 		boolean none = false;
+		boolean keep = false;
 		for (Channel c: channels) {
-			System.out.print("add channel " + c.id + " (" + c.name + ") [[y]es,[n]o,[a]ll,[none] (default=yes)] ");
+			boolean selected = config.channels.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;
+				System.out.println(selected?"Y":"N");
+				continue;
+			} 
 			if (all) {
 				c.selected = true;
 				System.out.println("Y");
@@ -105,7 +112,13 @@ public class Main {
 			} 
 			while(true) {
 				String s = reader.readLine().toLowerCase();
-				if ( s.isEmpty() || s.startsWith("y")) {
+				if (s.isEmpty()) {
+					c.selected = selected;
+				} else if ( s.startsWith("k")) {
+					c.selected = selected;
+					keep = true;
+					break;
+				} else if ( s.startsWith("y")) {
 					c.selected = true;
 					break;
 				} else if ( s.startsWith("a")) {
diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java b/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java
index 412760b..4df5ddb 100644
--- a/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java
+++ b/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java
@@ -270,8 +270,9 @@ public class TvGids {
 						kijkwijzer.add(m3.group(1));
 					}
 					if (!kijkwijzer.isEmpty()) {
-						System.out.println("  (kijkwijzer): " + p.details.kijkwijzer);
-						System.out.println("    kijkwijzer: " + kijkwijzer);
+						// log.debug()
+						// System.out.println("  (kijkwijzer): " + p.details.kijkwijzer);
+						// System.out.println("    kijkwijzer: " + kijkwijzer);
 					}
 				}
 			}