e621: fix detection of "?tags" urls

[fanfix.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 407ec70ee996123e2b759e2169802fb86cfec63a..aa9c8af1ee26690cdd86429a911d2b1b7a2d9fa3 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -3,14 +3,14 @@ package be.nikiroo.fanfix.supported;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.util.AbstractMap;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.AbstractMap.SimpleEntry;
 import java.util.Map.Entry;
 import java.util.Scanner;
 
@@ -284,8 +284,8 @@ class E621 extends BasicSupport_Deprecated {
                                try {
                                        if (getLine(pageI, "No posts matched your search.", 0) != null)
                                                break;
-                                       urls.add(new AbstractMap.SimpleEntry<String, URL>(Integer
-                                                       .toString(i), url));
+                                       urls.add(new AbstractMap.SimpleEntry<String, URL>("Page "
+                                                       + Integer.toString(i), url));
                                } finally {
                                        pageI.close();
                                }
@@ -294,6 +294,8 @@ class E621 extends BasicSupport_Deprecated {
                        }
                }
 
+               // They are sorted in reverse order on the website
+               Collections.reverse(urls);
                return urls;
        }
 
@@ -371,11 +373,33 @@ class E621 extends BasicSupport_Deprecated {
                return builder.toString();
        }
 
+       @Override
+       protected URL getCanonicalUrl(URL source) {
+               if (isSearch(source)) {
+                       // /post?tags=tag1+tag2 -> ../post/index/1/tag1%32tag2
+                       String key = "post?tags=";
+                       if (source.toString().contains(key)) {
+                               int pos = source.toString().indexOf(key);
+                               String tags = source.toString().substring(pos + key.length());
+                               tags = tags.replace("+", "%20");
+                               try {
+                                       return new URL(source.toString().substring(0, pos)
+                                                       + "post/index/1/" + tags);
+                               } catch (MalformedURLException e) {
+                                       Instance.getTraceHandler().error(e);
+                               }
+                       }
+               }
+               return super.getCanonicalUrl(source);
+       }
+
        private boolean isPool(URL url) {
                return url.getPath().startsWith("/pool/");
        }
 
        private boolean isSearch(URL url) {
-               return url.getPath().startsWith("/post/index/");
+               return url.getPath().startsWith("/post/index/")
+                               || (url.getPath().equals("/post/search") && url.getQuery()
+                                               .startsWith("tags="));
        }
 }