X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=c7475fa775640e39f57aa8b1d218ab3cd51841b8;hb=8d59ce0748baeeea0458bab49716ab4543aae439;hp=062adf0fac71550a8946257f9123e2d178ba7d98;hpb=76f58e5637fb3b329ce15d847987f24b9fdaf04d;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 062adf0..c7475fa 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -1,7 +1,6 @@
 package be.nikiroo.fanfix.supported;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -21,8 +20,8 @@ import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.Image;
-import be.nikiroo.utils.MarkableFileInputStream;
 import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 
 /**
  * Support class for CBZ files (works better with CBZ created with this program,
@@ -36,11 +35,6 @@ class Cbz extends Epub {
 		return url.toString().toLowerCase().endsWith(".cbz");
 	}
 
-	@Override
-	public String getSourceName() {
-		return "cbz";
-	}
-
 	@Override
 	protected String getDataPrefix() {
 		return "";
@@ -83,8 +77,7 @@ class Cbz extends Epub {
 		InputStream cbzIn = null;
 		ZipInputStream zipIn = null;
 		try {
-			cbzIn = new MarkableFileInputStream(new FileInputStream(
-					getSourceFileOriginal()));
+			cbzIn = new MarkableFileInputStream(getSourceFileOriginal());
 			zipIn = new ZipInputStream(cbzIn);
 			for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
 					.getNextEntry()) {
@@ -92,7 +85,7 @@ class Cbz extends Epub {
 						&& entry.getName().startsWith(getDataPrefix())) {
 					String entryLName = entry.getName().toLowerCase();
 					boolean imageEntry = false;
-					for (String ext : BasicSupportImages.getImageExt(false)) {
+					for (String ext : bsImages.getImageExt(false)) {
 						if (entryLName.endsWith(ext)) {
 							imageEntry = true;
 						}
@@ -138,25 +131,27 @@ class Cbz extends Epub {
 			story.setChapters(new ArrayList<Chapter>());
 
 			// Check if we can find non-images chapters, for hybrid-cbz support
-			for (Chapter chap : origStory) {
-				Boolean isImages = null;
-				for (Paragraph para : chap) {
-					ParagraphType t = para.getType();
-					if (isImages == null && !t.isText(true)) {
-						isImages = true;
-					}
-					if (t.isText(false)) {
-						String line = para.getContent();
-						// Images are saved in text mode as "[image-link]"
-						if (!(line.startsWith("[") && line.endsWith("]"))) {
-							isImages = false;
+			if (origStory != null) {
+				for (Chapter chap : origStory) {
+					Boolean isImages = null;
+					for (Paragraph para : chap) {
+						ParagraphType t = para.getType();
+						if (isImages == null && !t.isText(true)) {
+							isImages = true;
+						}
+						if (t.isText(false)) {
+							String line = para.getContent();
+							// Images are saved in text mode as "[image-link]"
+							if (!(line.startsWith("[") && line.endsWith("]"))) {
+								isImages = false;
+							}
 						}
 					}
-				}
 
-				if (isImages != null && !isImages) {
-					story.getChapters().add(chap);
-					chap.setNumber(story.getChapters().size());
+					if (isImages != null && !isImages) {
+						story.getChapters().add(chap);
+						chap.setNumber(story.getChapters().size());
+					}
 				}
 			}