X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FDownloader.java;h=0487933295ec8c4902665d2bffcd81e57debda2c;hb=9991e4e10cd1cb607210ecfda9ed48232574be21;hp=7ee551ff38f4f0692d11fd35678e283c5cec359d;hpb=24604392c3aa6d9298aacd10fde7bb2df1322a10;p=fanfix.git

diff --git a/src/be/nikiroo/utils/Downloader.java b/src/be/nikiroo/utils/Downloader.java
index 7ee551f..0487933 100644
--- a/src/be/nikiroo/utils/Downloader.java
+++ b/src/be/nikiroo/utils/Downloader.java
@@ -30,6 +30,7 @@ public class Downloader {
 	private CookieManager cookies;
 	private TraceHandler tracer = new TraceHandler();
 	private Cache cache;
+	private boolean offline;
 
 	/**
 	 * Create a new {@link Downloader}.
@@ -63,6 +64,32 @@ public class Downloader {
 
 		setCache(cache);
 	}
+	
+	/**
+	 * This {@link Downloader} is forbidden to try and connect to the network.
+	 * <p>
+	 * If TRUE, it will only check the cache if any.
+	 * <p>
+	 * Default is FALSE.
+	 * 
+	 * @return TRUE if offline
+	 */
+	public boolean isOffline() {
+		return offline;
+	}
+	
+	/**
+	 * This {@link Downloader} is forbidden to try and connect to the network.
+	 * <p>
+	 * If TRUE, it will only check the cache if any.
+	 * <p>
+	 * Default is FALSE.
+	 * 
+	 * @param offline TRUE for offline, FALSE for online
+	 */
+	public void setOffline(boolean offline) {
+		this.offline = offline;
+	}
 
 	/**
 	 * The traces handler for this {@link Cache}.
@@ -167,7 +194,7 @@ public class Downloader {
 	 * @return the {@link InputStream} of the opened page
 	 * 
 	 * @throws IOException
-	 *             in case of I/O error
+	 *             in case of I/O error (including offline mode + not in cache)
 	 */
 	public InputStream open(URL url, URL currentReferer,
 			Map<String, String> cookiesValues, Map<String, String> postParams,
@@ -199,7 +226,7 @@ public class Downloader {
 	 * @return the {@link InputStream} of the opened page
 	 * 
 	 * @throws IOException
-	 *             in case of I/O error
+	 *             in case of I/O error (including offline mode + not in cache)
 	 */
 	public InputStream open(URL url, URL currentReferer,
 			Map<String, String> cookiesValues, Map<String, String> postParams,
@@ -236,7 +263,7 @@ public class Downloader {
 	 * @return the {@link InputStream} of the opened page
 	 * 
 	 * @throws IOException
-	 *             in case of I/O error
+	 *             in case of I/O error (including offline mode + not in cache)
 	 */
 	public InputStream open(URL url, final URL originalUrl, URL currentReferer,
 			Map<String, String> cookiesValues, Map<String, String> postParams,
@@ -254,6 +281,13 @@ public class Downloader {
 			}
 		}
 
+		String protocol = originalUrl == null ? null : originalUrl
+				.getProtocol();
+		if (isOffline() && !"file".equalsIgnoreCase(protocol)) {
+			tracer.error("Downloader OFFLINE, cannot proceed to URL: " + url);
+			throw new IOException("Downloader is currently OFFLINE, cannot download: " + url);
+		}
+		
 		tracer.trace("Download: " + url);
 
 		URLConnection conn = openConnectionWithCookies(url, currentReferer,
@@ -345,8 +379,8 @@ public class Downloader {
 			}
 
 			if (cache != null) {
-				String size = conn.getContentLengthLong() < 0 ? "unknown size"
-						: StringUtils.formatNumber(conn.getContentLengthLong())
+				String size = conn.getContentLength() < 0 ? "unknown size"
+						: StringUtils.formatNumber(conn.getContentLength())
 								+ "bytes";
 				tracer.trace("Save to cache (" + size + "): " + originalUrl);
 				try {
@@ -365,6 +399,11 @@ public class Downloader {
 				}
 			}
 
+			if (in == null) {
+				throw new IOException(
+						"Cannot retrieve the file after storing it in the cache (??)");
+			}
+			
 			return in;
 		} catch (IOException e) {
 			throw new IOException(String.format(