mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* cleanup

This commit is contained in:
Reinhard Pointner 2015-11-04 09:03:09 +00:00
parent a2c84e22dc
commit af511aef7a
5 changed files with 3 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,10 +17,6 @@ public class CachedJsonResource extends AbstractCachedResource<String, String> {
super(resource, String.class, ONE_DAY, 2, 1000);
}
public CachedJsonResource(String resource, long expirationTime, int retryCountLimit, long retryWaitTime) {
super(resource, String.class, expirationTime, retryCountLimit, retryWaitTime);
}
@Override
protected Cache getCache() {
return CacheManager.getInstance().getCache("web-datasource-lv3");

38
source/net/filebot/web/CachedPage.java
View File

@ -1,38 +0,0 @@
package net.filebot.web;
import static net.filebot.util.FileUtilities.*;
import static net.filebot.web.WebRequest.*;
import java.io.IOException;
import java.io.Reader;
import java.net.URL;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
public class CachedPage extends AbstractCachedResource<String, String> {
public CachedPage(URL url) {
super(url.toString(), String.class, ONE_DAY, 0, 0); // 24h update interval
}
@Override
protected Cache getCache() {
return CacheManager.getInstance().getCache("web-datasource");
}
@Override
public String process(String data) throws Exception {
return data;
}
@Override
protected String fetchData(URL url, long lastModified) throws IOException {
return readAll(openConnection(url));
}
protected Reader openConnection(URL url) throws IOException {
return getReader(url.openConnection());
}
}

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

@ -10,10 +10,6 @@ import net.sf.ehcache.CacheManager;
public abstract class CachedResource<T extends Serializable> extends AbstractCachedResource<ByteBuffer, T> {
public CachedResource(String resource, Class<T> type) {
this(resource, type, Long.MAX_VALUE);
}
public CachedResource(String resource, Class<T> type, long expirationTime) {
this(resource, type, expirationTime, 2, 1000); // 3 retries in 1s intervals by default
}

8
source/net/filebot/web/CachedXmlResource.java
View File

@ -4,7 +4,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.net.URL;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import javax.xml.parsers.SAXParserFactory;
@ -23,10 +23,6 @@ public class CachedXmlResource extends AbstractCachedResource<String, String> {
super(resource, String.class, ONE_DAY, 2, 1000);
}
public CachedXmlResource(String resource, long expirationTime, int retryCountLimit, long retryWaitTime) {
super(resource, String.class, expirationTime, retryCountLimit, retryWaitTime);
}
@Override
protected Cache getCache() {
return CacheManager.getInstance().getCache("web-datasource-lv3");
@ -65,7 +61,7 @@ public class CachedXmlResource extends AbstractCachedResource<String, String> {
if (data == null)
return null; // not modified
return Charset.forName("UTF-8").decode(data).toString();
return StandardCharsets.UTF_8.decode(data).toString();
}
}

2
source/net/filebot/web/FanartTVClient.java
View File

@ -38,7 +38,7 @@ public class FanartTVClient {
String resource = getResource(category, id);
// cache results
CachedResource<FanartDescriptor[]> data = new CachedResource<FanartDescriptor[]>(resource, FanartDescriptor[].class) {
CachedResource<FanartDescriptor[]> data = new CachedResource<FanartDescriptor[]>(resource, FanartDescriptor[].class, CachedResource.ONE_WEEK) {
@Override
public FanartDescriptor[] process(ByteBuffer data) throws Exception {