X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupport.java;h=4337626c7fe60d96914eb9658df2b827823de539;hb=f43598131014c6a1db57e885cc0ac21605633e9d;hp=8154a15e600564e3bfb1da2d9211030512efc72b;hpb=bb7021f2b3f1bf32d6ec7ad521ae7ae8d1810c57;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java index 8154a15..4337626 100644 --- a/src/be/nikiroo/fanfix/supported/BasicSupport.java +++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java @@ -84,7 +84,7 @@ public abstract class BasicSupport { 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. * @@ -247,27 +247,6 @@ public abstract class BasicSupport { 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 Story} - * - * @throws IOException - * in case of I/O error - */ - public final Story processMeta() throws IOException { - Story story = null; - - try { - story = processMeta(false, null); - } finally { - close(); - } - - return story; - } - /** * Process the given story resource into a partially filled {@link Story} * object containing the name and metadata. @@ -316,14 +295,13 @@ public abstract class BasicSupport { getDesc(), isHtml(), null)); } - pg.setProgress(100); + pg.done(); return story; } /** - * Actual processing step, without the calls to other methods. - *
- * Will convert the story resource into a fully filled {@link Story} object. + * Process the given story resource into a fully filled {@link Story} + * object. * * @param pg * the optional progress reporter @@ -333,7 +311,7 @@ public abstract class BasicSupport { * @throws IOException * in case of I/O error */ - // TODO: add final + // ADD final when BasicSupport_Deprecated is gone public Story process(Progress pg) throws IOException { setCurrentReferer(source); login(); @@ -347,8 +325,9 @@ public abstract class BasicSupport { } /** - * Process the given story resource into a fully filled {@link Story} - * object. + * Actual processing step, without the calls to other methods. + *
+ * Will convert the story resource into a fully filled {@link Story} object.
*
* @param pg
* the optional progress reporter
@@ -358,7 +337,7 @@ public abstract class BasicSupport {
* @throws IOException
* in case of I/O error
*/
- public Story doProcess(Progress pg) throws IOException {
+ protected Story doProcess(Progress pg) throws IOException {
if (pg == null) {
pg = new Progress();
} else {
@@ -369,9 +348,7 @@ public abstract class BasicSupport {
Progress pgMeta = new Progress();
pg.addProgress(pgMeta, 10);
Story story = processMeta(true, pgMeta);
- if (!pgMeta.isDone()) {
- pgMeta.setProgress(pgMeta.getMax()); // 10%
- }
+ pgMeta.done(); // 10%
pg.setName("Retrieving " + story.getMeta().getTitle());
@@ -379,9 +356,7 @@ public abstract class BasicSupport {
pg.addProgress(pgGetChapters, 10);
story.setChapters(new ArrayList