X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FDownloader.java;h=efc6a98df54f11a91c271646daf427d7cfca6fdf;hb=223aa0d4e40e5f3ba9f7b9a7a2165aaff4bf7494;hp=651abc3a65932fbc9cbd7355610eb1c2292db21f;hpb=f6e8d60dbb9f124046f1b951315d74f003624f09;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/Downloader.java b/src/be/nikiroo/utils/Downloader.java
index 651abc3..efc6a98 100644
--- a/src/be/nikiroo/utils/Downloader.java
+++ b/src/be/nikiroo/utils/Downloader.java
@@ -88,6 +88,25 @@ public class Downloader {
 		this.tracer = tracer;
 	}
 
+	/**
+	 * The {@link Cache} to use for all access (can be NULL).
+	 * 
+	 * @return the cache
+	 */
+	public Cache getCache() {
+		return cache;
+	}
+
+	/**
+	 * The {@link Cache} to use for all access (can be NULL).
+	 * 
+	 * @param cache
+	 *            the new cache
+	 */
+	public void setCache(Cache cache) {
+		this.cache = cache;
+	}
+
 	/**
 	 * Clear all the cookies currently in the jar.
 	 * <p>
@@ -197,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
@@ -214,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;
 			}
 		}
@@ -362,7 +388,6 @@ public class Downloader {
 				builder.append(';');
 			}
 
-			// TODO: check if format is ok
 			builder.append(cookie.toString());
 		}