From e6539a4c7cdd80c8388405f89e7f8d05214adb33 Mon Sep 17 00:00:00 2001
From: Jan-Pascal van Best <janpascal@vanbest.org>
Date: Mon, 16 Apr 2012 17:23:15 +0200
Subject: [PATCH] Fix crash when getting tvgids detail page fails

- Fix exception when more than MAX_TRIES tries are needed for fetching
a url, ignore and log instead
- Set loglevel to 0 when --debug is used
- Remove <p class="..."> tags from description text (TvGids)
---
 .../org/vanbest/xmltv/AbstractEPGSource.java  | 13 +++++----
 src/main/java/org/vanbest/xmltv/Main.java     |  1 +
 .../java/org/vanbest/xmltv/Programme.java     | 13 +++++++++
 src/main/java/org/vanbest/xmltv/RTL.java      | 27 ++++++++++++++++---
 src/main/java/org/vanbest/xmltv/TvGids.java   | 18 +++++++++----
 5 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/vanbest/xmltv/AbstractEPGSource.java b/src/main/java/org/vanbest/xmltv/AbstractEPGSource.java
index d9e2684..b24e27a 100644
--- a/src/main/java/org/vanbest/xmltv/AbstractEPGSource.java
+++ b/src/main/java/org/vanbest/xmltv/AbstractEPGSource.java
@@ -55,8 +55,7 @@ public abstract class AbstractEPGSource implements EPGSource {
 		Thread.sleep(config.niceMilliseconds);
 		StringBuffer buf = new StringBuffer();
 		boolean done = false;
-		IOException finalException = null;
-		for(int count = 0; count<MAX_FETCH_TRIES && !done; count++) {
+		for(int count = 0; !done; count++) {
 			try {
 				BufferedReader reader = new BufferedReader( new InputStreamReader( url.openStream()));
 				String s;
@@ -66,13 +65,13 @@ public abstract class AbstractEPGSource implements EPGSource {
 				if (!config.quiet) {
 					System.out.println("Error fetching from url " + url + ", count="+count);
 				}
-				finalException = e;
+				if (count>=MAX_FETCH_TRIES) { 
+					stats.fetchErrors++;
+					if (config.logLevel>=Config.LOG_DEBUG) e.printStackTrace();
+					throw new Exception("Error getting program data from url " + url, e);
+				}
 			}
 		}
-		if (!done) {
-			stats.fetchErrors++;
-			throw new Exception("Error getting program data from url " + url, finalException);
-		}
 		return buf.toString();  
 	}
 	
diff --git a/src/main/java/org/vanbest/xmltv/Main.java b/src/main/java/org/vanbest/xmltv/Main.java
index 61cc184..843b9dc 100644
--- a/src/main/java/org/vanbest/xmltv/Main.java
+++ b/src/main/java/org/vanbest/xmltv/Main.java
@@ -389,6 +389,7 @@ public class Main {
 		}
 		if (line.hasOption("log-level")) {
 			config.logLevel = Integer.parseInt(line.getOptionValue("log-level"));
+			if (config.quiet) config.logLevel = 0;
 		}
 		if (line.hasOption("cache")) {
 			config.setCacheFile(line.getOptionValue("cache"));
diff --git a/src/main/java/org/vanbest/xmltv/Programme.java b/src/main/java/org/vanbest/xmltv/Programme.java
index 8c1d787..644ebd2 100644
--- a/src/main/java/org/vanbest/xmltv/Programme.java
+++ b/src/main/java/org/vanbest/xmltv/Programme.java
@@ -346,4 +346,17 @@ public class Programme implements Serializable {
 		writer.writeEndElement();
 		writer.writeCharacters(System.getProperty("line.separator"));
 	}
+	
+	public String getFirstTitle() {
+		if (titles==null || titles.isEmpty()) return null;
+		return titles.get(0).title;
+	}
+	
+	public String toString() {
+		StringBuilder s = new StringBuilder();
+		s.append("[Programme ").append(getFirstTitle());
+		s.append("@ ").append(startTime.toString());
+		s.append("(").append(channel).append(")]");
+		return s.toString();
+	}
 }
diff --git a/src/main/java/org/vanbest/xmltv/RTL.java b/src/main/java/org/vanbest/xmltv/RTL.java
index 0341af6..ac6ca50 100644
--- a/src/main/java/org/vanbest/xmltv/RTL.java
+++ b/src/main/java/org/vanbest/xmltv/RTL.java
@@ -311,7 +311,7 @@ public class RTL extends AbstractEPGSource implements EPGSource  {
 				String programme_id = p.getString(2);
 				String genre_id = p.getString(3); // 1 = amusement, etc
 				String quark2 = p.getString(4); // 0 of 1, movie flag?
-				debugWriter.print("\""+id+"\",\""+starttime+"\",\""+title+"\",\""+genre_id+"\",\""+quark2+"\",");
+				if(debug) debugWriter.print("\""+id+"\",\""+starttime+"\",\""+title+"\",\""+genre_id+"\",\""+quark2+"\",");
 				Programme prog = cache.get(getId(), programme_id);
 				if (prog == null) {
 					stats.cacheMisses++;
@@ -367,6 +367,25 @@ public class RTL extends AbstractEPGSource implements EPGSource  {
 	 * @throws FileNotFoundException 
 	 */
 	public static void main(String[] args) throws FileNotFoundException {
+		Calendar result = Calendar.getInstance();
+		Calendar d = Calendar.getInstance();
+		try {
+			d.setTime(new SimpleDateFormat("yyyy-MM-dd").parse("2012-04-16"));
+		} catch (ParseException e2) {
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		}
+
+		SimpleDateFormat df = new SimpleDateFormat("HH:mm");
+		try {
+			result.setTime(df.parse("04:50"));
+			result.set(d.get(Calendar.YEAR), d.get(Calendar.MONTH), d.get(Calendar.DAY_OF_MONTH));
+			System.out.println(result.getTime());
+			System.exit(1);
+		} catch (ParseException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 		debug = true;
 		Config config = Config.getDefaultConfig();
 		config.niceMilliseconds = 50;
@@ -408,8 +427,10 @@ public class RTL extends AbstractEPGSource implements EPGSource  {
 				System.out.println("Number of programmes fetched: " + stats.cacheMisses);
 				System.out.println("Number of fetch errors: " + stats.fetchErrors);
 			}
-			rtl.debugWriter.flush();
-			rtl.debugWriter.close();
+			if (debug) {
+				rtl.debugWriter.flush();
+				rtl.debugWriter.close();
+			}
 			rtl.close();
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
diff --git a/src/main/java/org/vanbest/xmltv/TvGids.java b/src/main/java/org/vanbest/xmltv/TvGids.java
index 91582f3..02bd9cb 100644
--- a/src/main/java/org/vanbest/xmltv/TvGids.java
+++ b/src/main/java/org/vanbest/xmltv/TvGids.java
@@ -281,15 +281,23 @@ public class TvGids extends AbstractEPGSource implements EPGSource {
 	}
 
 	private void fillDetails(String id, Programme result) throws Exception {
-		fillJSONDetails(id, result);
-		fillScraperDetails(id, result);
+		try {
+			fillJSONDetails(id, result);
+		} catch (Exception e) {
+			if (!config.quiet) System.out.println("Error fetching details for programme " + result.toString() );
+		}
+		try {
+			fillScraperDetails(id, result);
+		} catch (Exception e) {
+			if (!config.quiet) System.out.println("Error fetching details for programme " + result.toString() );
+		}
 		
 		if ((result.secondaryTitles==null || result.secondaryTitles.isEmpty()) && 
 				  (!result.hasCategory("movies") && !result.hasCategory("film"))) {
 			for(Programme.Title t: result.titles) {
 				String[] parts = t.title.split("\\s*:\\s*", 2);
-				if (parts.length >= 2 ) {
-					if (!config.quiet) {
+				if (parts.length >= 2 && parts[0].length()>=5) {
+					if (config.logLevel >= Config.LOG_DEBUG) {
 						System.out.println("Splitting title from \"" + t.title + "\" to: \"" + parts[0].trim() + "\"; sub-title: \"" + parts[1].trim() + "\"");
 					}
 					t.title = parts[0].trim();
@@ -323,7 +331,7 @@ public class TvGids extends AbstractEPGSource implements EPGSource {
 			if(key.equals("synop")) {
 				value = value.replaceAll("<br>", " ").
 						replaceAll("<br />", " ").
-						replaceAll("<p>", " ").
+						replaceAll("<p[^>]*>", " ").
 						replaceAll("</p>", " ").
 						replaceAll("<strong>", " ").
 						replaceAll("</strong>", " ").
-- 
2.39.5