X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FYiffStar.java;h=121f97dc35b449dbf4014a7d19c6d51e0f876cc4;hb=7c27e4429a9f1a51b608576d19bf602b68e2c098;hp=4f4e8d693271814bb645eb9c9a6ae3b81b1b5f7e;hpb=6e06d2cc9bf068a8ec4ad105aaef955a6eb509a1;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/supported/YiffStar.java b/src/be/nikiroo/fanfix/supported/YiffStar.java index 4f4e8d6..121f97d 100644 --- a/src/be/nikiroo/fanfix/supported/YiffStar.java +++ b/src/be/nikiroo/fanfix/supported/YiffStar.java @@ -1,9 +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; @@ -14,6 +15,8 @@ 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; /** @@ -22,8 +25,7 @@ import be.nikiroo.utils.StringUtils; * * @author niki */ -class YiffStar extends BasicSupport { - +class YiffStar extends BasicSupport_Deprecated { @Override public String getSourceName() { return "YiffStar"; @@ -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()); @@ -42,7 +44,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); @@ -68,35 +70,51 @@ class YiffStar extends BasicSupport { @Override public void login() throws IOException { - Map post = new HashMap(); - 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 post = new HashMap(); + 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(); + } } @Override - public URL getCanonicalUrl(URL source) throws IOException { - if (source.getPath().startsWith("/view")) { - 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 new URL(groupUrl); + public URL getCanonicalUrl(URL source) { + try { + if (source.getPath().startsWith("/view")) { + 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("\""); + 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); @@ -119,10 +137,9 @@ 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> chaps = getChapters(source, in); + List> 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 +167,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 +176,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 +194,8 @@ class YiffStar extends BasicSupport { } @Override - protected List> getChapters(URL source, InputStream in) - throws IOException { + protected List> getChapters(URL source, InputStream in, + Progress pg) throws IOException { List> urls = new ArrayList>(); @SuppressWarnings("resource") @@ -194,21 +211,8 @@ class YiffStar extends BasicSupport { link = source.getProtocol() + "://" + source.getHost() + link; } - final URL value = new URL(link); - final String key = StringUtils.unhtml(line).trim(); - urls.add(new Entry() { - public URL setValue(URL value) { - return null; - } - - public URL getValue() { - return value; - } - - public String getKey() { - return key; - } - }); + urls.add(new AbstractMap.SimpleEntry( + StringUtils.unhtml(line).trim(), guest(link))); } } } @@ -217,8 +221,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 +243,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"); + } }