code cleanup / jdoc

[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 a17253a5762b4199a0f2997361da63f92dd009f1..498b7d9a611db6417b153e4b5689dc786b70d513 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/YiffStar.java
+++ b/src/be/nikiroo/fanfix/supported/YiffStar.java
@@ -34,14 +34,11 @@ class YiffStar extends BasicSupport_Deprecated {
                meta.setAuthor(getAuthor(reset(in)));
                meta.setDate("");
                meta.setTags(getTags(reset(in)));
-               meta.setSource(getType().getSourceName());
                meta.setUrl(source.toString());
-               meta.setPublisher(getType().getSourceName());
                meta.setUuid(source.toString());
                meta.setLuid("");
                meta.setLang("en");
                meta.setSubject("Furry");
-               meta.setType(getType().toString());
                meta.setImageDocument(false);
                meta.setCover(getCover(source, reset(in)));
 
@@ -67,23 +64,23 @@ class YiffStar extends BasicSupport_Deprecated {
        public void login() throws IOException {
                // 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);
+               String login = Instance.getInstance().getConfig().getString(Config.LOGIN_YIFFSTAR_USER);
+               String password = Instance.getInstance().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("LoginForm[sfLoginUsername]", login);
+                       post.put("LoginForm[sfLoginPassword]", password);
                        post.put("YII_CSRF_TOKEN", "");
+                       post.put("yt1", "Login");
+                       post.put("returnUrl", "/");
 
                        // 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, null, null).close();
+                       Instance.getInstance().getCache()
+                                       .openNoCache(new URL("https://www.sofurry.com/user/login"), this, post, null, null).close();
                }
        }
 
@@ -91,8 +88,9 @@ class YiffStar extends BasicSupport_Deprecated {
        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);
+                               source = guest(source.toString());
+                               // NO CACHE because we don't want the NotLoggedIn message later
+                               InputStream in = Instance.getInstance().getCache().openNoCache(source, this, null, null, null);
                                String line = getLine(in, "/browse/folder/", 0);
                                if (line != null) {
                                        String[] tab = line.split("\"");
@@ -104,7 +102,7 @@ class YiffStar extends BasicSupport_Deprecated {
                                }
                        }
                } catch (Exception e) {
-                       Instance.getTraceHandler().error(e);
+                       Instance.getInstance().getTraceHandler().error(e);
                }
 
                return super.getCanonicalUrl(source);
@@ -131,7 +129,7 @@ class YiffStar extends BasicSupport_Deprecated {
 
                List<Entry<String, URL>> chaps = getChapters(source, in, null);
                if (!chaps.isEmpty()) {
-                       in = Instance.getCache().open(chaps.get(0).getValue(), this, true);
+                       in = Instance.getInstance().getCache().open(chaps.get(0).getValue(), this, true);
                        String line = getLine(in, " name=\"og:image\"", 0);
                        if (line != null) {
                                int pos = -1;