From: Niki Roo <niki@nikiroo.be>
Date: Fri, 1 May 2020 10:56:58 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=86d83218623fe9b297f1f03e0fc247dc2ede95b0;hp=405ba34f06efbe7936306fe758def4bc8391c698

Merge branch 'subtree'
---

diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index 39bbe86..2b7e54d 100644
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -173,6 +173,25 @@ class E621 extends BasicSupport {
 
 	@Override
 	protected URL getCanonicalUrl(URL source) {
+		// Convert search-pools into proper pools
+		if (source.getPath().equals("/posts") && source.getQuery() != null
+				&& source.getQuery().startsWith("tags=pool%3A")) {
+			String poolNumber = source.getQuery()
+					.substring("tags=pool%3A".length());
+			try {
+				Integer.parseInt(poolNumber);
+				String base = source.getProtocol() + "://" + source.getHost();
+				if (source.getPort() != -1) {
+					base = base + ":" + source.getPort();
+				}
+				source = new URL(base + "/posts/" + poolNumber);
+			} catch (NumberFormatException e) {
+				// Not a simple ppol, skip
+			} catch (MalformedURLException e) {
+				// Cannot happen
+			}
+		}
+		
 		if (isSetOriginalUrl(source)) {
 			try {
 				Document doc = DataUtil.load(Instance.getInstance().getCache().open(source, this, false), "UTF-8", source.toString());