git://git.nikiroo.be
/
fanfix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9ac581a
)
try+1
author
Niki Roo
<niki@nikiroo.be>
Fri, 10 Aug 2018 18:06:15 +0000
(20:06 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Fri, 10 Aug 2018 18:06:15 +0000
(20:06 +0200)
src/be/nikiroo/fanfix/library/BasicLibrary.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/supported/Cbz.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/supported/InfoReader.java
patch
|
blob
|
blame
|
history
diff --git
a/src/be/nikiroo/fanfix/library/BasicLibrary.java
b/src/be/nikiroo/fanfix/library/BasicLibrary.java
index 58bd873a25175f38a0385bc525db340f226d2db8..6a2b95a642b0c6c21349d076c9b4c08f3af8a7e0 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/BasicLibrary.java
+++ b/
src/be/nikiroo/fanfix/library/BasicLibrary.java
@@
-355,6
+355,7
@@
abstract public class BasicLibrary {
if (type != null) {
story = BasicSupport.getSupport(type, url) //
.process(pgProcess);
if (type != null) {
story = BasicSupport.getSupport(type, url) //
.process(pgProcess);
+System.out.println("after process: "+story);
// Because we do not want to clear the meta cache:
meta.setCover(story.getMeta().getCover());
story.setMeta(meta);
// Because we do not want to clear the meta cache:
meta.setCover(story.getMeta().getCover());
story.setMeta(meta);
diff --git
a/src/be/nikiroo/fanfix/supported/Cbz.java
b/src/be/nikiroo/fanfix/supported/Cbz.java
index 948a2d65ece471813f79af289f59b38a49fb8fec..3b90769ceb76bd5e340df0f4102c48c89428ec01 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/
src/be/nikiroo/fanfix/supported/Cbz.java
@@
-72,6
+72,8
@@
class Cbz extends Epub {
pg.addProgress(pgMeta, 10);
Story story = processMeta(true, pgMeta);
MetaData meta = story.getMeta();
pg.addProgress(pgMeta, 10);
Story story = processMeta(true, pgMeta);
MetaData meta = story.getMeta();
+
+System.out.println("Meta from Cbz support: "+meta);
pgMeta.done(); // 10%
pgMeta.done(); // 10%
@@
-130,6
+132,9
@@
class Cbz extends Epub {
Story origStory = getStoryFromTxt(tmpDir, basename);
if (origStory != null) {
story.setChapters(origStory.getChapters());
Story origStory = getStoryFromTxt(tmpDir, basename);
if (origStory != null) {
story.setChapters(origStory.getChapters());
+ if (origStory.getMeta().getCover() == null) {
+ origStory.getMeta().setCover(story.getMeta().getCover());
+ }
story.setMeta(origStory.getMeta());
} else {
story.setChapters(new ArrayList<Chapter>());
story.setMeta(origStory.getMeta());
} else {
story.setChapters(new ArrayList<Chapter>());
@@
-153,7
+158,8
@@
class Cbz extends Epub {
meta.setCover(images.get(imagesList.get(0)));
meta.setFakeCover(true);
}
meta.setCover(images.get(imagesList.get(0)));
meta.setFakeCover(true);
}
-
+
+System.out.println("Meta from Cbz support at end: "+meta);
} finally {
IOUtils.deltree(tmpDir);
if (zipIn != null) {
} finally {
IOUtils.deltree(tmpDir);
if (zipIn != null) {
diff --git
a/src/be/nikiroo/fanfix/supported/InfoReader.java
b/src/be/nikiroo/fanfix/supported/InfoReader.java
index f589e6f30787e8fe6c8e4841e4cf0f94e3b36724..817345e028fce27bf6f53f397b3eaeb4a55ca545 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/InfoReader.java
+++ b/
src/be/nikiroo/fanfix/supported/InfoReader.java
@@
-110,7
+110,6
@@
public class InfoReader {
name = name.substring(0, pos);
basefile = new File(basefile.getParent(), name);
name = name.substring(0, pos);
basefile = new File(basefile.getParent(), name);
-System.out.println(">>> " + basefile);
cover = BasicSupportHelper.getImage(null, sourceInfoFile,
basefile.getAbsolutePath() + ext);
}
cover = BasicSupportHelper.getImage(null, sourceInfoFile,
basefile.getAbsolutePath() + ext);
}