include 2.0.3 patch

[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 92d44fe9beaa9f997c6d1375af2f4c332b0ee496..aad01a68d06f515999c4557b902136603ffa13ad 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/YiffStar.java
+++ b/src/be/nikiroo/fanfix/supported/YiffStar.java
@@ -26,12 +26,6 @@ import be.nikiroo.utils.StringUtils;
  * @author niki
  */
 class YiffStar extends BasicSupport_Deprecated {
-
-       @Override
-       public String getSourceName() {
-               return "YiffStar";
-       }
-
        @Override
        protected MetaData getMeta(URL source, InputStream in) throws IOException {
                MetaData meta = new MetaData();
@@ -40,9 +34,9 @@ class YiffStar extends BasicSupport_Deprecated {
                meta.setAuthor(getAuthor(reset(in)));
                meta.setDate("");
                meta.setTags(getTags(reset(in)));
-               meta.setSource(getSourceName());
+               meta.setSource(getType().getSourceName());
                meta.setUrl(source.toString());
-               meta.setPublisher(getSourceName());
+               meta.setPublisher(getType().getSourceName());
                meta.setUuid(source.toString());
                meta.setLuid("");
                meta.setLang("en");
@@ -80,10 +74,13 @@ class YiffStar extends BasicSupport_Deprecated {
 
                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
@@ -97,8 +94,10 @@ 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.getCache().openNoCache(source, this,
+                                               null, null, null);
                                String line = getLine(in, "/browse/folder/", 0);
                                if (line != null) {
                                        String[] tab = line.split("\"");