From: Jan-Pascal van Best Date: Fri, 16 Mar 2012 12:17:43 +0000 (+0100) Subject: Put tvgids.nl nice time in config file X-Git-Tag: 0.5~11 X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=e4030e955065ac1f98a82793720771a13afbfa7f;p=tv_grab_nl_java Put tvgids.nl nice time in config file --- diff --git a/tv_grab_nl_java/.classpath b/tv_grab_nl_java/.classpath index 591744a..6c7804f 100644 --- a/tv_grab_nl_java/.classpath +++ b/tv_grab_nl_java/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/tv_grab_nl_java/.settings/org.eclipse.jdt.core.prefs b/tv_grab_nl_java/.settings/org.eclipse.jdt.core.prefs index 8be742f..f4217b0 100644 --- a/tv_grab_nl_java/.settings/org.eclipse.jdt.core.prefs +++ b/tv_grab_nl_java/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,12 @@ -#Fri Mar 09 20:00:25 CET 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/Config.java b/tv_grab_nl_java/src/org/vanbest/xmltv/Config.java index 71222de..f62f944 100644 --- a/tv_grab_nl_java/src/org/vanbest/xmltv/Config.java +++ b/tv_grab_nl_java/src/org/vanbest/xmltv/Config.java @@ -18,6 +18,7 @@ import java.util.Map; import org.apache.commons.io.FileUtils; public class Config { + public int niceMilliseconds; public List channels; public Map cattrans; protected File cacheFile; @@ -26,10 +27,23 @@ public class Config { private Config() { } + public static Config getDefaultConfig() { + Config result = new Config(); + result.channels = new ArrayList(); + result.cattrans = getDefaultCattrans(); + result.cacheFile = defaultCacheFile(); + result.niceMilliseconds = 500; + return result; + } + public Map getCategories() { return cattrans; } + public void setChannels(List channels) { + this.channels = channels; + } + public static File defaultCacheFile() { return FileUtils.getFile(FileUtils.getUserDirectory(), ".xmltv", "tv_grab_nl_java.cache"); } @@ -63,6 +77,7 @@ public class Config { FileUtils.forceMkdir(configFile.getParentFile()); PrintWriter out = new PrintWriter(new OutputStreamWriter( new FileOutputStream( configFile ))); out.println("cache-file: " + escape(cacheFile.getPath())); + out.println("nice-time-milliseconds: " + niceMilliseconds); for(Channel c: channels) { if (!c.selected) { out.print("#"); @@ -117,13 +132,13 @@ public class Config { } return parts; } + public static Config readConfig(File file) { - Config result = new Config(); + Config result = getDefaultConfig(); + result.cattrans = new HashMap(); try { BufferedReader reader = new BufferedReader( new InputStreamReader( new FileInputStream( file))); - List channels = new ArrayList(); - Map cattrans = new HashMap(); - File cacheFile = defaultCacheFile(); + while(true) { String s = reader.readLine(); if(s==null) break; @@ -135,36 +150,26 @@ public class Config { if (parts.size()>3) { c.setIconUrl(parts.get(3)); } - channels.add(c); - } - if (parts.get(0).toLowerCase().equals("category")) { - cattrans.put(parts.get(1), parts.get(2)); + result.channels.add(c); } - if (parts.get(0).toLowerCase().equals("cache-file")) { - cacheFile = new File(parts.get(1)); + switch (parts.get(0).toLowerCase()) { + case "category" : + result.cattrans.put(parts.get(1), parts.get(2)); + break; + case "cache-file": + result.cacheFile = new File(parts.get(1)); + break; + case "nice-time-milliseconds": + result.niceMilliseconds = Integer.parseInt(parts.get(1)); } } - result.setChannels(channels); - result.cattrans = cattrans; - result.cacheFile = cacheFile; } catch (IOException e) { - System.out.println("Cannot read configuration file, continuing with empty configuration"); + e.printStackTrace(); + System.out.println("Error reading configuration file, continuing with empty configuration"); return getDefaultConfig(); } return result; } - - public static Config getDefaultConfig() { - Config result = new Config(); - result.channels = new ArrayList(); - result.cattrans = getDefaultCattrans(); - result.cacheFile = defaultCacheFile(); - return result; - } - - public void setChannels(List channels) { - this.channels = channels; - } } 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 61c5351..5612b7e 100644 --- a/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java +++ b/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java @@ -176,7 +176,7 @@ public class TvGids { } private JSONObject fetchJSON(URL url) throws Exception { - Thread.sleep(100); + Thread.sleep(config.niceMilliseconds); StringBuffer json = new StringBuffer(); try { BufferedReader reader = new BufferedReader( new InputStreamReader( url.openStream()));