X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FFimfiction.java;h=ed9c9adf867439cd3154d3f6d00f0e5d30479403;hb=3cc0baccd18b3ad71955364d99754f982d7532a7;hp=45455b610f2a05193746e4e8bffcf0163d10e55a;hpb=c3c7900359a459fabfe59e8af212921036f5f5ed;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/supported/Fimfiction.java b/src/be/nikiroo/fanfix/supported/Fimfiction.java
index 45455b6..ed9c9ad 100644
--- a/src/be/nikiroo/fanfix/supported/Fimfiction.java
+++ b/src/be/nikiroo/fanfix/supported/Fimfiction.java
@@ -1,6 +1,5 @@
package be.nikiroo.fanfix.supported;
-import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -14,6 +13,7 @@ import java.util.Scanner;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.utils.Image;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.StringUtils;
@@ -23,7 +23,7 @@ import be.nikiroo.utils.StringUtils;
*
* @author niki
*/
-class Fimfiction extends BasicSupport {
+class Fimfiction extends BasicSupport_Deprecated {
@Override
protected boolean isHtml() {
return true;
@@ -83,13 +83,23 @@ class Fimfiction extends BasicSupport {
break; // end of *this story* tags
}
- String tab[] = line.split("
");
- for (String subline : tab) {
- subline = StringUtils.unhtml(subline).trim();
- if (!subline.isEmpty() && !tags.contains(subline)) {
- tags.add(subline);
+ String keyword = "title=\"";
+ Scanner tagScanner = new Scanner(line);
+ tagScanner.useDelimiter(keyword);
+ if (tagScanner.hasNext()) {
+ tagScanner.next();// Ignore first one
+ }
+ while (tagScanner.hasNext()) {
+ String tag = tagScanner.next();
+ if (tag.contains("\"")) {
+ tag = tag.split("\"")[0];
+ tag = StringUtils.unhtml(tag).trim();
+ if (!tag.isEmpty() && !tags.contains(tag)) {
+ tags.add(tag);
+ }
}
}
+ tagScanner.close();
}
}
@@ -163,7 +173,7 @@ class Fimfiction extends BasicSupport {
return getLine(in, "class=\"description-text bbcode\"", 1);
}
- private BufferedImage getCover(InputStream in) {
+ private Image getCover(InputStream in) {
// Note: the 'og:image' is the SMALL cover, not the full version
String cover = getLine(in, "class=\"story_container__story_image\"", 1);
if (cover != null) {
@@ -198,7 +208,8 @@ class Fimfiction extends BasicSupport {
break;
}
- if (line.startsWith("');
@@ -224,20 +235,23 @@ class Fimfiction extends BasicSupport {
final URL value = new URL("http://www.fimfiction.net"
+ line);
urls.add(new Entry() {
+ @Override
public URL setValue(URL value) {
return null;
}
+ @Override
public String getKey() {
return key;
}
+ @Override
public URL getValue() {
return value;
}
});
} catch (MalformedURLException e) {
- Instance.syserr(e);
+ Instance.getTraceHandler().error(e);
}
}
}