X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupport_Deprecated.java;h=512aabf390d8cf9a9aa07fcf692a491249510d2e;hp=bc3738a211bc22b92ac8811e85a549dd17777618;hb=ee8686f095023b8cde2fc33488a58c291acfc50a;hpb=7949d4a5098d8554c333c9fbbda469488bc66f7e

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java b/src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java
index bc3738a..512aabf 100644
--- a/src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java
@@ -203,7 +203,14 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 			pg.setProgress(30);
 
 			Story story = new Story();
+			
 			MetaData meta = getMeta(url, getInput());
+			meta.setType(getType().toString());
+			meta.setSource(getType().getSourceName());
+			if (meta.getPublisher() == null) {
+				meta.setPublisher(getType().getSourceName());
+			}
+			
 			if (meta.getCreationDate() == null
 					|| meta.getCreationDate().trim().isEmpty()) {
 				meta.setCreationDate(bsHelper.formatDate(
@@ -317,7 +324,6 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 
 						words += cc.getWords();
 						story.getChapters().add(cc);
-						story.getMeta().setWords(words);
 					} finally {
 						if (chapIn != null) {
 							chapIn.close();
@@ -326,14 +332,31 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 
 					i++;
 				}
+				
+				story.getMeta().setWords(words);
 
 				pgChaps.setName("Extracting chapters");
 			} else {
 				pg.setProgress(80);
 			}
 
-			return story;
+			// Check for "no chapters" stories
+			if (story.getChapters().isEmpty()
+					&& story.getMeta().getResume() != null
+					&& !story.getMeta().getResume().getParagraphs().isEmpty()) {
+				Chapter resume = story.getMeta().getResume();
+				resume.setName("");
+				resume.setNumber(1);
+				story.getChapters().add(resume);
+				story.getMeta().setWords(resume.getWords());
+
+				String descChapterName = Instance.getInstance().getTrans()
+						.getString(StringId.DESCRIPTION);
+				resume = new Chapter(0, descChapterName);
+				story.getMeta().setResume(resume);
+			}
 
+			return story;
 		} finally {
 			close();
 
@@ -373,7 +396,7 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 	 * @param pg
 	 *            the optional progress reporter
 	 * 
-	 * @return the {@link Chapter}
+	 * @return the {@link Chapter}, never NULL
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
@@ -429,7 +452,7 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 	 * @param pg
 	 *            the optional progress reporter
 	 * 
-	 * @return the {@link Paragraph}s
+	 * @return the {@link Paragraph}s (can be empty, but never NULL)
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
@@ -447,7 +470,6 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 		}
 
 		List<Paragraph> paras = new ArrayList<Paragraph>();
-
 		if (content != null && !content.trim().isEmpty()) {
 			if (isHtml()) {
 				String[] tab = content.split("(<p>|</p>|<br>|<br/>)");
@@ -512,7 +534,7 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 	 * @param line
 	 *            the textual content of the paragraph
 	 * 
-	 * @return the {@link Paragraph}
+	 * @return the {@link Paragraph}, never NULL
 	 */
 	private Paragraph makeParagraph(URL source, String line) {
 		Image image = null;
@@ -636,7 +658,13 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 			InputStream in = null;
 			try {
 				in = Instance.getInstance().getCache().open(url, getSupport(url), true);
-				return new Image(in);
+				Image img = new Image(in);
+				if (img.getSize() == 0) {
+					img.close();
+					throw new IOException(
+							"Empty image not accepted");
+				}
+				return img;
 			} catch (IOException e) {
 			} finally {
 				if (in != null) {
@@ -862,7 +890,7 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 	 * @param line
 	 *            the raw line
 	 * 
-	 * @return the processed {@link Paragraph}
+	 * @return the processed {@link Paragraph}, never NULL
 	 */
 	protected Paragraph processPara(String line) {
 		line = ifUnhtml(line).trim();