Fix most irregularities found by conversion tests

[fanfix.git] / src / be / nikiroo / fanfix / supported / BasicSupport.java

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index c35ed86b65b564d4e905c9c635ded5804bd038e4..8154a15e600564e3bfb1da2d9211030512efc72b 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -240,15 +240,6 @@ public abstract class BasicSupport {
        protected void login() throws IOException {
        }
 
-       /**
-        * Prepare the support if needed before processing.
-        * 
-        * @throws IOException
-        *             on I/O error
-        */
-       protected void preprocess() throws IOException {
-       }
-
        /**
         * Now that we have processed the {@link Story}, close the resources if any.
         */
@@ -265,10 +256,9 @@ public abstract class BasicSupport {
         * @throws IOException
         *             in case of I/O error
         */
-       public Story processMeta() throws IOException {
+       public final Story processMeta() throws IOException {
                Story story = null;
 
-               preprocess();
                try {
                        story = processMeta(false, null);
                } finally {
@@ -330,6 +320,32 @@ public abstract class BasicSupport {
                return story;
        }
 
+       /**
+        * Actual processing step, without the calls to other methods.
+        * <p>
+        * Will convert the story resource into a fully filled {@link Story} object.
+        * 
+        * @param pg
+        *            the optional progress reporter
+        * 
+        * @return the {@link Story}, never NULL
+        * 
+        * @throws IOException
+        *             in case of I/O error
+        */
+       // TODO: add final
+       public Story process(Progress pg) throws IOException {
+               setCurrentReferer(source);
+               login();
+               sourceNode = loadDocument(source);
+
+               try {
+                       return doProcess(pg);
+               } finally {
+                       close();
+               }
+       }
+
        /**
         * Process the given story resource into a fully filled {@link Story}
         * object.
@@ -342,87 +358,78 @@ public abstract class BasicSupport {
         * @throws IOException
         *             in case of I/O error
         */
-       public Story process(Progress pg) throws IOException {
+       public Story doProcess(Progress pg) throws IOException {
                if (pg == null) {
                        pg = new Progress();
                } else {
                        pg.setMinMax(0, 100);
                }
 
-               setCurrentReferer(source);
-               login();
-               sourceNode = loadDocument(source);
-
                pg.setProgress(1);
-               try {
-                       Progress pgMeta = new Progress();
-                       pg.addProgress(pgMeta, 10);
-                       preprocess();
-                       Story story = processMeta(true, pgMeta);
-                       if (!pgMeta.isDone()) {
-                               pgMeta.setProgress(pgMeta.getMax()); // 10%
-                       }
+               Progress pgMeta = new Progress();
+               pg.addProgress(pgMeta, 10);
+               Story story = processMeta(true, pgMeta);
+               if (!pgMeta.isDone()) {
+                       pgMeta.setProgress(pgMeta.getMax()); // 10%
+               }
 
-                       pg.setName("Retrieving " + story.getMeta().getTitle());
+               pg.setName("Retrieving " + story.getMeta().getTitle());
 
-                       Progress pgGetChapters = new Progress();
-                       pg.addProgress(pgGetChapters, 10);
-                       story.setChapters(new ArrayList<Chapter>());
-                       List<Entry<String, URL>> chapters = getChapters(pgGetChapters);
-                       if (!pgGetChapters.isDone()) {
-                               pgGetChapters.setProgress(pgGetChapters.getMax()); // 20%
-                       }
+               Progress pgGetChapters = new Progress();
+               pg.addProgress(pgGetChapters, 10);
+               story.setChapters(new ArrayList<Chapter>());
+               List<Entry<String, URL>> chapters = getChapters(pgGetChapters);
+               if (!pgGetChapters.isDone()) {
+                       pgGetChapters.setProgress(pgGetChapters.getMax()); // 20%
+               }
+
+               if (chapters != null) {
+                       Progress pgChaps = new Progress("Extracting chapters", 0,
+                                       chapters.size() * 300);
+                       pg.addProgress(pgChaps, 80);
+
+                       long words = 0;
+                       int i = 1;
+                       for (Entry<String, URL> chap : chapters) {
+                               pgChaps.setName("Extracting chapter " + i);
+                               URL chapUrl = chap.getValue();
+                               String chapName = chap.getKey();
+                               if (chapUrl != null) {
+                                       setCurrentReferer(chapUrl);
+                               }
+
+                               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());
+                               }
 
-                       if (chapters != null) {
-                               Progress pgChaps = new Progress("Extracting chapters", 0,
-                                               chapters.size() * 300);
-                               pg.addProgress(pgChaps, 80);
-
-                               long words = 0;
-                               int i = 1;
-                               for (Entry<String, URL> chap : chapters) {
-                                       pgChaps.setName("Extracting chapter " + i);
-                                       URL chapUrl = chap.getValue();
-                                       String chapName = chap.getKey();
-                                       if (chapUrl != null) {
-                                               setCurrentReferer(chapUrl);
-                                       }
-
-                                       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());
-                                       }
-
-                                       Chapter cc = BasicSupportPara.makeChapter(this, chapUrl, i,
-                                                       chapName, content, isHtml(), pgMakeChapter);
-                                       if (!pgMakeChapter.isDone()) {
-                                               pgMakeChapter.setProgress(pgMakeChapter.getMax());
-                                       }
-
-                                       words += cc.getWords();
-                                       story.getChapters().add(cc);
-                                       story.getMeta().setWords(words);
-
-                                       i++;
+                               Chapter cc = BasicSupportPara.makeChapter(this, chapUrl, i,
+                                               chapName, content, isHtml(), pgMakeChapter);
+                               if (!pgMakeChapter.isDone()) {
+                                       pgMakeChapter.setProgress(pgMakeChapter.getMax());
                                }
 
-                               pgChaps.setName("Extracting chapters");
-                       } else {
-                               pg.setProgress(80);
+                               words += cc.getWords();
+                               story.getChapters().add(cc);
+                               story.getMeta().setWords(words);
+
+                               i++;
                        }
 
-                       return story;
-               } finally {
-                       close();
+                       pgChaps.setName("Extracting chapters");
+               } else {
+                       pg.setProgress(80);
                }
+
+               return story;
        }
 
        /**