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 'master' into subtree
[nikiroo-utils.git]
/
supported
/
BasicSupport_Deprecated.java
diff --git
a/supported/BasicSupport_Deprecated.java
b/supported/BasicSupport_Deprecated.java
index ad030c0ced64825def174a7bfed5d81b4f00c7d9..9aac6d5c61b713a4641fc251796b981e48d3a2ec 100644
(file)
--- a/
supported/BasicSupport_Deprecated.java
+++ b/
supported/BasicSupport_Deprecated.java
@@
-203,7
+203,12
@@
public abstract class BasicSupport_Deprecated extends BasicSupport {
pg.setProgress(30);
Story story = new Story();
pg.setProgress(30);
Story story = new Story();
+
MetaData meta = getMeta(url, getInput());
MetaData meta = getMeta(url, getInput());
+ meta.setType(getType().toString());
+ meta.setSource(getType().getSourceName());
+ meta.setPublisher(getType().getSourceName());
+
if (meta.getCreationDate() == null
|| meta.getCreationDate().trim().isEmpty()) {
meta.setCreationDate(bsHelper.formatDate(
if (meta.getCreationDate() == null
|| meta.getCreationDate().trim().isEmpty()) {
meta.setCreationDate(bsHelper.formatDate(
@@
-317,7
+322,6
@@
public abstract class BasicSupport_Deprecated extends BasicSupport {
words += cc.getWords();
story.getChapters().add(cc);
words += cc.getWords();
story.getChapters().add(cc);
- story.getMeta().setWords(words);
} finally {
if (chapIn != null) {
chapIn.close();
} finally {
if (chapIn != null) {
chapIn.close();
@@
-326,6
+330,8
@@
public abstract class BasicSupport_Deprecated extends BasicSupport {
i++;
}
i++;
}
+
+ story.getMeta().setWords(words);
pgChaps.setName("Extracting chapters");
} else {
pgChaps.setName("Extracting chapters");
} else {
@@
-340,6
+346,7
@@
public abstract class BasicSupport_Deprecated extends BasicSupport {
resume.setName("");
resume.setNumber(1);
story.getChapters().add(resume);
resume.setName("");
resume.setNumber(1);
story.getChapters().add(resume);
+ story.getMeta().setWords(resume.getWords());
String descChapterName = Instance.getInstance().getTrans()
.getString(StringId.DESCRIPTION);
String descChapterName = Instance.getInstance().getTrans()
.getString(StringId.DESCRIPTION);
@@
-649,7
+656,13
@@
public abstract class BasicSupport_Deprecated extends BasicSupport {
InputStream in = null;
try {
in = Instance.getInstance().getCache().open(url, getSupport(url), true);
InputStream in = null;
try {
in = Instance.getInstance().getCache().open(url, getSupport(url), true);
- return new Image(in);
+ Image img = new Image(in);
+ if (img.getSize() == 0) {
+ img.close();
+ throw new IOException(
+ "Empty image not accepted");
+ }
+ return img;
} catch (IOException e) {
} finally {
if (in != null) {
} catch (IOException e) {
} finally {
if (in != null) {