X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupport.java;h=d07fbcd93cdd3aa72c1bba621c1595918beb2385;hb=0013f760d69fd7db2b298c3da5d89bc0b102eabf;hp=ed92b2f37821342771f27eb22841ca53a6aa994b;hpb=88664350f0b3849538d4f41f7c3d56d81d03e1a4;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java index ed92b2f..d07fbcd 100644 --- a/src/be/nikiroo/fanfix/supported/BasicSupport.java +++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java @@ -37,13 +37,10 @@ public abstract class BasicSupport { private URL source; private SupportType type; private URL currentReferer; // with only one 'r', as in 'HTTP'... - - /** - * The name of this support class. - * - * @return the name - */ - protected abstract String getSourceName(); + + static protected BasicSupportHelper bsHelper = new BasicSupportHelper(); + static protected BasicSupportImages bsImages = new BasicSupportImages(); + static protected BasicSupportPara bsPara = new BasicSupportPara(new BasicSupportHelper(), new BasicSupportImages()); /** * Check if the given resource is supported by this {@link BasicSupport}. @@ -84,7 +81,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 +244,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. @@ -294,7 +270,6 @@ public abstract class BasicSupport { Story story = new Story(); MetaData meta = getMeta(); -System.out.println("meta from support get: "+meta); if (meta.getCreationDate() == null || meta.getCreationDate().isEmpty()) { meta.setCreationDate(StringUtils.fromTime(new Date().getTime())); } @@ -303,7 +278,7 @@ System.out.println("meta from support get: "+meta); pg.setProgress(50); if (meta.getCover() == null) { - meta.setCover(BasicSupportHelper.getDefaultCover(meta.getSubject())); + meta.setCover(bsHelper.getDefaultCover(meta.getSubject())); } pg.setProgress(60); @@ -312,19 +287,18 @@ System.out.println("meta from support get: "+meta); String descChapterName = Instance.getTrans().getString( StringId.DESCRIPTION); story.getMeta().setResume( - BasicSupportPara.makeChapter(this, source, 0, + bsPara.makeChapter(this, source, 0, descChapterName, // 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 @@ -334,7 +308,7 @@ System.out.println("meta from support get: "+meta); * @throws IOException * in case of I/O error */ - // TODO: add final + // TODO: ADD final when BasicSupport_Deprecated is gone public Story process(Progress pg) throws IOException { setCurrentReferer(source); login(); @@ -348,8 +322,9 @@ System.out.println("meta from support get: "+meta); } /** - * 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
@@ -359,7 +334,7 @@ System.out.println("meta from support get: "+meta);
* @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 {
@@ -370,9 +345,7 @@ System.out.println("meta from support get: "+meta);
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());
@@ -380,9 +353,7 @@ System.out.println("meta from support get: "+meta);
pg.addProgress(pgGetChapters, 10);
story.setChapters(new ArrayList