X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=a6188ec55085467b1306f5a9ac91e0083bdf014d;hb=97654d115d9f0286f9eea9fe50216cb3737e9ed6;hp=012c0474a95df1a05cae162a9518e322f9099a80;hpb=08fe2e33007063e30fe22dc1d290f8afaa18eb1d;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java index 012c047..a6188ec 100644 --- a/src/be/nikiroo/fanfix/supported/Cbz.java +++ b/src/be/nikiroo/fanfix/supported/Cbz.java @@ -5,13 +5,24 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; 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, @@ -25,11 +36,6 @@ class Cbz extends Epub { return url.toString().toLowerCase().endsWith(".cbz"); } - @Override - public String getSourceName() { - return "cbz"; - } - @Override protected String getDataPrefix() { return ""; @@ -39,10 +45,9 @@ class Cbz extends Epub { protected boolean requireInfo() { return false; } - + @Override - public boolean isImageDocument(URL source, InputStream in) - throws IOException { + protected boolean isImagesDocumentByDefault() { return true; } @@ -52,42 +57,166 @@ class Cbz extends Epub { } @Override - public Story process(URL url) throws IOException { - Story story = processMeta(url, false, true); - story.setChapters(new ArrayList()); - Chapter chap = new Chapter(1, null); - story.getChapters().add(chap); - - ZipInputStream zipIn = new ZipInputStream(getInput()); - - 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; + 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(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 { + images.put(uuid, new Image(zipIn)); + } 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); - if (imageEntry) { - try { - // we assume that we can get the UUID without a stream - String uuid = getUuid(url, null) + "_" - + entry.getName(); + 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; + } + } + } + + if (isImages != null && !isImages) { + story.getChapters().add(chap); + chap.setNumber(story.getChapters().size()); + } + } + } - Instance.getCache().addToCache(zipIn, uuid); + if (!imagesList.isEmpty()) { + Chapter chap = new Chapter(story.getChapters().size() + 1, null); + story.getChapters().add(chap); + + for (String uuid : imagesList) { + try { chap.getParagraphs().add( - new Paragraph(new File(uuid).toURI().toURL())); + new Paragraph(images.get(uuid))); } catch (Exception e) { - Instance.syserr(e); + Instance.getInstance().getTraceHandler().error(e); } } } + + 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(); + } } + 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; + + } }