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;
import java.util.ArrayList;
import java.util.Collections;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.data.Chapter;
+import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Paragraph;
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;
/**
}
@Override
- public Story process(URL url, Progress pg) throws IOException {
+ public Story doProcess(Progress pg) throws IOException {
if (pg == null) {
pg = new Progress();
} else {
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.getTempFiles().createTempDir("info-text");
String basename = null;
Map<String, Image> images = new HashMap<String, Image>();
+ InputStream cbzIn = null;
+ ZipInputStream zipIn = null;
try {
- ZipInputStream zipIn = new ZipInputStream(getInput());
+ cbzIn = new MarkableFileInputStream(new FileInputStream(
+ 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 : getImageExt(false)) {
+ for (String ext : BasicSupportImages.getImageExt(false)) {
if (entryLName.endsWith(ext)) {
imageEntry = true;
}
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;
+ // include original story
+ Story origStory = getStoryFromTxt(tmpDir, basename);
+ if (origStory != null) {
+ story.setChapters(origStory.getChapters());
+ if (origStory.getMeta().getCover() == null) {
+ origStory.getMeta().setCover(story.getMeta().getCover());
}
- }
-
- if (basename == null) {
+ story.setMeta(origStory.getMeta());
+ } else {
story.setChapters(new ArrayList<Chapter>());
}
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);
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;
+
+ }
}