git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
e621: fix order for pools
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
supported
/
E621.java
diff --git
a/src/be/nikiroo/fanfix/supported/E621.java
b/src/be/nikiroo/fanfix/supported/E621.java
index 94010a73ae4b61165598b35b4f7ff8743b4b2e41..de754c8b843da881bf1e34419a7491997ac8d201 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/E621.java
+++ b/
src/be/nikiroo/fanfix/supported/E621.java
@@
-106,7
+106,11
@@
class E621 extends BasicSupport {
} else if (isSearchOrSet(getSource())) {
String baseUrl = "https://e621.net/posts/?page=";
String search = "&tags=" + getTagsFromUrl(getSource());
} else if (isSearchOrSet(getSource())) {
String baseUrl = "https://e621.net/posts/?page=";
String search = "&tags=" + getTagsFromUrl(getSource());
- return getChapters(getSource(), pg, baseUrl, search);
+ // sets are sorted in reverse order on the website
+ List<Entry<String, URL>> urls = getChapters(getSource(), pg,
+ baseUrl, search);
+ Collections.reverse(urls);
+ return urls;
}
return new LinkedList<Entry<String, URL>>();
}
return new LinkedList<Entry<String, URL>>();
@@
-123,7
+127,7
@@
class E621 extends BasicSupport {
for (int i = 1; true; i++) {
URL url = new URL(baseUrl + i + parameters);
try {
for (int i = 1; true; i++) {
URL url = new URL(baseUrl + i + parameters);
try {
- InputStream pageI = Instance.getCache().open(url, this, false);
+ InputStream pageI = Instance.get
Instance().get
Cache().open(url, this, false);
try {
if (IOUtils.readSmallStream(pageI).contains("Nobody here but us chickens!")) {
break;
try {
if (IOUtils.readSmallStream(pageI).contains("Nobody here but us chickens!")) {
break;
@@
-137,8
+141,6
@@
class E621 extends BasicSupport {
}
}
}
}
- // They are sorted in reverse order on the website
- Collections.reverse(urls);
return urls;
}
return urls;
}
@@
-159,7
+161,7
@@
class E621 extends BasicSupport {
protected URL getCanonicalUrl(URL source) {
if (isSetOriginalUrl(source)) {
try {
protected URL getCanonicalUrl(URL source) {
if (isSetOriginalUrl(source)) {
try {
- Document doc = DataUtil.load(Instance.getCache().open(source, this, false), "UTF-8", source.toString());
+ Document doc = DataUtil.load(Instance.get
Instance().get
Cache().open(source, this, false), "UTF-8", source.toString());
for (Element shortname : doc.getElementsByClass("set-shortname")) {
for (Element el : shortname.getElementsByTag("a")) {
if (!el.attr("href").isEmpty())
for (Element shortname : doc.getElementsByClass("set-shortname")) {
for (Element el : shortname.getElementsByTag("a")) {
if (!el.attr("href").isEmpty())
@@
-167,7
+169,7
@@
class E621 extends BasicSupport {
}
}
} catch (IOException e) {
}
}
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
}
}
}