X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupport.java;h=0b0e66c401cff6532efe281c79c1aed7f385f4ce;hb=727108fef9dcc661d45fa69ebf8b76f5128a2b6f;hp=8154a15e600564e3bfb1da2d9211030512efc72b;hpb=6bfa27805ec903223e6e45c6f4d00e94629a064c;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index 8154a15..0b0e66c 100644
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -38,13 +38,6 @@ public abstract class BasicSupport {
 	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();
-
 	/**
 	 * Check if the given resource is supported by this {@link BasicSupport}.
 	 * 
@@ -84,7 +77,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).
 	 * <p>
 	 * Can be NULL if this {@link BasicSupport} do no use chapters.
 	 * 
@@ -247,27 +240,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 +288,13 @@ public abstract class BasicSupport {
 							getDesc(), isHtml(), null));
 		}
 
-		pg.setProgress(100);
+		pg.done();
 		return story;
 	}
 
 	/**
-	 * Actual processing step, without the calls to other methods.
-	 * <p>
-	 * 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 +304,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 +318,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.
+	 * <p>
+	 * Will convert the story resource into a fully filled {@link Story} object.
 	 * 
 	 * @param pg
 	 *            the optional progress reporter
@@ -358,7 +330,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 +341,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 +349,7 @@ public abstract class BasicSupport {
 		pg.addProgress(pgGetChapters, 10);
 		story.setChapters(new ArrayList<Chapter>());
 		List<Entry<String, URL>> chapters = getChapters(pgGetChapters);
-		if (!pgGetChapters.isDone()) {
-			pgGetChapters.setProgress(pgGetChapters.getMax()); // 20%
-		}
+		pgGetChapters.done(); // 20%
 
 		if (chapters != null) {
 			Progress pgChaps = new Progress("Extracting chapters", 0,
@@ -406,16 +374,10 @@ public abstract class BasicSupport {
 
 				String content = getChapterContent(chapUrl, i,
 						pgGetChapterContent);
-				if (!pgGetChapterContent.isDone()) {
-					pgGetChapterContent.setProgress(pgGetChapterContent
-							.getMax());
-				}
-
+				pgGetChapterContent.done();
 				Chapter cc = BasicSupportPara.makeChapter(this, chapUrl, i,
 						chapName, content, isHtml(), pgMakeChapter);
-				if (!pgMakeChapter.isDone()) {
-					pgMakeChapter.setProgress(pgMakeChapter.getMax());
-				}
+				pgMakeChapter.done();
 
 				words += cc.getWords();
 				story.getChapters().add(cc);
@@ -425,10 +387,11 @@ public abstract class BasicSupport {
 			}
 
 			pgChaps.setName("Extracting chapters");
-		} else {
-			pg.setProgress(80);
+			pgChaps.done();
 		}
 
+		pg.done();
+
 		return story;
 	}
 
@@ -474,7 +437,8 @@ public abstract class BasicSupport {
 	 *            the type
 	 * @param url
 	 *            the {@link URL} to support (can be NULL to get an
-	 *            "abstract support")
+	 *            "abstract support"; if not NULL, will be used as the source
+	 *            URL)
 	 * 
 	 * @return an implementation that supports it, or NULL
 	 */
@@ -514,6 +478,9 @@ public abstract class BasicSupport {
 		case E_HENTAI:
 			support = new EHentai();
 			break;
+		case MANGA_LEL:
+			support = new MangaLel();
+			break;
 		case CBZ:
 			support = new Cbz();
 			break;