X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupport.java;h=8154a15e600564e3bfb1da2d9211030512efc72b;hb=6bfa27805ec903223e6e45c6f4d00e94629a064c;hp=6d44c047d6dccf89907a4345e80b03a670c22ad5;hpb=68686a37a591a767f6d1af428ea0d5f3d3a1ddc1;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index 6d44c04..8154a15 100644
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -1,29 +1,26 @@
package be.nikiroo.fanfix.supported;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Scanner;
-import javax.imageio.ImageIO;
+import org.jsoup.helper.DataUtil;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
import be.nikiroo.fanfix.Instance;
-import be.nikiroo.fanfix.bundles.Config;
import be.nikiroo.fanfix.bundles.StringId;
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.MetaData;
-import be.nikiroo.fanfix.data.Paragraph;
-import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.utils.Progress;
import be.nikiroo.utils.StringUtils;
/**
@@ -36,127 +33,10 @@ import be.nikiroo.utils.StringUtils;
* @author niki
*/
public abstract class BasicSupport {
- /**
- * The supported input types for which we can get a {@link BasicSupport}
- * object.
- *
- * @author niki
- */
- public enum SupportType {
- /** EPUB files created with this program */
- EPUB,
- /** Pure text file with some rules */
- TEXT,
- /** TEXT but with associated .info file */
- INFO_TEXT,
- /** My Little Pony fanfictions */
- FIMFICTION,
- /** Fanfictions from a lot of different universes */
- FANFICTION,
- /** Website with lots of Mangas */
- MANGAFOX,
- /** Furry website with comics support */
- E621,
- /** CBZ files */
- CBZ;
-
- /**
- * A description of this support type (more information than the
- * {@link BasicSupport#getSourceName()}).
- *
- * @return the description
- */
- public String getDesc() {
- String desc = Instance.getTrans().getStringX(StringId.INPUT_DESC,
- this.name());
-
- if (desc == null) {
- desc = Instance.getTrans().getString(StringId.INPUT_DESC, this);
- }
-
- return desc;
- }
-
- /**
- * The name of this support type (a short version).
- *
- * @return the name
- */
- public String getSourceName() {
- BasicSupport support = BasicSupport.getSupport(this);
- if (support != null) {
- return support.getSourceName();
- }
-
- return null;
- }
-
- @Override
- public String toString() {
- return super.toString().toLowerCase();
- }
-
- /**
- * Call {@link SupportType#valueOf(String.toUpperCase())}.
- *
- * @param typeName
- * the possible type name
- *
- * @return NULL or the type
- */
- public static SupportType valueOfUC(String typeName) {
- return SupportType.valueOf(typeName == null ? null : typeName
- .toUpperCase());
- }
-
- /**
- * Call {@link SupportType#valueOf(String.toUpperCase())} but return
- * NULL for NULL instead of raising exception.
- *
- * @param typeName
- * the possible type name
- *
- * @return NULL or the type
- */
- public static SupportType valueOfNullOkUC(String typeName) {
- if (typeName == null) {
- return null;
- }
-
- return SupportType.valueOfUC(typeName);
- }
-
- /**
- * Call {@link SupportType#valueOf(String.toUpperCase())} but return
- * NULL in case of error instead of raising an exception.
- *
- * @param typeName
- * the possible type name
- *
- * @return NULL or the type
- */
- public static SupportType valueOfAllOkUC(String typeName) {
- try {
- return SupportType.valueOfUC(typeName);
- } catch (Exception e) {
- return null;
- }
- }
- }
-
- private InputStream in;
+ private Document sourceNode;
+ private URL source;
private SupportType type;
- private URL currentReferer; // with on 'r', as in 'HTTP'...
-
- // quote chars
- private char openQuote = Instance.getTrans().getChar(
- StringId.OPEN_SINGLE_QUOTE);
- private char closeQuote = Instance.getTrans().getChar(
- StringId.CLOSE_SINGLE_QUOTE);
- private char openDoubleQuote = Instance.getTrans().getChar(
- StringId.OPEN_DOUBLE_QUOTE);
- private char closeDoubleQuote = Instance.getTrans().getChar(
- StringId.CLOSE_DOUBLE_QUOTE);
+ private URL currentReferer; // with only one 'r', as in 'HTTP'...
/**
* The name of this support class.
@@ -183,59 +63,60 @@ public abstract class BasicSupport {
*/
protected abstract boolean isHtml();
- protected abstract MetaData getMeta(URL source, InputStream in)
- throws IOException;
+ /**
+ * Return the {@link MetaData} of this story.
+ *
+ * @return the associated {@link MetaData}, never NULL
+ *
+ * @throws IOException
+ * in case of I/O error
+ */
+ protected abstract MetaData getMeta() throws IOException;
/**
* Return the story description.
*
- * @param source
- * the source of the story
- * @param in
- * the input (the main resource)
- *
* @return the description
*
* @throws IOException
* in case of I/O error
*/
- protected abstract String getDesc(URL source, InputStream in)
- throws IOException;
+ protected abstract String getDesc() throws IOException;
/**
- * Return the list of chapters (name and resource).
+ * Return the list of chapters (name and resource). *
+ *
+ * Can be NULL if this {@link BasicSupport} do no use chapters.
*
- * @param source
- * the source of the story
- * @param in
- * the input (the main resource)
+ * @param pg
+ * the optional progress reporter
*
- * @return the chapters
+ * @return the chapters or NULL
*
* @throws IOException
* in case of I/O error
*/
- protected abstract List> getChapters(URL source,
- InputStream in) throws IOException;
+ protected abstract List> getChapters(Progress pg)
+ throws IOException;
/**
* Return the content of the chapter (possibly HTML encoded, if
* {@link BasicSupport#isHtml()} is TRUE).
*
- * @param source
- * the source of the story
- * @param in
- * the input (the main resource)
+ * @param chapUrl
+ * the chapter {@link URL}
* @param number
* the chapter number
+ * @param pg
+ * the optional progress reporter
*
* @return the content
*
* @throws IOException
* in case of I/O error
*/
- protected abstract String getChapterContent(URL source, InputStream in,
- int number) throws IOException;
+ protected abstract String getChapterContent(URL chapUrl, int number,
+ Progress pg) throws IOException;
/**
* Return the list of cookies (values included) that must be used to
@@ -251,143 +132,43 @@ public abstract class BasicSupport {
}
/**
- * Process the given story resource into a partially filled {@link Story}
- * object containing the name and metadata, except for the description.
+ * OAuth authorisation (aka, "bearer XXXXXXX").
*
- * @param url
- * the story resource
- *
- * @return the {@link Story}
- *
- * @throws IOException
- * in case of I/O error
+ * @return the OAuth string
*/
- public Story processMeta(URL url) throws IOException {
- return processMeta(url, true, false);
+ public String getOAuth() {
+ return null;
}
/**
- * Process the given story resource into a partially filled {@link Story}
- * object containing the name and metadata.
+ * Return the canonical form of the main {@link URL}.
*
- * @param url
- * the story resource
- *
- * @param close
- * close "this" and "in" when done
- *
- * @return the {@link Story}
+ * @param source
+ * the source {@link URL}, which can be NULL
*
- * @throws IOException
- * in case of I/O error
+ * @return the canonical form of this {@link URL} or NULL if the source was
+ * NULL
*/
- protected Story processMeta(URL url, boolean close, boolean getDesc)
- throws IOException {
- in = Instance.getCache().open(url, this, false);
- if (in == null) {
- return null;
- }
-
- try {
- preprocess(url, getInput());
-
- Story story = new Story();
- MetaData meta = getMeta(url, getInput());
- story.setMeta(meta);
-
- if (meta != null && meta.getCover() == null) {
- meta.setCover(getDefaultCover(meta.getSubject()));
- }
-
- if (getDesc) {
- String descChapterName = Instance.getTrans().getString(
- StringId.DESCRIPTION);
- story.getMeta().setResume(
- makeChapter(url, 0, descChapterName,
- getDesc(url, getInput())));
- }
-
- return story;
- } finally {
- if (close) {
- try {
- close();
- } catch (IOException e) {
- Instance.syserr(e);
- }
-
- if (in != null) {
- in.close();
- }
- }
- }
+ protected URL getCanonicalUrl(URL source) {
+ return source;
}
/**
- * Process the given story resource into a fully filled {@link Story}
- * object.
+ * The main {@link Node} for this {@link Story}.
*
- * @param url
- * the story resource
- *
- * @return the {@link Story}
- *
- * @throws IOException
- * in case of I/O error
+ * @return the node
*/
- public Story process(URL url) throws IOException {
- setCurrentReferer(url);
-
- try {
- Story story = processMeta(url, false, true);
- if (story == null) {
- return null;
- }
-
- story.setChapters(new ArrayList());
-
- List> chapters = getChapters(url, getInput());
- int i = 1;
- if (chapters != null) {
- for (Entry chap : chapters) {
- setCurrentReferer(chap.getValue());
- InputStream chapIn = Instance.getCache().open(
- chap.getValue(), this, true);
- try {
- story.getChapters().add(
- makeChapter(url, i, chap.getKey(),
- getChapterContent(url, chapIn, i)));
- } finally {
- chapIn.close();
- }
- i++;
- }
- }
-
- return story;
-
- } finally {
- try {
- close();
- } catch (IOException e) {
- Instance.syserr(e);
- }
-
- if (in != null) {
- in.close();
- }
-
- currentReferer = null;
- }
+ protected Element getSourceNode() {
+ return sourceNode;
}
/**
- * The support type.$
+ * The main {@link URL} for this {@link Story}.
*
- * @return the type
+ * @return the URL
*/
- public SupportType getType() {
- return type;
+ protected URL getSource() {
+ return source;
}
/**
@@ -411,580 +192,244 @@ public abstract class BasicSupport {
this.currentReferer = currentReferer;
}
+ /**
+ * The support type.
+ *
+ * @return the type
+ */
+ public SupportType getType() {
+ return type;
+ }
+
/**
* The support type.
*
* @param type
* the new type
- *
- * @return this
*/
- protected BasicSupport setType(SupportType type) {
+ protected void setType(SupportType type) {
this.type = type;
- return this;
}
/**
- * Prepare the support if needed before processing.
+ * Open an input link that will be used for the support.
+ *
+ * Can return NULL, in which case you are supposed to work without a source
+ * node.
*
* @param source
- * the source of the story
- * @param in
- * the input (the main resource)
+ * the source {@link URL}
+ *
+ * @return the {@link InputStream}
*
* @throws IOException
- * on I/O error
+ * in case of I/O error
*/
- protected void preprocess(URL source, InputStream in) throws IOException {
+ protected Document loadDocument(URL source) throws IOException {
+ String url = getCanonicalUrl(source).toString();
+ return DataUtil.load(Instance.getCache().open(source, this, false),
+ "UTF-8", url.toString());
}
/**
- * Now that we have processed the {@link Story}, close the resources if any.
+ * Log into the support (can be a no-op depending upon the support).
*
* @throws IOException
- * on I/O error
+ * in case of I/O error
*/
- protected void close() throws IOException {
+ protected void login() throws IOException {
}
/**
- * Create a {@link Chapter} object from the given information, formatting
- * the content as it should be.
- *
- * @param number
- * the chapter number
- * @param name
- * the chapter name
- * @param content
- * the chapter content
+ * Now that we have processed the {@link Story}, close the resources if any.
+ */
+ protected void close() {
+ setCurrentReferer(null);
+ }
+
+ /**
+ * Process the given story resource into a partially filled {@link Story}
+ * object containing the name and metadata, except for the description.
*
- * @return the {@link Chapter}
+ * @return the {@link Story}
*
* @throws IOException
* in case of I/O error
*/
- protected Chapter makeChapter(URL source, int number, String name,
- String content) throws IOException {
-
- // Chapter name: process it correctly, then remove the possible
- // redundant "Chapter x: " in front of it
- String chapterName = processPara(name).getContent().trim();
- for (String lang : Instance.getConfig().getString(Config.CHAPTER)
- .split(",")) {
- String chapterWord = Instance.getConfig().getStringX(
- Config.CHAPTER, lang);
- if (chapterName.startsWith(chapterWord)) {
- chapterName = chapterName.substring(chapterWord.length())
- .trim();
- break;
- }
- }
-
- if (chapterName.startsWith(Integer.toString(number))) {
- chapterName = chapterName.substring(
- Integer.toString(number).length()).trim();
- }
-
- if (chapterName.startsWith(":")) {
- chapterName = chapterName.substring(1).trim();
- }
- //
-
- Chapter chap = new Chapter(number, chapterName);
-
- if (content == null) {
- return chap;
- }
-
- if (isHtml()) {
- // Special
processing:
- content = content.replaceAll("(
]*>)|(
)|(
)",
- "\n* * *\n");
- }
+ public final Story processMeta() throws IOException {
+ Story story = null;
- InputStream in = new ByteArrayInputStream(content.getBytes("UTF-8"));
try {
- @SuppressWarnings("resource")
- Scanner scan = new Scanner(in, "UTF-8");
- scan.useDelimiter("(\\n|
)"); // \n for test, for html
-
- List paras = new ArrayList();
- while (scan.hasNext()) {
- String line = scan.next().trim();
- boolean image = false;
- if (line.startsWith("[") && line.endsWith("]")) {
- URL url = getImageUrl(source,
- line.substring(1, line.length() - 1).trim());
- if (url != null) {
- paras.add(new Paragraph(url));
- image = true;
- }
- }
-
- if (!image) {
- paras.add(processPara(line));
- }
- }
-
- // Check quotes for "bad" format
- List newParas = new ArrayList();
- for (Paragraph para : paras) {
- newParas.addAll(requotify(para));
- }
- paras = newParas;
-
- // Remove double blanks/brks
- boolean space = false;
- boolean brk = true;
- for (int i = 0; i < paras.size(); i++) {
- Paragraph para = paras.get(i);
- boolean thisSpace = para.getType() == ParagraphType.BLANK;
- boolean thisBrk = para.getType() == ParagraphType.BREAK;
-
- if (space && thisBrk) {
- paras.remove(i - 1);
- i--;
- } else if ((space || brk) && (thisSpace || thisBrk)) {
- paras.remove(i);
- i--;
- }
-
- space = thisSpace;
- brk = thisBrk;
- }
-
- // Remove blank/brk at start
- if (paras.size() > 0
- && (paras.get(0).getType() == ParagraphType.BLANK || paras
- .get(0).getType() == ParagraphType.BREAK)) {
- paras.remove(0);
- }
-
- // Remove blank/brk at end
- int last = paras.size() - 1;
- if (paras.size() > 0
- && (paras.get(last).getType() == ParagraphType.BLANK || paras
- .get(last).getType() == ParagraphType.BREAK)) {
- paras.remove(last);
- }
-
- chap.setParagraphs(paras);
-
- return chap;
+ story = processMeta(false, null);
} finally {
- in.close();
- }
- }
-
- static BufferedImage getDefaultCover(String subject) {
- if (subject != null && !subject.isEmpty()
- && Instance.getCoverDir() != null) {
- try {
- File fileCover = new File(Instance.getCoverDir(), subject);
- return getImage(fileCover.toURI().toURL(), subject);
- } catch (MalformedURLException e) {
- }
- }
-
- return null;
- }
-
- /**
- * Return the list of supported image extensions.
- *
- * @return the extensions
- */
- static String[] getImageExt(boolean emptyAllowed) {
- if (emptyAllowed) {
- return new String[] { "", ".png", ".jpg", ".jpeg", ".gif", ".bmp" };
- } else {
- return new String[] { ".png", ".jpg", ".jpeg", ".gif", ".bmp" };
- }
- }
-
- static BufferedImage getImage(URL source, String line) {
- URL url = getImageUrl(source, line);
- if (url != null) {
- InputStream in = null;
- try {
- in = Instance.getCache().open(url, getSupport(url), true);
- return ImageIO.read(in);
- } catch (IOException e) {
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- }
- }
- }
+ close();
}
- return null;
+ return story;
}
/**
- * Check if the given resource can be a local image or a remote image, then
- * refresh the cache with it if it is.
+ * Process the given story resource into a partially filled {@link Story}
+ * object containing the name and metadata.
*
- * @param source
- * the story source
- * @param line
- * the resource to check
+ * @param getDesc
+ * retrieve the description of the story, or not
+ * @param pg
+ * the optional progress reporter
*
- * @return the image URL if found, or NULL
+ * @return the {@link Story}, never NULL
*
+ * @throws IOException
+ * in case of I/O error
*/
- static URL getImageUrl(URL source, String line) {
- URL url = null;
+ protected Story processMeta(boolean getDesc, Progress pg)
+ throws IOException {
+ if (pg == null) {
+ pg = new Progress();
+ } else {
+ pg.setMinMax(0, 100);
+ }
- if (line != null) {
- // try for files
- String path = null;
- if (source != null) {
- path = new File(source.getFile()).getParent();
- try {
- String urlBase = new File(new File(path), line.trim())
- .toURI().toURL().toString();
- for (String ext : getImageExt(true)) {
- if (new File(urlBase + ext).exists()) {
- url = new File(urlBase + ext).toURI().toURL();
- }
- }
- } catch (Exception e) {
- // Nothing to do here
- }
- }
+ pg.setProgress(30);
- if (url == null) {
- // try for URLs
- try {
- for (String ext : getImageExt(true)) {
- if (Instance.getCache().check(new URL(line + ext))) {
- url = new URL(line + ext);
- }
- }
+ Story story = new Story();
+ MetaData meta = getMeta();
+ if (meta.getCreationDate() == null || meta.getCreationDate().isEmpty()) {
+ meta.setCreationDate(StringUtils.fromTime(new Date().getTime()));
+ }
+ story.setMeta(meta);
- // try out of cache
- if (url == null) {
- for (String ext : getImageExt(true)) {
- try {
- url = new URL(line + ext);
- Instance.getCache().refresh(url,
- getSupport(url), true);
- break;
- } catch (IOException e) {
- // no image with this ext
- url = null;
- }
- }
- }
- } catch (MalformedURLException e) {
- // Not an url
- }
- }
+ pg.setProgress(50);
- // refresh the cached file
- if (url != null) {
- try {
- Instance.getCache().refresh(url, getSupport(url), true);
- } catch (IOException e) {
- // woops, broken image
- url = null;
- }
- }
+ if (meta.getCover() == null) {
+ meta.setCover(BasicSupportHelper.getDefaultCover(meta.getSubject()));
}
- return url;
- }
+ pg.setProgress(60);
- protected InputStream reset(InputStream in) {
- try {
- in.reset();
- } catch (IOException e) {
+ if (getDesc) {
+ String descChapterName = Instance.getTrans().getString(
+ StringId.DESCRIPTION);
+ story.getMeta().setResume(
+ BasicSupportPara.makeChapter(this, source, 0,
+ descChapterName, //
+ getDesc(), isHtml(), null));
}
- return in;
- }
- /**
- * Reset then return {@link BasicSupport#in}.
- *
- * @return {@link BasicSupport#in}
- */
- protected InputStream getInput() {
- return reset(in);
+ pg.setProgress(100);
+ return story;
}
/**
- * Fix the author name if it is prefixed with some "by" {@link String}.
+ * Actual processing step, without the calls to other methods.
+ *
+ * Will convert the story resource into a fully filled {@link Story} object.
*
- * @param author
- * the author with a possible prefix
+ * @param pg
+ * the optional progress reporter
*
- * @return the author without prefixes
+ * @return the {@link Story}, never NULL
+ *
+ * @throws IOException
+ * in case of I/O error
*/
- protected String fixAuthor(String author) {
- if (author != null) {
- for (String suffix : new String[] { " ", ":" }) {
- for (String byString : Instance.getConfig()
- .getString(Config.BYS).split(",")) {
- byString += suffix;
- if (author.toUpperCase().startsWith(byString.toUpperCase())) {
- author = author.substring(byString.length()).trim();
- }
- }
- }
+ // TODO: add final
+ public Story process(Progress pg) throws IOException {
+ setCurrentReferer(source);
+ login();
+ sourceNode = loadDocument(source);
- // Special case (without suffix):
- if (author.startsWith("©")) {
- author = author.substring(1);
- }
+ try {
+ return doProcess(pg);
+ } finally {
+ close();
}
-
- return author;
}
/**
- * Check quotes for bad format (i.e., quotes with normal paragraphs inside)
- * and requotify them (i.e., separate them into QUOTE paragraphs and other
- * paragraphs (quotes or not)).
+ * Process the given story resource into a fully filled {@link Story}
+ * object.
*
- * @param para
- * the paragraph to requotify (not necessaraly a quote)
+ * @param pg
+ * the optional progress reporter
*
- * @return the correctly (or so we hope) quotified paragraphs
+ * @return the {@link Story}, never NULL
+ *
+ * @throws IOException
+ * in case of I/O error
*/
- private List requotify(Paragraph para) {
- List newParas = new ArrayList();
-
- if (para.getType() == ParagraphType.QUOTE
- && para.getContent().length() > 2) {
- String line = para.getContent();
- boolean singleQ = line.startsWith("" + openQuote);
- boolean doubleQ = line.startsWith("" + openDoubleQuote);
-
- if (!singleQ && !doubleQ) {
- line = openDoubleQuote + line + closeDoubleQuote;
- newParas.add(new Paragraph(ParagraphType.QUOTE, line));
- } else {
- char close = singleQ ? closeQuote : closeDoubleQuote;
- int posClose = line.indexOf(close, 1);
- int posDot = line.indexOf(".");
- while (posDot >= 0 && posDot < posClose) {
- posDot = line.indexOf(".", posDot + 1);
- }
-
- if (posDot >= 0) {
- String rest = line.substring(posDot + 1).trim();
- line = line.substring(0, posDot + 1).trim();
- newParas.add(new Paragraph(ParagraphType.QUOTE, line));
- if (!rest.isEmpty()) {
- newParas.addAll(requotify(processPara(rest)));
- }
- } else {
- newParas.add(para);
- }
- }
+ public Story doProcess(Progress pg) throws IOException {
+ if (pg == null) {
+ pg = new Progress();
} else {
- newParas.add(para);
+ pg.setMinMax(0, 100);
}
- return newParas;
- }
-
- /**
- * Process a {@link Paragraph} from a raw line of text.
- *
- * Will also fix quotes and HTML encoding if needed.
- *
- * @param line
- * the raw line
- *
- * @return the processed {@link Paragraph}
- */
- private Paragraph processPara(String line) {
- line = ifUnhtml(line).trim();
-
- boolean space = true;
- boolean brk = true;
- boolean quote = false;
- boolean tentativeCloseQuote = false;
- char prev = '\0';
- int dashCount = 0;
-
- StringBuilder builder = new StringBuilder();
- for (char car : line.toCharArray()) {
- if (car != '-') {
- if (dashCount > 0) {
- // dash, ndash and mdash: - â â
- // currently: always use mdash
- builder.append(dashCount == 1 ? '-' : 'â');
- }
- dashCount = 0;
- }
-
- if (tentativeCloseQuote) {
- tentativeCloseQuote = false;
- if ((car >= 'a' && car <= 'z') || (car >= 'A' && car <= 'Z')
- || (car >= '0' && car <= '9')) {
- builder.append("'");
- } else {
- builder.append(closeQuote);
- }
- }
+ pg.setProgress(1);
+ Progress pgMeta = new Progress();
+ pg.addProgress(pgMeta, 10);
+ Story story = processMeta(true, pgMeta);
+ if (!pgMeta.isDone()) {
+ pgMeta.setProgress(pgMeta.getMax()); // 10%
+ }
- switch (car) {
- case 'Â ': // note: unbreakable space
- case ' ':
- case '\t':
- case '\n': // just in case
- case '\r': // just in case
- builder.append(' ');
- break;
+ pg.setName("Retrieving " + story.getMeta().getTitle());
- case '\'':
- if (space || (brk && quote)) {
- quote = true;
- builder.append(openQuote);
- } else if (prev == ' ') {
- builder.append(openQuote);
- } else {
- // it is a quote ("I'm off") or a 'quote' ("This
- // 'good' restaurant"...)
- tentativeCloseQuote = true;
- }
- break;
+ Progress pgGetChapters = new Progress();
+ pg.addProgress(pgGetChapters, 10);
+ story.setChapters(new ArrayList());
+ List> chapters = getChapters(pgGetChapters);
+ if (!pgGetChapters.isDone()) {
+ pgGetChapters.setProgress(pgGetChapters.getMax()); // 20%
+ }
- case '"':
- if (space || (brk && quote)) {
- quote = true;
- builder.append(openDoubleQuote);
- } else if (prev == ' ') {
- builder.append(openDoubleQuote);
- } else {
- builder.append(closeDoubleQuote);
- }
- break;
+ if (chapters != null) {
+ Progress pgChaps = new Progress("Extracting chapters", 0,
+ chapters.size() * 300);
+ pg.addProgress(pgChaps, 80);
- case '-':
- if (space) {
- quote = true;
- } else {
- dashCount++;
+ long words = 0;
+ int i = 1;
+ for (Entry chap : chapters) {
+ pgChaps.setName("Extracting chapter " + i);
+ URL chapUrl = chap.getValue();
+ String chapName = chap.getKey();
+ if (chapUrl != null) {
+ setCurrentReferer(chapUrl);
}
- space = false;
- break;
- case '*':
- case '~':
- case '/':
- case '\\':
- case '<':
- case '>':
- case '=':
- case '+':
- case '_':
- case 'â':
- case 'â':
- space = false;
- builder.append(car);
- break;
-
- case 'â':
- case '`':
- case 'â¹':
- case 'ï¹':
- case 'ã':
- case 'ã':
- if (space || (brk && quote)) {
- quote = true;
- builder.append(openQuote);
- } else {
- builder.append(openQuote);
+ pgChaps.setProgress(i * 100);
+ Progress pgGetChapterContent = new Progress();
+ Progress pgMakeChapter = new Progress();
+ pgChaps.addProgress(pgGetChapterContent, 100);
+ pgChaps.addProgress(pgMakeChapter, 100);
+
+ String content = getChapterContent(chapUrl, i,
+ pgGetChapterContent);
+ if (!pgGetChapterContent.isDone()) {
+ pgGetChapterContent.setProgress(pgGetChapterContent
+ .getMax());
}
- space = false;
- brk = false;
- break;
-
- case 'â':
- case 'âº':
- case 'ï¹':
- case 'ã':
- case 'ã':
- space = false;
- brk = false;
- builder.append(closeQuote);
- break;
- case '«':
- case 'â':
- case 'ï¹':
- case 'ã':
- case 'ã':
- if (space || (brk && quote)) {
- quote = true;
- builder.append(openDoubleQuote);
- } else {
- builder.append(openDoubleQuote);
+ Chapter cc = BasicSupportPara.makeChapter(this, chapUrl, i,
+ chapName, content, isHtml(), pgMakeChapter);
+ if (!pgMakeChapter.isDone()) {
+ pgMakeChapter.setProgress(pgMakeChapter.getMax());
}
- space = false;
- brk = false;
- break;
- case '»':
- case 'â':
- case 'ï¹':
- case 'ã':
- case 'ã':
- space = false;
- brk = false;
- builder.append(closeDoubleQuote);
- break;
+ words += cc.getWords();
+ story.getChapters().add(cc);
+ story.getMeta().setWords(words);
- default:
- space = false;
- brk = false;
- builder.append(car);
- break;
+ i++;
}
- prev = car;
- }
-
- if (tentativeCloseQuote) {
- tentativeCloseQuote = false;
- builder.append(closeQuote);
- }
-
- line = builder.toString().trim();
-
- ParagraphType type = ParagraphType.NORMAL;
- if (space) {
- type = ParagraphType.BLANK;
- } else if (brk) {
- type = ParagraphType.BREAK;
- } else if (quote) {
- type = ParagraphType.QUOTE;
- }
-
- return new Paragraph(type, line);
- }
-
- /**
- * Remove the HTML from the inpit if {@link BasicSupport#isHtml()} is
- * true.
- *
- * @param input
- * the input
- *
- * @return the no html version if needed
- */
- private String ifUnhtml(String input) {
- if (isHtml() && input != null) {
- return StringUtils.unhtml(input);
+ pgChaps.setName("Extracting chapters");
+ } else {
+ pg.setProgress(80);
}
- return input;
+ return story;
}
/**
@@ -1004,16 +449,16 @@ public abstract class BasicSupport {
// TEXT and INFO_TEXT always support files (not URLs though)
for (SupportType type : SupportType.values()) {
if (type != SupportType.TEXT && type != SupportType.INFO_TEXT) {
- BasicSupport support = getSupport(type);
+ BasicSupport support = getSupport(type, url);
if (support != null && support.supports(url)) {
return support;
}
}
}
- for (SupportType type : new SupportType[] { SupportType.TEXT,
- SupportType.INFO_TEXT }) {
- BasicSupport support = getSupport(type);
+ for (SupportType type : new SupportType[] { SupportType.INFO_TEXT,
+ SupportType.TEXT }) {
+ BasicSupport support = getSupport(type, url);
if (support != null && support.supports(url)) {
return support;
}
@@ -1027,111 +472,61 @@ public abstract class BasicSupport {
*
* @param type
* the type
+ * @param url
+ * the {@link URL} to support (can be NULL to get an
+ * "abstract support")
*
* @return an implementation that supports it, or NULL
*/
- public static BasicSupport getSupport(SupportType type) {
+ public static BasicSupport getSupport(SupportType type, URL url) {
+ BasicSupport support = null;
+
switch (type) {
case EPUB:
- return new Epub().setType(type);
+ support = new Epub();
+ break;
case INFO_TEXT:
- return new InfoText().setType(type);
+ support = new InfoText();
+ break;
case FIMFICTION:
- return new Fimfiction().setType(type);
+ try {
+ // Can fail if no client key or NO in options
+ support = new FimfictionApi();
+ } catch (IOException e) {
+ support = new Fimfiction();
+ }
+ break;
case FANFICTION:
- return new Fanfiction().setType(type);
+ support = new Fanfiction();
+ break;
case TEXT:
- return new Text().setType(type);
+ support = new Text();
+ break;
case MANGAFOX:
- return new MangaFox().setType(type);
+ support = new MangaFox();
+ break;
case E621:
- return new E621().setType(type);
+ support = new E621();
+ break;
+ case YIFFSTAR:
+ support = new YiffStar();
+ break;
+ case E_HENTAI:
+ support = new EHentai();
+ break;
case CBZ:
- return new Cbz().setType(type);
- }
-
- return null;
- }
-
- /**
- * Return the first line from the given input which correspond to the given
- * selectors.
- *
- * @param in
- * the input
- * @param needle
- * a string that must be found inside the target line (also
- * supports "^" at start to say "only if it starts with" the
- * needle)
- * @param relativeLine
- * the line to return based upon the target line position (-1 =
- * the line before, 0 = the target line...)
- *
- * @return the line
- */
- static String getLine(InputStream in, String needle, int relativeLine) {
- return getLine(in, needle, relativeLine, true);
- }
-
- /**
- * Return a line from the given input which correspond to the given
- * selectors.
- *
- * @param in
- * the input
- * @param needle
- * a string that must be found inside the target line (also
- * supports "^" at start to say "only if it starts with" the
- * needle)
- * @param relativeLine
- * the line to return based upon the target line position (-1 =
- * the line before, 0 = the target line...)
- * @param first
- * takes the first result (as opposed to the last one, which will
- * also always spend the input)
- *
- * @return the line
- */
- static String getLine(InputStream in, String needle, int relativeLine,
- boolean first) {
- String rep = null;
-
- try {
- in.reset();
- } catch (IOException e) {
- Instance.syserr(e);
+ support = new Cbz();
+ break;
+ case HTML:
+ support = new Html();
+ break;
}
- List lines = new ArrayList();
- @SuppressWarnings("resource")
- Scanner scan = new Scanner(in, "UTF-8");
- int index = -1;
- scan.useDelimiter("\\n");
- while (scan.hasNext()) {
- lines.add(scan.next());
-
- if (index == -1) {
- if (needle.startsWith("^")) {
- if (lines.get(lines.size() - 1).startsWith(
- needle.substring(1))) {
- index = lines.size() - 1;
- }
-
- } else {
- if (lines.get(lines.size() - 1).contains(needle)) {
- index = lines.size() - 1;
- }
- }
- }
-
- if (index >= 0 && index + relativeLine < lines.size()) {
- rep = lines.get(index + relativeLine);
- if (first) {
- break;
- }
- }
+ if (support != null) {
+ support.setType(type);
+ support.source = support.getCanonicalUrl(url);
}
- return rep;
+ return support;
}
}