From b618b6620fd8d8355b68878c01131c1109bbc50a Mon Sep 17 00:00:00 2001 From: Jan-Pascal van Best Date: Sun, 25 Mar 2012 20:55:53 +0200 Subject: [PATCH] Config file handling enabled flag works now --- src/main/java/org/vanbest/xmltv/Config.java | 6 +++--- src/main/java/org/vanbest/xmltv/Main.java | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/vanbest/xmltv/Config.java b/src/main/java/org/vanbest/xmltv/Config.java index 0eb0560..5e7bd00 100644 --- a/src/main/java/org/vanbest/xmltv/Config.java +++ b/src/main/java/org/vanbest/xmltv/Config.java @@ -188,7 +188,7 @@ public class Config { switch (parts.get(0).toLowerCase()) { case "channel": Channel c = null; - System.out.println("Adding channel " + parts + " in file format " + fileformat); + // System.out.println("Adding channel " + parts + " in file format " + fileformat); switch(fileformat) { case 0: c = Channel.getChannel(parts.get(1), parts.get(2)); @@ -204,7 +204,7 @@ public class Config { switch(parts.get(2)) { case "enabled": c.setEnabled(true); break; case "disabled": c.setEnabled(false); break; - default: System.out.println("Unknown channel status \"" + parts.get(2) + "\", should be enabled or disabled"); + default: System.out.println("Error in config file, unknown channel status \"" + parts.get(2) + "\", should be enabled or disabled"); } } result.channels.add(c); @@ -212,7 +212,7 @@ public class Config { case "category" : result.cattrans.put(parts.get(1), parts.get(2)); break; - case "current-file-format" : + case "config-file-format" : try { fileformat = Integer.parseInt(parts.get(1)); } catch (NumberFormatException e) { diff --git a/src/main/java/org/vanbest/xmltv/Main.java b/src/main/java/org/vanbest/xmltv/Main.java index 571d407..16afd48 100644 --- a/src/main/java/org/vanbest/xmltv/Main.java +++ b/src/main/java/org/vanbest/xmltv/Main.java @@ -63,7 +63,9 @@ public class Main { System.out.println("under certain conditions; `tv_grab_nl_java --license' for details."); System.out.println("Fetching programme data for days " + this.offset + "-" + (this.offset+this.days-1)); - System.out.println("... from " + config.channels.size() + " channels"); + int enabledCount = 0; + for(Channel c: config.channels) { if (c.enabled) enabledCount++; } + System.out.println("... from " + enabledCount + " channels"); System.out.println("... using cache file " + config.cacheFile.getCanonicalPath()); } -- 2.39.5