moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-24 08:48:51 -05:00
Code Issues Releases Wiki Activity

Fix ETag handling

Browse Source
This commit is contained in:
Reinhard Pointner 2016-03-11 19:52:41 +00:00
parent b8f596c064
commit ee11696457
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/net/filebot/CachedResource.java
View File

@ -188,15 +188,16 @@ public class CachedResource<K, R> implements Resource<R> {
try { try {
debug.fine(WebRequest.log(url, lastModified, etagValue)); debug.fine(WebRequest.log(url, lastModified, etagValue));
if (etagValue != null) { if (etagValue != null) {
return WebRequest.fetchIfNoneMatch(url, etagValue); return WebRequest.fetch(url, 0, etagValue, null, responseHeaders);
} else { } else {
return WebRequest.fetchIfModified(url, lastModified); return WebRequest.fetch(url, lastModified, null, null, responseHeaders);
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
return fileNotFound(url, e); return fileNotFound(url, e);
} finally { } finally {
List<String> value = responseHeaders.get("ETag"); List<String> value = responseHeaders.get("ETag");
if (value != null && value.size() > 0 && !value.contains(etagValue)) { if (value != null && value.size() > 0 && !value.contains(etagValue)) {
debug.finest(format("Store ETag: %s", value));
etagStorage.put(etagKey, value.get(0)); etagStorage.put(etagKey, value.get(0));
} }
} }

4
source/net/filebot/web/WebRequest.java
View File

@ -110,10 +110,6 @@ public final class WebRequest {
return fetch(resource, ifModifiedSince, null, null, null); return fetch(resource, ifModifiedSince, null, null, null);
} }
public static ByteBuffer fetchIfNoneMatch(URL resource, Object etag) throws IOException {
return fetch(resource, 0, etag, null, null);
}
public static ByteBuffer fetch(URL url, long ifModifiedSince, Object etag, Map<String, String> requestParameters, Map<String, List<String>> responseParameters) throws IOException { public static ByteBuffer fetch(URL url, long ifModifiedSince, Object etag, Map<String, String> requestParameters, Map<String, List<String>> responseParameters) throws IOException {
URLConnection connection = url.openConnection(); URLConnection connection = url.openConnection();