From 1b7aac009b398d384adf7d349e7f8ec4302e4e1d Mon Sep 17 00:00:00 2001
From: JP <jp@here>
Date: Wed, 21 Mar 2012 15:00:01 +0100
Subject: [PATCH] Fix voor gebruik van properties file voor programmaversie

---
 release.sh                                       |  1 +
 src/main/java/org/vanbest/xmltv/Config.java      |  2 +-
 src/main/java/org/vanbest/xmltv/Main.java        | 16 ++++++++--------
 src/main/java/org/vanbest/xmltv/XmlTvWriter.java |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/release.sh b/release.sh
index 3bd5432..cb82731 100755
--- a/release.sh
+++ b/release.sh
@@ -9,6 +9,7 @@ ZIPFILE="$PWD/../tv_grab_nl_java-$VERSION.zip"
 mkdir "$DESTDIR"
 rm -f "$ZIPFILE"
 
+mvn compile
 mvn assembly:single
 cp target/tv_grab_nl_java-$VERSION-dep.jar "$DESTDIR/tv_grab_nl_java.jar"
 cp tv_grab_nl_java README Changelog "$DESTDIR"
diff --git a/src/main/java/org/vanbest/xmltv/Config.java b/src/main/java/org/vanbest/xmltv/Config.java
index 506c427..27e3bcc 100644
--- a/src/main/java/org/vanbest/xmltv/Config.java
+++ b/src/main/java/org/vanbest/xmltv/Config.java
@@ -37,7 +37,7 @@ public class Config {
 	
 	private Config() {
 		Properties configProp = new Properties();
-        InputStream in = this.getClass().getResourceAsStream("tv_grab_nl_java.properties");
+        InputStream in = this.getClass().getResourceAsStream("/tv_grab_nl_java.properties");
         try {
             configProp.load(in);
         } catch (IOException e) {
diff --git a/src/main/java/org/vanbest/xmltv/Main.java b/src/main/java/org/vanbest/xmltv/Main.java
index 478f245..8763df6 100644
--- a/src/main/java/org/vanbest/xmltv/Main.java
+++ b/src/main/java/org/vanbest/xmltv/Main.java
@@ -41,6 +41,7 @@ public class Main {
 	
 	public void run() throws FactoryConfigurationError, Exception {
 		if (!config.quiet) {
+			System.out.println("tv_grab_nl_java version "+config.project_version);
 			System.out.println("Fetching programme data for days " + this.offset + "-" + (this.offset+this.days-1));
 			System.out.println("... from " + config.channels.size() + " channels");
 			System.out.println("... using cache file " + config.cacheFile.getCanonicalPath());
@@ -177,6 +178,13 @@ public class Main {
 			e.printStackTrace();
 		}
 		
+		if(line.hasOption("f")) { 
+			configFile = new File(line.getOptionValue("f"));	
+		}
+		config = Config.readConfig(configFile);
+		if (line.hasOption("q")) {
+			config.quiet = true;
+		}
 		if (line.hasOption("d")) {
 			System.out.println("tv_grab_nl_java version " + config.project_version);
 			System.out.println("tv_grab_nl_java is a parser for Dutch TV listings using the tvgids.nl JSON interface");
@@ -188,14 +196,6 @@ public class Main {
 			formatter.printHelp( "tv_grab_nl_java", options );
 			System.exit(0);
 		}
-		if(line.hasOption("f")) { 
-			configFile = new File(line.getOptionValue("f"));	
-		}
-		config = Config.readConfig(configFile);
-		if (line.hasOption("q")) {
-			config.quiet = true;
-		}
-		
 		if (line.hasOption("o")) {
 			this.outputWriter = new PrintStream( new FileOutputStream(line.getOptionValue("o")));
 		}
diff --git a/src/main/java/org/vanbest/xmltv/XmlTvWriter.java b/src/main/java/org/vanbest/xmltv/XmlTvWriter.java
index 90b735c..0e7abcc 100644
--- a/src/main/java/org/vanbest/xmltv/XmlTvWriter.java
+++ b/src/main/java/org/vanbest/xmltv/XmlTvWriter.java
@@ -28,7 +28,7 @@ public class XmlTvWriter {
 		writer.writeDTD("<!DOCTYPE tv SYSTEM \"xmltv.dtd\">");
 		writer.writeCharacters("\n");
 		writer.writeStartElement("tv");
-		writer.writeAttribute("generator-info-url","http://www.vanbest.org/");
+		writer.writeAttribute("generator-info-url","http://github.com/janpascal/tv_grab_nl_java");
 		writer.writeAttribute("source-info-url", "http://tvgids.nl/");
 		writer.writeAttribute("source-info-name", "TvGids.nl");
 		writer.writeAttribute("generator-info-name", "tv_grab_nl_java release "+config.project_version);
-- 
2.39.5