Fix voor gebruik van properties file voor programmaversie

diff --git a/release.sh b/release.sh
index 3bd543213cb2f698fdb2c6a826dc5191eded53ba..cb8273107c914e6ec7138982d9fde0fd456d5699 100755 (executable)
--- 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 506c42712fdecac03bf602f8b5245fc20feb65b0..27e3bcce2bab224e2fbebce2fab4a723c6fce8fd 100644 (file)
--- 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 478f2453235582f2b029be7b1c8191607622496c..8763df688a53bcada56de86acd77c3965a3c24fa 100644 (file)
--- 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 90b735cb554852c513d33dd235a744d6698191fc..0e7abcc3a5b5d7c3c7b2752357a0a1c2b4b46b90 100644 (file)
--- 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);