X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=a5391d07575e9f6102ab531e4a756c1be718f711;hp=9d71046e3e8afd69f28da7cded27ae0b61964156;hb=0a264fbe3d5a43516006052574a5f322d9d38897;hpb=4ec79417fe5bd4344ac12b39ac8c98db8f9276f6 diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java index 9d71046..a5391d0 100644 --- a/src/be/nikiroo/fanfix/supported/Cbz.java +++ b/src/be/nikiroo/fanfix/supported/Cbz.java @@ -2,6 +2,7 @@ package be.nikiroo.fanfix.supported; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.util.ArrayList; import java.util.Collections; @@ -12,13 +13,16 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import be.nikiroo.fanfix.Instance; +import be.nikiroo.fanfix.bundles.Config; import be.nikiroo.fanfix.data.Chapter; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.data.Paragraph; +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.Progress; +import be.nikiroo.utils.streams.MarkableFileInputStream; /** * Support class for CBZ files (works better with CBZ created with this program, @@ -32,11 +36,6 @@ class Cbz extends Epub { return url.toString().toLowerCase().endsWith(".cbz"); } - @Override - public String getSourceName() { - return "cbz"; - } - @Override protected String getDataPrefix() { return ""; @@ -64,6 +63,8 @@ class Cbz extends Epub { } else { pg.setMinMax(0, 100); } + + pg.setName("Initialising"); Progress pgMeta = new Progress(); pg.addProgress(pgMeta, 10); @@ -71,31 +72,40 @@ class Cbz extends Epub { MetaData meta = story.getMeta(); pgMeta.done(); // 10% - - File tmpDir = Instance.getTempFiles().createTempDir("info-text"); + + File tmpDir = Instance.getInstance().getTempFiles().createTempDir("info-text"); String basename = null; Map images = new HashMap(); + InputStream cbzIn = null; + ZipInputStream zipIn = null; try { - ZipInputStream zipIn = new ZipInputStream(getInput()); + cbzIn = new MarkableFileInputStream(getSourceFileOriginal()); + zipIn = new ZipInputStream(cbzIn); for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn .getNextEntry()) { if (!entry.isDirectory() && 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; } } - + if (imageEntry) { String uuid = meta.getUuid() + "_" + entry.getName(); try { - images.put(uuid, new Image(zipIn)); + Image img = new Image(zipIn); + if (img.getSize() == 0) { + img.close(); + throw new IOException( + "Empty image not accepted"); + } + images.put(uuid, img); } catch (Exception e) { - Instance.getTraceHandler().error(e); + Instance.getInstance().getTraceHandler().error(e); } if (pg.getProgress() < 85) { @@ -110,6 +120,12 @@ class Cbz extends Epub { } } } + + String ext = "." + + Instance.getInstance().getConfig().getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase(); + String coverName = meta.getUuid() + "_" + basename + ext; + Image cover = images.get(coverName); + images.remove(coverName); pg.setProgress(85); @@ -119,28 +135,46 @@ class Cbz extends Epub { pg.setProgress(90); - File txt = new File(tmpDir, basename + ".txt"); - if (!txt.exists()) { - basename = null; - } - if (basename != null) { - try { - BasicSupport support = BasicSupport.getSupport(txt.toURI() - .toURL()); - Story origStory = support.process(null); - story.setChapters(origStory.getChapters()); - story.setMeta(origStory.getMeta()); - } catch (Exception e) { - basename = null; + // only the description/cover is kept + Story origStory = getStoryFromTxt(tmpDir, basename); + if (origStory != null) { + if (origStory.getMeta().getCover() == null) { + origStory.getMeta().setCover(story.getMeta().getCover()); } + story.setMeta(origStory.getMeta()); } + if (story.getMeta().getCover() == null) { + story.getMeta().setCover(cover); + } + story.setChapters(new ArrayList()); + + // Check if we can find non-images chapters, for hybrid-cbz support + 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 (basename == null) { - story.setChapters(new ArrayList()); + if (isImages != null && !isImages) { + story.getChapters().add(chap); + chap.setNumber(story.getChapters().size()); + } + } } if (!imagesList.isEmpty()) { - Chapter chap = new Chapter(story.getChapters().size() + 1, null); + Chapter chap = new Chapter(story.getChapters().size() + 1, ""); story.getChapters().add(chap); for (String uuid : imagesList) { @@ -148,7 +182,7 @@ class Cbz extends Epub { chap.getParagraphs().add( new Paragraph(images.get(uuid))); } catch (Exception e) { - Instance.getTraceHandler().error(e); + Instance.getInstance().getTraceHandler().error(e); } } } @@ -157,12 +191,38 @@ class Cbz extends Epub { meta.setCover(images.get(imagesList.get(0))); meta.setFakeCover(true); } - } finally { IOUtils.deltree(tmpDir); + if (zipIn != null) { + zipIn.close(); + } + if (cbzIn != null) { + cbzIn.close(); + } } - pg.setProgress(100); + pg.done(); return story; } + + private Story getStoryFromTxt(File tmpDir, String basename) { + Story origStory = null; + + File txt = new File(tmpDir, basename + ".txt"); + if (!txt.exists()) { + basename = null; + } + if (basename != null) { + try { + BasicSupport support = BasicSupport.getSupport(txt.toURI() + .toURL()); + origStory = support.process(null); + } catch (Exception e) { + basename = null; + } + } + + return origStory; + + } }