X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=a5391d07575e9f6102ab531e4a756c1be718f711;hp=77a4008068f4a6ec1b3ea876701dea70b0a830fb;hb=0a264fbe3d5a43516006052574a5f322d9d38897;hpb=925298fd058a953144058f8b70d939c2a3e7ea5b diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java index 77a4008..a5391d0 100644 --- a/src/be/nikiroo/fanfix/supported/Cbz.java +++ b/src/be/nikiroo/fanfix/supported/Cbz.java @@ -1,6 +1,6 @@ package be.nikiroo.fanfix.supported; -import java.awt.image.BufferedImage; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -13,11 +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.ImageUtils; +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, @@ -31,11 +36,6 @@ class Cbz extends Epub { return url.toString().toLowerCase().endsWith(".cbz"); } - @Override - public String getSourceName() { - return "cbz"; - } - @Override protected String getDataPrefix() { return ""; @@ -47,85 +47,182 @@ class Cbz extends Epub { } @Override - protected boolean getCover() { - return false; + protected boolean isImagesDocumentByDefault() { + return true; } @Override - protected void preprocess(URL source, InputStream in) throws IOException { - super.preprocess(source, in); - meta.setImageDocument(true); + protected boolean getCover() { + return false; } @Override - public Story process(URL url, Progress pg) throws IOException { + public Story doProcess(Progress pg) throws IOException { if (pg == null) { pg = new Progress(); } else { pg.setMinMax(0, 100); } + + pg.setName("Initialising"); Progress pgMeta = new Progress(); pg.addProgress(pgMeta, 10); - Story story = processMeta(url, false, true, pgMeta); + Story story = processMeta(true, pgMeta); + MetaData meta = story.getMeta(); + pgMeta.done(); // 10% + + File tmpDir = Instance.getInstance().getTempFiles().createTempDir("info-text"); + String basename = null; + + Map images = new HashMap(); + InputStream cbzIn = null; + ZipInputStream zipIn = null; + try { + 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 : bsImages.getImageExt(false)) { + if (entryLName.endsWith(ext)) { + imageEntry = true; + } + } + + if (imageEntry) { + String uuid = meta.getUuid() + "_" + entry.getName(); + try { + 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.getInstance().getTraceHandler().error(e); + } + + if (pg.getProgress() < 85) { + pg.add(1); + } + } else if (entryLName.endsWith(".info")) { + basename = entryLName.substring(0, entryLName.length() + - ".info".length()); + IOUtils.write(zipIn, new File(tmpDir, entryLName)); + } else if (entryLName.endsWith(".txt")) { + IOUtils.write(zipIn, new File(tmpDir, entryLName)); + } + } + } + + 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); + + // ZIP order is not correct for us + List imagesList = new ArrayList(images.keySet()); + Collections.sort(imagesList); + + pg.setProgress(90); + + // 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; + } + } + } - story.setChapters(new ArrayList()); - Chapter chap = new Chapter(1, null); - story.getChapters().add(chap); - - ZipInputStream zipIn = new ZipInputStream(getInput()); - - Map images = new HashMap(); - 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 : getImageExt(false)) { - if (entryLName.endsWith(ext)) { - imageEntry = true; + if (isImages != null && !isImages) { + story.getChapters().add(chap); + chap.setNumber(story.getChapters().size()); } } + } - if (imageEntry) { - String uuid = meta.getUuid() + "_" + entry.getName(); + if (!imagesList.isEmpty()) { + Chapter chap = new Chapter(story.getChapters().size() + 1, ""); + story.getChapters().add(chap); + + for (String uuid : imagesList) { try { - images.put(uuid, ImageUtils.fromStream(zipIn)); + chap.getParagraphs().add( + new Paragraph(images.get(uuid))); } catch (Exception e) { - Instance.getTraceHandler().error(e); - } - - if (pg.getProgress() < 85) { - pg.add(1); + Instance.getInstance().getTraceHandler().error(e); } } } - } - pg.setProgress(85); + if (meta.getCover() == null && !images.isEmpty()) { + meta.setCover(images.get(imagesList.get(0))); + meta.setFakeCover(true); + } + } finally { + IOUtils.deltree(tmpDir); + if (zipIn != null) { + zipIn.close(); + } + if (cbzIn != null) { + cbzIn.close(); + } + } - // ZIP order is not correct for us - List imagesList = new ArrayList(images.keySet()); - Collections.sort(imagesList); + pg.done(); + return story; + } - pg.setProgress(90); + private Story getStoryFromTxt(File tmpDir, String basename) { + Story origStory = null; - for (String uuid : imagesList) { + File txt = new File(tmpDir, basename + ".txt"); + if (!txt.exists()) { + basename = null; + } + if (basename != null) { try { - chap.getParagraphs().add(new Paragraph(images.get(uuid))); + BasicSupport support = BasicSupport.getSupport(txt.toURI() + .toURL()); + origStory = support.process(null); } catch (Exception e) { - Instance.getTraceHandler().error(e); + basename = null; } } - if (meta.getCover() == null && !images.isEmpty()) { - meta.setCover(images.get(imagesList.get(0))); - meta.setFakeCover(true); - } + return origStory; - pg.setProgress(100); - return story; } }