From: JP <jp@here>
Date: Tue, 13 Mar 2012 09:45:04 +0000 (+0100)
Subject: Gather and display some statistics
X-Git-Tag: 0.2~2
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=cc815b2e21cee85b750b61df1ead9e433962d5d5;p=tv_grab_nl_java

Gather and display some statistics
---

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 0d0a6d6..3aafbaa 100644
--- a/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java
+++ b/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java
@@ -56,15 +56,17 @@ public class Main {
 		TvGids gids = new TvGids(cacheFile);
 
 		for (int day=offset; day<offset+days; day++) {
-			if (!quiet) System.out.println("Fetching information for day " + day);
+			if (!quiet) System.out.print("Fetching information for day " + day);
 			Set<Programme> programmes = new HashSet<Programme>();
 			for( Channel c: config.channels ) {
+				if (!quiet) System.out.print(".");
 				ArrayList<Channel> cs = new ArrayList<Channel>(2);
 				cs.add(c);
 				Set<Programme> p = gids.getProgrammes(cs, day, true);
 				writer.writePrograms(p);
 				writer.flush();
 			}
+			if (!quiet) System.out.println();
 		}
 		
 		try {
@@ -79,6 +81,8 @@ public class Main {
 
 		writer.close();
 		if (!quiet) {
+			System.out.println("Number of programmes from cache: " + gids.cacheHits);
+			System.out.println("Number of programmes fetched: " + gids.cacheMisses);
 			System.out.println("Number of fetch errors: " + gids.fetchErrors);
 		}
 	}
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 33b3900..652e0b2 100644
--- a/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java
+++ b/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java
@@ -33,6 +33,8 @@ public class TvGids {
 	ProgrammeCache cache;
 	static boolean initialised = false;
 	int fetchErrors = 0;
+	int cacheHits = 0;
+	int cacheMisses = 0;
 	
 	public TvGids(File cacheFile) {
 		cache = new ProgrammeCache(cacheFile);
@@ -187,11 +189,14 @@ public class TvGids {
 	private void fillDetails(Programme p) throws Exception {
 		p.details = cache.getDetails(p.db_id);
 		if ( p.details == null ) {
+			cacheMisses++;
 			URL url = detailUrl(p.db_id);
 			JSONObject json = fetchJSON(url);
 			p.details = (ProgrammeDetails) JSONObject.toBean(json, ProgrammeDetails.class);
 			p.details.fixup(p);
 			cache.add(p.db_id, p.details);
+		} else {
+			cacheHits++;
 		}
 	}
 }
diff --git a/tv_grab_nl_java/tv_grab_nl_java b/tv_grab_nl_java/tv_grab_nl_java
new file mode 100755
index 0000000..f79a3c1
--- /dev/null
+++ b/tv_grab_nl_java/tv_grab_nl_java
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+JARFILE=/usr/local/share/java/tv_grab_nl_java.jar
+
+java -jar $JARFILE "$@"
diff --git a/tv_grab_nl_java/tv_grab_nl_java.sh b/tv_grab_nl_java/tv_grab_nl_java.sh
deleted file mode 100755
index f79a3c1..0000000
--- a/tv_grab_nl_java/tv_grab_nl_java.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-JARFILE=/usr/local/share/java/tv_grab_nl_java.jar
-
-java -jar $JARFILE "$@"