Better URL entries + fix for FimFicAPI:

[fanfix.git] / src / be / nikiroo / fanfix / supported / YiffStar.java

diff --git a/src/be/nikiroo/fanfix/supported/YiffStar.java b/src/be/nikiroo/fanfix/supported/YiffStar.java
index ba24e50708052cf91b3dcfded508c298b17470bf..92d44fe9beaa9f997c6d1375af2f4c332b0ee496 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/YiffStar.java
+++ b/src/be/nikiroo/fanfix/supported/YiffStar.java
@@ -1,10 +1,10 @@
 package be.nikiroo.fanfix.supported;
 
-import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -15,6 +15,7 @@ import java.util.Scanner;
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.StringUtils;
 
@@ -24,7 +25,7 @@ import be.nikiroo.utils.StringUtils;
  * 
  * @author niki
  */
-class YiffStar extends BasicSupport {
+class YiffStar extends BasicSupport_Deprecated {
 
        @Override
        public String getSourceName() {
@@ -44,7 +45,7 @@ class YiffStar extends BasicSupport {
                meta.setPublisher(getSourceName());
                meta.setUuid(source.toString());
                meta.setLuid("");
-               meta.setLang("EN");
+               meta.setLang("en");
                meta.setSubject("Furry");
                meta.setType(getType().toString());
                meta.setImageDocument(false);
@@ -88,24 +89,28 @@ class YiffStar extends BasicSupport {
                        // logged in
                        Instance.getCache()
                                        .openNoCache(new URL("https://www.sofurry.com/user/login"),
-                                                       this, post).close();
+                                                       this, post, null, null).close();
                }
        }
 
        @Override
-       public URL getCanonicalUrl(URL source) throws IOException {
-               if (source.getPath().startsWith("/view")) {
-                       source = new URL(source.toString() + "/guest");
-                       InputStream in = Instance.getCache().open(source, this, false);
-                       String line = getLine(in, "/browse/folder/", 0);
-                       if (line != null) {
-                               String[] tab = line.split("\"");
-                               if (tab.length > 1) {
-                                       String groupUrl = source.getProtocol() + "://"
-                                                       + source.getHost() + tab[1];
-                                       return guest(groupUrl);
+       public URL getCanonicalUrl(URL source) {
+               try {
+                       if (source.getPath().startsWith("/view")) {
+                               source = new URL(source.toString() + "/guest");
+                               InputStream in = Instance.getCache().open(source, this, false);
+                               String line = getLine(in, "/browse/folder/", 0);
+                               if (line != null) {
+                                       String[] tab = line.split("\"");
+                                       if (tab.length > 1) {
+                                               String groupUrl = source.getProtocol() + "://"
+                                                               + source.getHost() + tab[1];
+                                               return guest(groupUrl);
+                                       }
                                }
                        }
+               } catch (Exception e) {
+                       Instance.getTraceHandler().error(e);
                }
 
                return super.getCanonicalUrl(source);
@@ -128,8 +133,7 @@ class YiffStar extends BasicSupport {
                return tags;
        }
 
-       private BufferedImage getCover(URL source, InputStream in)
-                       throws IOException {
+       private Image getCover(URL source, InputStream in) throws IOException {
 
                List<Entry<String, URL>> chaps = getChapters(source, in, null);
                if (!chaps.isEmpty()) {
@@ -203,24 +207,8 @@ class YiffStar extends BasicSupport {
                                                link = source.getProtocol() + "://" + source.getHost()
                                                                + link;
                                        }
-                                       final URL value = guest(link);
-                                       final String key = StringUtils.unhtml(line).trim();
-                                       urls.add(new Entry<String, URL>() {
-                                               @Override
-                                               public URL setValue(URL value) {
-                                                       return null;
-                                               }
-
-                                               @Override
-                                               public URL getValue() {
-                                                       return value;
-                                               }
-
-                                               @Override
-                                               public String getKey() {
-                                                       return key;
-                                               }
-                                       });
+                                       urls.add(new AbstractMap.SimpleEntry<String, URL>(
+                                                       StringUtils.unhtml(line).trim(), guest(link)));
                                }
                        }
                }