Add more warnings source to 1.6) and fix warnings

[nikiroo-utils.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 4f4e8d693271814bb645eb9c9a6ae3b81b1b5f7e..ba24e50708052cf91b3dcfded508c298b17470bf 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/YiffStar.java
+++ b/src/be/nikiroo/fanfix/supported/YiffStar.java
@@ -3,6 +3,7 @@ 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.ArrayList;
 import java.util.HashMap;
@@ -14,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.Progress;
 import be.nikiroo.utils.StringUtils;
 
 /**
@@ -34,7 +36,7 @@ class YiffStar extends BasicSupport {
                MetaData meta = new MetaData();
 
                meta.setTitle(getTitle(reset(in)));
-               meta.setAuthor(getAuthor(source, reset(in)));
+               meta.setAuthor(getAuthor(reset(in)));
                meta.setDate("");
                meta.setTags(getTags(reset(in)));
                meta.setSource(getSourceName());
@@ -68,25 +70,32 @@ class YiffStar extends BasicSupport {
 
        @Override
        public void login() throws IOException {
-               Map<String, String> post = new HashMap<String, String>();
-               post.put("LoginForm[sfLoginUsername]",
-                               Instance.getConfig().getString(Config.LOGIN_YIFFSTAR_USER));
-               post.put("LoginForm[sfLoginPassword]",
-                               Instance.getConfig().getString(Config.LOGIN_YIFFSTAR_PASS));
-               post.put("YII_CSRF_TOKEN", "");
-
-               // Cookies will actually be retained by the cache manager once logged in
-               // TODO: not working yet, once fixed can be removed (adding "/guest" to
-               // URLs fix the access problem!):
-               /*
-                * Instance.getCache() .openNoCache(new
-                * URL("https://www.sofurry.com/user/login"), this, post).close();
-                */
+               // Note: this should not be necessary anymore
+               // (the "/guest" trick is enough)
+               String login = Instance.getConfig().getString(
+                               Config.LOGIN_YIFFSTAR_USER);
+               String password = Instance.getConfig().getString(
+                               Config.LOGIN_YIFFSTAR_PASS);
+
+               if (login != null && !login.isEmpty() && password != null
+                               && !password.isEmpty()) {
+                       Map<String, String> post = new HashMap<String, String>();
+                       post.put("sfLoginUsername", login);
+                       post.put("sfLoginPassword", password);
+                       post.put("YII_CSRF_TOKEN", "");
+
+                       // Cookies will actually be retained by the cache manager once
+                       // logged in
+                       Instance.getCache()
+                                       .openNoCache(new URL("https://www.sofurry.com/user/login"),
+                                                       this, post).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) {
@@ -94,7 +103,7 @@ class YiffStar extends BasicSupport {
                                if (tab.length > 1) {
                                        String groupUrl = source.getProtocol() + "://"
                                                        + source.getHost() + tab[1];
-                                       return new URL(groupUrl);
+                                       return guest(groupUrl);
                                }
                        }
                }
@@ -122,7 +131,7 @@ class YiffStar extends BasicSupport {
        private BufferedImage getCover(URL source, InputStream in)
                        throws IOException {
 
-               List<Entry<String, URL>> chaps = getChapters(source, in);
+               List<Entry<String, URL>> chaps = getChapters(source, in, null);
                if (!chaps.isEmpty()) {
                        in = Instance.getCache().open(chaps.get(0).getValue(), this, true);
                        String line = getLine(in, " name=\"og:image\"", 0);
@@ -150,7 +159,7 @@ class YiffStar extends BasicSupport {
                return null;
        }
 
-       private String getAuthor(URL source, InputStream in) throws IOException {
+       private String getAuthor(InputStream in) {
                String author = getLine(in, "class=\"onlinestatus", 0);
                if (author != null) {
                        return StringUtils.unhtml(author).trim();
@@ -159,7 +168,7 @@ class YiffStar extends BasicSupport {
                return null;
        }
 
-       private String getTitle(InputStream in) throws IOException {
+       private String getTitle(InputStream in) {
                String title = getLine(in, "class=\"sflabel pagetitle", 0);
                if (title != null) {
                        if (title.contains("(series)")) {
@@ -177,8 +186,8 @@ class YiffStar extends BasicSupport {
        }
 
        @Override
-       protected List<Entry<String, URL>> getChapters(URL source, InputStream in)
-                       throws IOException {
+       protected List<Entry<String, URL>> getChapters(URL source, InputStream in,
+                       Progress pg) throws IOException {
                List<Entry<String, URL>> urls = new ArrayList<Entry<String, URL>>();
 
                @SuppressWarnings("resource")
@@ -194,17 +203,20 @@ class YiffStar extends BasicSupport {
                                                link = source.getProtocol() + "://" + source.getHost()
                                                                + link;
                                        }
-                                       final URL value = new URL(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;
                                                }
@@ -217,8 +229,8 @@ class YiffStar extends BasicSupport {
        }
 
        @Override
-       protected String getChapterContent(URL source, InputStream in, int number)
-                       throws IOException {
+       protected String getChapterContent(URL source, InputStream in, int number,
+                       Progress pg) throws IOException {
                StringBuilder builder = new StringBuilder();
 
                String startAt = "id=\"sfContentBody";
@@ -239,10 +251,34 @@ class YiffStar extends BasicSupport {
 
                        if (ok) {
                                builder.append(line);
-                               builder.append('\n');
+                               builder.append(' ');
                        }
                }
 
                return builder.toString();
        }
+
+       /**
+        * Return a {@link URL} from the given link, but add the "/guest" part to it
+        * to make sure we don't need to be logged-in to see it.
+        * 
+        * @param link
+        *            the link
+        * 
+        * @return the {@link URL}
+        * 
+        * @throws MalformedURLException
+        *             in case of data error
+        */
+       private URL guest(String link) throws MalformedURLException {
+               if (link.contains("?")) {
+                       if (link.contains("/?")) {
+                               return new URL(link.replace("?", "guest?"));
+                       }
+
+                       return new URL(link.replace("?", "/guest?"));
+               }
+
+               return new URL(link + "/guest");
+       }
 }