git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix cache dir for new remote libs
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
supported
/
FimfictionApi.java
diff --git
a/src/be/nikiroo/fanfix/supported/FimfictionApi.java
b/src/be/nikiroo/fanfix/supported/FimfictionApi.java
index c97ecf7d3e9ea2ff8a7cc782eea5bca660f9f265..43d01d19494f616c6811e5757da4a6f2e14c83cc 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/FimfictionApi.java
+++ b/
src/be/nikiroo/fanfix/supported/FimfictionApi.java
@@
-37,22
+37,17
@@
class FimfictionApi extends BasicSupport {
private Map<Integer, String> chapterContents;
public FimfictionApi() throws IOException {
private Map<Integer, String> chapterContents;
public FimfictionApi() throws IOException {
- if (Instance.getConfig().getBoolean(
- Config.LOGIN_FIMFICTION_APIKEY_FORCE_HTML, false)) {
- throw new IOException(
- "Configuration is set to force HTML scrapping");
+ if (Instance.getInstance().getConfig().getBoolean(Config.LOGIN_FIMFICTION_APIKEY_FORCE_HTML, false)) {
+ throw new IOException("Configuration is set to force HTML scrapping");
}
}
- String oauth = Instance.getConfig().getString(
- Config.LOGIN_FIMFICTION_APIKEY_TOKEN);
+ String oauth = Instance.getInstance().getConfig().getString(Config.LOGIN_FIMFICTION_APIKEY_TOKEN);
if (oauth == null || oauth.isEmpty()) {
if (oauth == null || oauth.isEmpty()) {
- String clientId = Instance.getConfig().getString(
- Config.LOGIN_FIMFICTION_APIKEY_CLIENT_ID)
- + "";
- String clientSecret = Instance.getConfig().getString(
- Config.LOGIN_FIMFICTION_APIKEY_CLIENT_SECRET)
+ String clientId = Instance.getInstance().getConfig().getString(Config.LOGIN_FIMFICTION_APIKEY_CLIENT_ID)
+ "";
+ "";
+ String clientSecret = Instance.getInstance().getConfig()
+ .getString(Config.LOGIN_FIMFICTION_APIKEY_CLIENT_SECRET) + "";
if (clientId.trim().isEmpty() || clientSecret.trim().isEmpty()) {
throw new IOException("API key required for the beta API v2");
if (clientId.trim().isEmpty() || clientSecret.trim().isEmpty()) {
throw new IOException("API key required for the beta API v2");
@@
-60,9
+55,8
@@
class FimfictionApi extends BasicSupport {
oauth = generateOAuth(clientId, clientSecret);
oauth = generateOAuth(clientId, clientSecret);
- Instance.getConfig().setString(
- Config.LOGIN_FIMFICTION_APIKEY_TOKEN, oauth);
- Instance.getConfig().updateFile();
+ Instance.getInstance().getConfig().setString(Config.LOGIN_FIMFICTION_APIKEY_TOKEN, oauth);
+ Instance.getInstance().getConfig().updateFile();
}
this.oauth = oauth;
}
this.oauth = oauth;
@@
-116,7
+110,7
@@
class FimfictionApi extends BasicSupport {
urlString = urlString.replace("[", "%5B").replace("]", "%5D");
URL url = new URL(urlString);
urlString = urlString.replace("[", "%5B").replace("]", "%5D");
URL url = new URL(urlString);
- InputStream jsonIn = Instance.getCache().open(url, this, false);
+ InputStream jsonIn = Instance.get
Instance().get
Cache().open(url, this, false);
try {
return IOUtils.readSmallStream(jsonIn);
} finally {
try {
return IOUtils.readSmallStream(jsonIn);
} finally {
@@
-130,7
+124,8
@@
class FimfictionApi extends BasicSupport {
meta.setTitle(getKeyJson(json, 0, "type", "story", "title"));
meta.setAuthor(getKeyJson(json, 0, "type", "user", "name"));
meta.setTitle(getKeyJson(json, 0, "type", "story", "title"));
meta.setAuthor(getKeyJson(json, 0, "type", "user", "name"));
- meta.setDate(getKeyJson(json, 0, "type", "story", "date_published"));
+ meta.setDate(bsHelper.formatDate(
+ getKeyJson(json, 0, "type", "story", "date_published")));
meta.setTags(getTags());
meta.setSource(getType().getSourceName());
meta.setUrl(getSource().toString());
meta.setTags(getTags());
meta.setSource(getType().getSourceName());
meta.setUrl(getSource().toString());
@@
-150,17
+145,15
@@
class FimfictionApi extends BasicSupport {
// No need to use the oauth, cookies... for the cover
// Plus: it crashes on Android because of the referer
try {
// No need to use the oauth, cookies... for the cover
// Plus: it crashes on Android because of the referer
try {
- InputStream in = Instance.getCache().open(coverImageUrl, null,
- true);
+ InputStream in = Instance.getInstance().getCache().open(coverImageUrl, null, true);
try {
meta.setCover(new Image(in));
} finally {
in.close();
}
} catch (IOException e) {
try {
meta.setCover(new Image(in));
} finally {
in.close();
}
} catch (IOException e) {
- Instance.getTraceHandler().error(
- new IOException(
- "Cannot get the story cover, ignoring...", e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException("Cannot get the story cover, ignoring...", e));
}
}
}
}
@@
-258,8
+251,7
@@
class FimfictionApi extends BasicSupport {
params.put("client_id", clientId);
params.put("client_secret", clientSecret);
params.put("grant_type", "client_credentials");
params.put("client_id", clientId);
params.put("client_secret", clientSecret);
params.put("grant_type", "client_credentials");
- InputStream in = Instance.getCache().openNoCache(url, null, params,
- null, null);
+ InputStream in = Instance.getInstance().getCache().openNoCache(url, null, params, null, null);
String jsonToken = IOUtils.readSmallStream(in);
in.close();
String jsonToken = IOUtils.readSmallStream(in);
in.close();