git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'subtree'
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
supported
/
Epub.java
diff --git
a/src/be/nikiroo/fanfix/supported/Epub.java
b/src/be/nikiroo/fanfix/supported/Epub.java
index f8e467831381185244eae24b15d3a96a6cb0f6cb..90a9f458e4fd3ce9c0f8ad331bc407a27dc760ca 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/Epub.java
+++ b/
src/be/nikiroo/fanfix/supported/Epub.java
@@
-42,8
+42,8
@@
class Epub extends InfoText {
try {
return new File(fakeSource.toURI());
} catch (URISyntaxException e) {
try {
return new File(fakeSource.toURI());
} catch (URISyntaxException e) {
- Instance.getInstance().getTraceHandler()
-
.error(new IOException(
"Cannot get the source file from the info-text URL", e));
+ Instance.getInstance().getTraceHandler()
.error(new IOException(
+ "Cannot get the source file from the info-text URL", e));
}
return null;
}
return null;
@@
-55,7
+55,8
@@
class Epub extends InfoText {
try {
fakeIn.reset();
} catch (IOException e) {
try {
fakeIn.reset();
} catch (IOException e) {
- Instance.getInstance().getTraceHandler().error(new IOException("Cannot reset the Epub Text stream", e));
+ Instance.getInstance().getTraceHandler().error(new IOException(
+ "Cannot reset the Epub Text stream", e));
}
return fakeIn;
}
return fakeIn;
@@
-83,7
+84,8
@@
class Epub extends InfoText {
ZipInputStream zipIn = null;
try {
zipIn = new ZipInputStream(in);
ZipInputStream zipIn = null;
try {
zipIn = new ZipInputStream(in);
- tmpDir = Instance.getInstance().getTempFiles().createTempDir("fanfic-reader-parser");
+ tmpDir = Instance.getInstance().getTempFiles()
+ .createTempDir("fanfic-reader-parser");
File tmp = new File(tmpDir, "file.txt");
File tmpInfo = new File(tmpDir, "file.info");
File tmp = new File(tmpDir, "file.txt");
File tmpInfo = new File(tmpDir, "file.info");
@@
-99,8
+101,9
@@
class Epub extends InfoText {
String title = null;
String author = null;
String title = null;
String author = null;
- for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
- .getNextEntry()) {
+ for (ZipEntry entry = zipIn
+ .getNextEntry(); entry != null; entry = zipIn
+ .getNextEntry()) {
if (!entry.isDirectory()
&& entry.getName().startsWith(getDataPrefix())) {
String entryLName = entry.getName().toLowerCase();
if (!entry.isDirectory()
&& entry.getName().startsWith(getDataPrefix())) {
String entryLName = entry.getName().toLowerCase();
@@
-124,18
+127,25
@@
class Epub extends InfoText {
try {
cover = new Image(zipIn);
} catch (Exception e) {
try {
cover = new Image(zipIn);
} catch (Exception e) {
- Instance.getInstance().getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler()
+ .error(e);
}
}
}
}
- } else if (entry.getName().equals(getDataPrefix() + "URL")) {
+ } else if (entry.getName()
+ .equals(getDataPrefix() + "URL")) {
String[] descArray = StringUtils
.unhtml(IOUtils.readSmallStream(zipIn)).trim()
.split("\n");
if (descArray.length > 0) {
url = descArray[0].trim();
}
String[] descArray = StringUtils
.unhtml(IOUtils.readSmallStream(zipIn)).trim()
.split("\n");
if (descArray.length > 0) {
url = descArray[0].trim();
}
- } else if (entry.getName().equals(
- getDataPrefix() + "SUMMARY")) {
+ } else if (entry.getName().endsWith(".desc")) {
+ // // For old files
+ // if (this.desc != null) {
+ // this.desc = IOUtils.readSmallStream(zipIn).trim();
+ // }
+ } else if (entry.getName()
+ .equals(getDataPrefix() + "SUMMARY")) {
String[] descArray = StringUtils
.unhtml(IOUtils.readSmallStream(zipIn)).trim()
.split("\n");
String[] descArray = StringUtils
.unhtml(IOUtils.readSmallStream(zipIn)).trim()
.split("\n");
@@
-149,12
+159,12
@@
class Epub extends InfoText {
skip = 2;
}
}
skip = 2;
}
}
- this.desc = "";
- for (int i = skip; i < descArray.length; i++) {
-
this.desc += descArray[i].trim() + "\n";
- }
-
- this.desc = this.desc.trim();
+
//
this.desc = "";
+
//
for (int i = skip; i < descArray.length; i++) {
+
//
this.desc += descArray[i].trim() + "\n";
+
//
}
+ //
+
//
this.desc = this.desc.trim();
} else {
// Hopefully the data file
IOUtils.write(zipIn, tmp);
} else {
// Hopefully the data file
IOUtils.write(zipIn, tmp);
@@
-198,9
+208,8
@@
class Epub extends InfoText {
if (cover != null) {
meta.setCover(cover);
} else {
if (cover != null) {
meta.setCover(cover);
} else {
- meta.setCover(InfoReader
- .getCoverByName(getSourceFileOriginal().toURI()
- .toURL()));
+ meta.setCover(InfoReader.getCoverByName(
+ getSourceFileOriginal().toURI().toURL()));
}
}
} finally {
}
}
} finally {