X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FDownloader.java;h=30ce4e798aff5300b30e14f200546b1e4d09ef16;hb=4098af704dfa22ce4a60003940753c28030374fa;hp=4976c483aef7ab8be33fb21ee757f205b13b292f;hpb=3052163b494bf89d178638a047ca80008578a782;p=fanfix.git

diff --git a/src/be/nikiroo/utils/Downloader.java b/src/be/nikiroo/utils/Downloader.java
index 4976c48..30ce4e7 100644
--- a/src/be/nikiroo/utils/Downloader.java
+++ b/src/be/nikiroo/utils/Downloader.java
@@ -216,7 +216,13 @@ public class Downloader {
 	 * @param url
 	 *            the {@link URL} to open
 	 * @param originalUrl
-	 *            the original {@link URL} before any redirection occurs
+	 *            the original {@link URL} before any redirection occurs, which
+	 *            is also used for the cache ID if needed (so we can retrieve
+	 *            the content with this URL if needed)
+	 * @param currentReferer
+	 *            the current referer, for websites that needs this info
+	 * @param cookiesValues
+	 *            the cookies
 	 * @param postParams
 	 *            the POST parameters
 	 * @param getParams
@@ -233,17 +239,18 @@ public class Downloader {
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	private InputStream open(URL url, final URL originalUrl,
-			URL currentReferer, Map<String, String> cookiesValues,
-			Map<String, String> postParams, Map<String, String> getParams,
-			String oauth, boolean stable) throws IOException {
+	public InputStream open(URL url, final URL originalUrl, URL currentReferer,
+			Map<String, String> cookiesValues, Map<String, String> postParams,
+			Map<String, String> getParams, String oauth, boolean stable)
+			throws IOException {
 
 		tracer.trace("Request: " + url);
 
 		if (cache != null) {
-			InputStream in = cache.load(url, false, stable);
+			InputStream in = cache.load(originalUrl, false, stable);
 			if (in != null) {
-				tracer.trace("Take from cache: " + url);
+				tracer.trace("Use the cache: " + url);
+				tracer.trace("Original URL : " + originalUrl);
 				return in;
 			}
 		}
@@ -327,9 +334,14 @@ public class Downloader {
 		}
 
 		if (in != null && cache != null) {
-			tracer.trace("Save to cache: " + url);
+			tracer.trace("Save to cache: " + originalUrl);
 			try {
-				cache.save(in, url);
+				try {
+					cache.save(in, originalUrl);
+				} finally {
+					in.close();
+				}
+				in = cache.load(originalUrl, true, false);
 			} catch (IOException e) {
 				tracer.error(new IOException(
 						"Cannot save URL to cache, will ignore cache: " + url,
@@ -381,7 +393,6 @@ public class Downloader {
 				builder.append(';');
 			}
 
-			// TODO: check if format is ok
 			builder.append(cookie.toString());
 		}