From f1fb834c62f9d9a73edeeda3fed060e0dede8cef Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sun, 6 Aug 2017 15:46:11 +0200 Subject: [PATCH] Use Downloader/Cache from utils --- src/be/nikiroo/fanfix/Cache.java | 669 ------------------ src/be/nikiroo/fanfix/DataLoader.java | 280 ++++++++ src/be/nikiroo/fanfix/Instance.java | 10 +- src/be/nikiroo/fanfix/VersionCheck.java | 3 +- .../fanfix/supported/BasicSupport.java | 3 +- 5 files changed, 288 insertions(+), 677 deletions(-) delete mode 100644 src/be/nikiroo/fanfix/Cache.java create mode 100644 src/be/nikiroo/fanfix/DataLoader.java diff --git a/src/be/nikiroo/fanfix/Cache.java b/src/be/nikiroo/fanfix/Cache.java deleted file mode 100644 index 383fa7c8..00000000 --- a/src/be/nikiroo/fanfix/Cache.java +++ /dev/null @@ -1,669 +0,0 @@ -package be.nikiroo.fanfix; - -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.CookieHandler; -import java.net.CookieManager; -import java.net.CookiePolicy; -import java.net.CookieStore; -import java.net.HttpCookie; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLEncoder; -import java.util.Date; -import java.util.Map; -import java.util.zip.GZIPInputStream; - -import javax.imageio.ImageIO; - -import be.nikiroo.fanfix.bundles.Config; -import be.nikiroo.fanfix.supported.BasicSupport; -import be.nikiroo.utils.IOUtils; -import be.nikiroo.utils.ImageUtils; -import be.nikiroo.utils.MarkableFileInputStream; - -/** - * This cache will manage Internet (and local) downloads, as well as put the - * downloaded files into a cache. - *

- * As long the cached resource is not too old, it will use it instead of - * retrieving the file again. - * - * @author niki - */ -public class Cache { - private File dir; - private String UA; - private long tooOldChanging; - private long tooOldStable; - private CookieManager cookies; - - /** - * Create a new {@link Cache} object. - * - * @param dir - * the directory to use as cache - * @param UA - * the User-Agent to use to download the resources - * @param hoursChanging - * the number of hours after which a cached file that is thought - * to change ~often is considered too old (or -1 for - * "never too old") - * @param hoursStable - * the number of hours after which a LARGE cached file that is - * thought to change rarely is considered too old (or -1 for - * "never too old") - * - * @throws IOException - * in case of I/O error - */ - public Cache(File dir, String UA, int hoursChanging, int hoursStable) - throws IOException { - this.dir = dir; - this.UA = UA; - this.tooOldChanging = 1000 * 60 * 60 * hoursChanging; - this.tooOldStable = 1000 * 60 * 60 * hoursStable; - - if (dir != null) { - if (!dir.exists()) { - dir.mkdirs(); - } - } - - if (dir == null || !dir.exists()) { - throw new IOException("Cannot create the cache directory: " - + (dir == null ? "null" : dir.getAbsolutePath())); - } - - cookies = new CookieManager(); - cookies.setCookiePolicy(CookiePolicy.ACCEPT_ALL); - CookieHandler.setDefault(cookies); - } - - /** - * Clear all the cookies currently in the jar. - */ - public void clearCookies() { - cookies.getCookieStore().removeAll(); - } - - /** - * Open a resource (will load it from the cache if possible, or save it into - * the cache after downloading if not). - * - * @param url - * the resource to open - * @param support - * the support to use to download the resource - * @param stable - * TRUE for more stable resources, FALSE when they often change - * - * @return the opened resource, NOT NULL - * - * @throws IOException - * in case of I/O error - */ - public InputStream open(URL url, BasicSupport support, boolean stable) - throws IOException { - // MUST NOT return null - return open(url, support, stable, url); - } - - /** - * Open a resource (will load it from the cache if possible, or save it into - * the cache after downloading if not). - *

- * The cached resource will be assimilated to the given original {@link URL} - * - * @param url - * the resource to open - * @param support - * the support to use to download the resource - * @param stable - * TRUE for more stable resources, FALSE when they often change - * @param originalUrl - * the original {@link URL} used to locate the cached resource - * - * @return the opened resource, NOT NULL - * - * @throws IOException - * in case of I/O error - */ - public InputStream open(URL url, BasicSupport support, boolean stable, - URL originalUrl) throws IOException { - // MUST NOT return null - try { - InputStream in = load(originalUrl, false, stable); - Instance.trace("Cache " + (in != null ? "hit" : "miss") + ": " - + url); - - if (in == null) { - - try { - save(url, support, originalUrl); - } catch (IOException e) { - throw new IOException("Cannot save the url: " - + (url == null ? "null" : url.toString()), e); - } - - // Was just saved, can load old, so, will not be null - in = load(originalUrl, true, stable); - } - - return in; - } catch (IOException e) { - throw new IOException("Cannot open the url: " - + (url == null ? "null" : url.toString()), e); - } - } - - /** - * Open the given {@link URL} without using the cache, but still using and - * updating the cookies. - * - * @param url - * the {@link URL} to open - * @param support - * the {@link BasicSupport} used for the cookies - * - * @return the {@link InputStream} of the opened page - * - * @throws IOException - * in case of I/O error - */ - public InputStream openNoCache(URL url, BasicSupport support) - throws IOException { - return openNoCache(url, support, url, null, null, null); - } - - /** - * Open the given {@link URL} without using the cache, but still using and - * updating the cookies. - * - * @param url - * the {@link URL} to open - * @param support - * the {@link BasicSupport} used for the cookies - * @param postParams - * the POST parameters - * @param getParams - * the GET parameters (priority over POST) - * @param oauth - * OAuth authorization (aka, "bearer XXXXXXX") - * - * @return the {@link InputStream} of the opened page - * - * @throws IOException - * in case of I/O error - */ - public InputStream openNoCache(URL url, BasicSupport support, - Map postParams, Map getParams, - String oauth) throws IOException { - return openNoCache(url, support, url, postParams, getParams, oauth); - } - - /** - * Open the given {@link URL} without using the cache, but still using and - * updating the cookies. - * - * @param url - * the {@link URL} to open - * @param support - * the {@link BasicSupport} used for the cookies - * @param originalUrl - * the original {@link URL} before any redirection occurs - * @param postParams - * the POST parameters - * @param getParams - * the GET parameters (priority over POST) - * @param oauth - * OAuth authorisation (aka, "bearer XXXXXXX") - * @return the {@link InputStream} of the opened page - * - * @throws IOException - * in case of I/O error - */ - private InputStream openNoCache(URL url, BasicSupport support, - final URL originalUrl, Map postParams, - Map getParams, String oauth) throws IOException { - - Instance.trace("Open no cache: " + url); - - URLConnection conn = openConnectionWithCookies(url, support); - if (support != null) { - // priority: arguments - if (oauth == null) { - oauth = support.getOAuth(); - } - } - - // Priority: GET over POST - Map params = getParams; - if (getParams == null) { - params = postParams; - } - - if ((params != null || oauth != null) - && conn instanceof HttpURLConnection) { - StringBuilder requestData = null; - if (params != null) { - requestData = new StringBuilder(); - for (Map.Entry param : params.entrySet()) { - if (requestData.length() != 0) - requestData.append('&'); - requestData.append(URLEncoder.encode(param.getKey(), - "UTF-8")); - requestData.append('='); - requestData.append(URLEncoder.encode( - String.valueOf(param.getValue()), "UTF-8")); - } - - conn.setDoOutput(true); - - if (getParams == null && postParams != null) { - ((HttpURLConnection) conn).setRequestMethod("POST"); - } - - conn.setRequestProperty("Content-Type", - "application/x-www-form-urlencoded"); - conn.setRequestProperty("charset", "utf-8"); - } - - if (oauth != null) { - conn.setRequestProperty("Authorization", oauth); - } - - if (requestData != null) { - OutputStreamWriter writer = new OutputStreamWriter( - conn.getOutputStream()); - - writer.write(requestData.toString()); - writer.flush(); - writer.close(); - } - } - - conn.connect(); - - // Check if redirect - if (conn instanceof HttpURLConnection - && ((HttpURLConnection) conn).getResponseCode() / 100 == 3) { - String newUrl = conn.getHeaderField("Location"); - return openNoCache(new URL(newUrl), support, originalUrl, - postParams, getParams, oauth); - } - - InputStream in = conn.getInputStream(); - if ("gzip".equals(conn.getContentEncoding())) { - in = new GZIPInputStream(in); - } - - return in; - } - - /** - * Refresh the resource into cache if needed. - * - * @param url - * the resource to open - * @param support - * the support to use to download the resource - * @param stable - * TRUE for more stable resources, FALSE when they often change - * - * @throws IOException - * in case of I/O error - */ - public void refresh(URL url, BasicSupport support, boolean stable) - throws IOException { - File cached = getCached(url); - if (cached.exists() && !isOld(cached, stable)) { - return; - } - - open(url, support, stable).close(); - } - - /** - * Check the resource to see if it is in the cache. - * - * @param url - * the resource to check - * - * @return TRUE if it is - * - */ - public boolean check(URL url) { - return getCached(url).exists(); - } - - /** - * Save the given resource as an image on disk using the default image - * format for content. - * - * @param url - * the resource - * @param target - * the target file - * - * @throws IOException - * in case of I/O error - */ - public void saveAsImage(URL url, File target) throws IOException { - URL cachedUrl = new URL(url.toString()); - File cached = getCached(cachedUrl); - - if (!cached.exists() || isOld(cached, true)) { - InputStream imageIn = open(url, null, true); - ImageIO.write(ImageUtils.fromStream(imageIn), Instance.getConfig() - .getString(Config.IMAGE_FORMAT_CONTENT).toLowerCase(), - cached); - } - - IOUtils.write(new FileInputStream(cached), target); - } - - /** - * Manually add this item to the cache. - * - * @param in - * the input data - * @param uniqueID - * a unique ID for this resource - * - * @return the resulting {@link File} - * - * @throws IOException - * in case of I/O error - */ - public File addToCache(InputStream in, String uniqueID) throws IOException { - File file = getCached(uniqueID); - File subdir = new File(file.getParentFile(), "_"); - file = new File(subdir, file.getName()); - subdir.mkdir(); - IOUtils.write(in, file); - return file; - } - - /** - * Return the {@link InputStream} corresponding to the given unique ID, or - * NULL if none found. - * - * @param uniqueID - * the unique ID - * - * @return the content or NULL - */ - public InputStream getFromCache(String uniqueID) { - File file = getCached(uniqueID); - File subdir = new File(file.getParentFile(), "_"); - file = new File(subdir, file.getName()); - if (file.exists()) { - try { - return new MarkableFileInputStream(new FileInputStream(file)); - } catch (FileNotFoundException e) { - } - } - - return null; - } - - /** - * Clean the cache (delete the cached items). - * - * @param onlyOld - * only clean the files that are considered too old - * - * @return the number of cleaned items - */ - public int cleanCache(boolean onlyOld) { - return cleanCache(onlyOld, dir); - } - - /** - * Clean the cache (delete the cached items) in the given cache directory. - * - * @param onlyOld - * only clean the files that are considered too old - * @param cacheDir - * the cache directory to clean - * - * @return the number of cleaned items - */ - private int cleanCache(boolean onlyOld, File cacheDir) { - int num = 0; - for (File file : cacheDir.listFiles()) { - if (file.isDirectory()) { - num += cleanCache(onlyOld, file); - } else { - if (!onlyOld || isOld(file, true)) { - if (file.delete()) { - num++; - } else { - System.err.println("Cannot delete temporary file: " - + file.getAbsolutePath()); - } - } - } - } - - return num; - } - - /** - * Open a resource from the cache if it exists. - * - * @param url - * the resource to open - * @param allowTooOld - * allow files even if they are considered too old - * @param stable - * a stable file (that dones't change too often) -- parameter - * used to check if the file is too old to keep or not - * - * @return the opened resource if found, NULL i not - * - * @throws IOException - * in case of I/O error - */ - private InputStream load(URL url, boolean allowTooOld, boolean stable) - throws IOException { - File cached = getCached(url); - if (cached.exists() && (allowTooOld || !isOld(cached, stable))) { - return new MarkableFileInputStream(new FileInputStream(cached)); - } - - return null; - } - - /** - * Save the given resource to the cache. - * - * @param url - * the resource - * @param support - * the {@link BasicSupport} used to download it - * @param originalUrl - * the original {@link URL} used to locate the cached resource - * - * @throws IOException - * in case of I/O error - */ - private void save(URL url, BasicSupport support, URL originalUrl) - throws IOException { - InputStream in = openNoCache(url, support, originalUrl, null, null, - null); - try { - File cached = getCached(originalUrl); - BufferedOutputStream out = new BufferedOutputStream( - new FileOutputStream(cached)); - try { - byte[] buf = new byte[4096]; - int len; - while ((len = in.read(buf)) > 0) { - out.write(buf, 0, len); - } - } finally { - out.close(); - } - } finally { - in.close(); - } - } - - /** - * Open a connection on the given {@link URL}, and manage the cookies that - * come with it. - * - * @param url - * the {@link URL} to open - * @param support - * the {@link BasicSupport} to use for cookie generation - * - * @return the connection - * - * @throws IOException - * in case of I/O error - */ - private URLConnection openConnectionWithCookies(URL url, - BasicSupport support) throws IOException { - URLConnection conn = url.openConnection(); - - conn.setRequestProperty("User-Agent", UA); - conn.setRequestProperty("Cookie", generateCookies(support)); - conn.setRequestProperty("Accept-Encoding", "gzip"); - if (support != null && support.getCurrentReferer() != null) { - conn.setRequestProperty("Referer", support.getCurrentReferer() - .toString()); - conn.setRequestProperty("Host", support.getCurrentReferer() - .getHost()); - } - - return conn; - } - - /** - * Check if the {@link File} is too old according to - * {@link Cache#tooOldChanging}. - * - * @param file - * the file to check - * @param stable - * TRUE to denote files that are not supposed to change too often - * - * @return TRUE if it is - */ - private boolean isOld(File file, boolean stable) { - long max = tooOldChanging; - if (stable) { - max = tooOldStable; - } - - if (max < 0) { - return false; - } - - long time = new Date().getTime() - file.lastModified(); - if (time < 0) { - System.err.println("Timestamp in the future for file: " - + file.getAbsolutePath()); - } - - return time < 0 || time > max; - } - - /** - * Return the associated cache {@link File} from this {@link URL}. - * - * @param url - * the url - * - * @return the cached {@link File} version of this {@link URL} - */ - private File getCached(URL url) { - File subdir = null; - - String name = url.getHost(); - if (name == null || name.isEmpty()) { - name = url.getFile(); - } else { - File cacheDir = getCached(".").getParentFile(); - File subsubDir = new File(cacheDir, allowedChars(url.getHost())); - subdir = new File(subsubDir, "_" + allowedChars(url.getPath())); - name = allowedChars("_" + url.getQuery()); - } - - File cacheFile = getCached(name); - if (subdir != null) { - cacheFile = new File(subdir, cacheFile.getName()); - subdir.mkdirs(); - } - - return cacheFile; - } - - /** - * Get the basic cache resource file corresponding to this unique ID. - *

- * Note that you may need to add a sub-directory in some cases. - * - * @param uniqueID - * the id - * - * @return the cached version if present, NULL if not - */ - private File getCached(String uniqueID) { - return new File(dir, allowedChars(uniqueID)); - } - - /** - * Replace not allowed chars (in a {@link File}) by "_". - * - * @param raw - * the raw {@link String} - * - * @return the sanitised {@link String} - */ - private String allowedChars(String raw) { - return raw.replace('/', '_').replace(':', '_').replace("\\", "_"); - } - - /** - * Generate the cookie {@link String} from the local {@link CookieStore} so - * it is ready to be passed. - * - * @return the cookie - */ - private String generateCookies(BasicSupport support) { - StringBuilder builder = new StringBuilder(); - for (HttpCookie cookie : cookies.getCookieStore().getCookies()) { - if (builder.length() > 0) { - builder.append(';'); - } - - // TODO: check if format is ok - builder.append(cookie.toString()); - } - - if (support != null) { - for (Map.Entry set : support.getCookies() - .entrySet()) { - if (builder.length() > 0) { - builder.append(';'); - } - builder.append(set.getKey()); - builder.append('='); - builder.append(set.getValue()); - } - } - - return builder.toString(); - } -} diff --git a/src/be/nikiroo/fanfix/DataLoader.java b/src/be/nikiroo/fanfix/DataLoader.java new file mode 100644 index 00000000..ef115c9d --- /dev/null +++ b/src/be/nikiroo/fanfix/DataLoader.java @@ -0,0 +1,280 @@ +package be.nikiroo.fanfix; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Map; + +import javax.imageio.ImageIO; + +import be.nikiroo.fanfix.bundles.Config; +import be.nikiroo.fanfix.supported.BasicSupport; +import be.nikiroo.utils.Cache; +import be.nikiroo.utils.Downloader; +import be.nikiroo.utils.ImageUtils; + +/** + * This cache will manage Internet (and local) downloads, as well as put the + * downloaded files into a cache. + *

+ * As long the cached resource is not too old, it will use it instead of + * retrieving the file again. + * + * @author niki + */ +public class DataLoader { + private Cache cache; + private Downloader downloader; + + /** + * Create a new {@link DataLoader} object. + * + * @param dir + * the directory to use as cache + * @param UA + * the User-Agent to use to download the resources + * @param hoursChanging + * the number of hours after which a cached file that is thought + * to change ~often is considered too old (or -1 for + * "never too old") + * @param hoursStable + * the number of hours after which a LARGE cached file that is + * thought to change rarely is considered too old (or -1 for + * "never too old") + * + * @throws IOException + * in case of I/O error + */ + public DataLoader(File dir, String UA, int hoursChanging, int hoursStable) + throws IOException { + cache = new Cache(dir, hoursChanging, hoursStable); + downloader = new Downloader(UA); + } + + /** + * Open a resource (will load it from the cache if possible, or save it into + * the cache after downloading if not). + * + * @param url + * the resource to open + * @param support + * the support to use to download the resource + * @param stable + * TRUE for more stable resources, FALSE when they often change + * + * @return the opened resource, NOT NULL + * + * @throws IOException + * in case of I/O error + */ + public InputStream open(URL url, BasicSupport support, boolean stable) + throws IOException { + // MUST NOT return null + return open(url, support, stable, url); + } + + /** + * Open a resource (will load it from the cache if possible, or save it into + * the cache after downloading if not). + *

+ * The cached resource will be assimilated to the given original {@link URL} + * + * @param url + * the resource to open + * @param support + * the support to use to download the resource + * @param stable + * TRUE for more stable resources, FALSE when they often change + * @param originalUrl + * the original {@link URL} used to locate the cached resource + * + * @return the opened resource, NOT NULL + * + * @throws IOException + * in case of I/O error + */ + public InputStream open(URL url, BasicSupport support, boolean stable, + URL originalUrl) throws IOException { + // MUST NOT return null + try { + InputStream in = cache.load(originalUrl, false, stable); + Instance.trace("Cache " + (in != null ? "hit" : "miss") + ": " + + url); + + if (in == null) { + try { + in = openNoCache(url, support, null, null, null); + cache.save(in, originalUrl); + // ..But we want a resetable stream + in.close(); + in = cache.load(originalUrl, false, stable); + } catch (IOException e) { + throw new IOException("Cannot save the url: " + + (url == null ? "null" : url.toString()), e); + } + } + + return in; + } catch (IOException e) { + throw new IOException("Cannot open the url: " + + (url == null ? "null" : url.toString()), e); + } + } + + /** + * Open the given {@link URL} without using the cache, but still update the + * cookies. + * + * @param url + * the {@link URL} to open + * + * @return the {@link InputStream} of the opened page + * + * @throws IOException + * in case of I/O error + */ + public InputStream openNoCache(URL url) throws IOException { + return downloader.open(url); + } + + /** + * Open the given {@link URL} without using the cache, but still using and + * updating the cookies. + * + * @param url + * the {@link URL} to open + * @param support + * the {@link BasicSupport} used for the cookies + * @param postParams + * the POST parameters + * @param getParams + * the GET parameters (priority over POST) + * @param oauth + * OAuth authorization (aka, "bearer XXXXXXX") + * + * @return the {@link InputStream} of the opened page + * + * @throws IOException + * in case of I/O error + */ + public InputStream openNoCache(URL url, BasicSupport support, + Map postParams, Map getParams, + String oauth) throws IOException { + + Map cookiesValues = null; + URL currentReferer = url; + if (support != null) { + cookiesValues = support.getCookies(); + currentReferer = support.getCurrentReferer(); + // priority: arguments + if (oauth == null) { + oauth = support.getOAuth(); + } + } + + return downloader.open(url, currentReferer, cookiesValues, postParams, + getParams, oauth); + } + + /** + * Refresh the resource into cache if needed. + * + * @param url + * the resource to open + * @param support + * the support to use to download the resource + * @param stable + * TRUE for more stable resources, FALSE when they often change + * + * @throws IOException + * in case of I/O error + */ + public void refresh(URL url, BasicSupport support, boolean stable) + throws IOException { + if (!cache.check(url, false, stable)) { + open(url, support, stable).close(); + } + } + + /** + * Check the resource to see if it is in the cache. + * + * @param url + * the resource to check + * @param stable + * a stable file (that dones't change too often) -- parameter + * used to check if the file is too old to keep or not + * + * @return TRUE if it is + * + */ + public boolean check(URL url, boolean stable) { + return cache.check(url, false, stable); + } + + /** + * Save the given resource as an image on disk using the default image + * format for content. + * + * @param url + * the resource + * @param target + * the target file + * + * @throws IOException + * in case of I/O error + */ + public void saveAsImage(URL url, File target) throws IOException { + InputStream in = open(url, null, true); + try { + ImageIO.write(ImageUtils.fromStream(in), Instance.getConfig() + .getString(Config.IMAGE_FORMAT_CONTENT).toLowerCase(), + target); + } finally { + in.close(); + } + } + + /** + * Manually add this item to the cache. + * + * @param in + * the input data + * @param uniqueID + * a unique ID for this resource + * + * @return the resulting {@link File} + * + * @throws IOException + * in case of I/O error + */ + public File addToCache(InputStream in, String uniqueID) throws IOException { + return cache.save(in, uniqueID); + } + + /** + * Return the {@link InputStream} corresponding to the given unique ID, or + * NULL if none found. + * + * @param uniqueID + * the unique ID + * + * @return the content or NULL + */ + public InputStream getFromCache(String uniqueID) { + return cache.load(uniqueID, true, true); + } + + /** + * Clean the cache (delete the cached items). + * + * @param onlyOld + * only clean the files that are considered too old + * + * @return the number of cleaned items + */ + public int cleanCache(boolean onlyOld) { + return cache.clean(onlyOld); + } +} diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java index 4cf6e861..14977822 100644 --- a/src/be/nikiroo/fanfix/Instance.java +++ b/src/be/nikiroo/fanfix/Instance.java @@ -59,7 +59,7 @@ public class Instance { private static ConfigBundle config; private static UiConfigBundle uiconfig; private static StringIdBundle trans; - private static Cache cache; + private static DataLoader cache; private static LocalLibrary lib; private static boolean debug; private static boolean trace; @@ -160,7 +160,7 @@ public class Instance { int hoursLarge = config .getInteger(Config.CACHE_MAX_TIME_STABLE, -1); - cache = new Cache(tmp, ua, hours, hoursLarge); + cache = new DataLoader(tmp, ua, hours, hoursLarge); } catch (IOException e) { syserr(new IOException( "Cannot create cache (will continue without cache)", e)); @@ -186,11 +186,11 @@ public class Instance { } /** - * Get the (unique) {@link Cache} for the program. + * Get the (unique) {@link DataLoader} for the program. * - * @return the {@link Cache} + * @return the {@link DataLoader} */ - public static Cache getCache() { + public static DataLoader getCache() { return cache; } diff --git a/src/be/nikiroo/fanfix/VersionCheck.java b/src/be/nikiroo/fanfix/VersionCheck.java index 7f8d1a06..93244958 100644 --- a/src/be/nikiroo/fanfix/VersionCheck.java +++ b/src/be/nikiroo/fanfix/VersionCheck.java @@ -108,8 +108,7 @@ public class VersionCheck { if (Instance.isVersionCheckNeeded()) { try { - InputStream in = Instance.getCache().openNoCache(new URL(url), - null); + InputStream in = Instance.getCache().openNoCache(new URL(url)); BufferedReader reader = new BufferedReader( new InputStreamReader(in, "UTF-8")); try { diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java index e6089eb0..fb261fb3 100644 --- a/src/be/nikiroo/fanfix/supported/BasicSupport.java +++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java @@ -941,7 +941,8 @@ public abstract class BasicSupport { // try for URLs try { for (String ext : getImageExt(true)) { - if (Instance.getCache().check(new URL(line + ext))) { + if (Instance.getCache() + .check(new URL(line + ext), true)) { url = new URL(line + ext); break; } -- 2.27.0