git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.0.0
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
LocalReader.java
diff --git
a/src/be/nikiroo/fanfix/reader/LocalReader.java
b/src/be/nikiroo/fanfix/reader/LocalReader.java
index 26f48f5a21210fe4d6026b44d0e2bdae3cf3e2c1..c17e83eaa097531eb423473d544c60eabff92a64 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/LocalReader.java
+++ b/
src/be/nikiroo/fanfix/reader/LocalReader.java
@@
-6,11
+6,9
@@
import java.io.IOException;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.Library;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.Library;
-import be.nikiroo.fanfix.bundles.Config;
-import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.fanfix.bundles.UiConfig;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.output.BasicOutput.OutputType;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.output.BasicOutput.OutputType;
-import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
class LocalReader extends BasicReader {
private Library lib;
class LocalReader extends BasicReader {
private Library lib;
@@
-24,14
+22,14
@@
class LocalReader extends BasicReader {
}
// TODO: can throw an exception, manage that (convert to IOEx ?)
}
// TODO: can throw an exception, manage that (convert to IOEx ?)
- OutputType text = OutputType.valueOfNullOkUC(Instance.getConfig()
- .getString(Config.LOCAL_READER_NON_IMAGES_DOCUMENT_TYPE));
+ OutputType text = OutputType.valueOfNullOkUC(Instance.get
Ui
Config()
+ .getString(
Ui
Config.LOCAL_READER_NON_IMAGES_DOCUMENT_TYPE));
if (text == null) {
text = OutputType.HTML;
}
if (text == null) {
text = OutputType.HTML;
}
- OutputType images = OutputType.valueOfNullOkUC(Instance.getConfig()
- .getString(Config.LOCAL_READER_IMAGES_DOCUMENT_TYPE));
+ OutputType images = OutputType.valueOfNullOkUC(Instance.get
Ui
Config()
+ .getString(
Ui
Config.LOCAL_READER_IMAGES_DOCUMENT_TYPE));
if (images == null) {
images = OutputType.CBZ;
}
if (images == null) {
images = OutputType.CBZ;
}
@@
-48,36
+46,35
@@
class LocalReader extends BasicReader {
public void read(int chapter) {
}
public void read(int chapter) {
}
- //
return new
luid
- public
String imprt(String luid)
{
+ //
keep same
luid
+ public
void imprt(String luid) throws IOException
{
try {
Story story = Instance.getLibrary().getStory(luid);
try {
Story story = Instance.getLibrary().getStory(luid);
- story = lib.save(story);
- return story.getMeta().getLuid();
+ if (story != null) {
+ story = lib.save(story, luid);
+ } else {
+ throw new IOException("Cannot find story in Library: " + luid);
+ }
} catch (IOException e) {
} catch (IOException e) {
-
Instance.syserr(
new IOException(
+
throw
new IOException(
"Cannot import story from library to LocalReader library: "
"Cannot import story from library to LocalReader library: "
- + luid, e)
)
;
+ + luid, e);
}
}
-
- return null;
}
}
- public File getTarget(String luid) {
- MetaData meta = lib.getInfo(luid);
+ public File getTarget(String luid) throws IOException {
File file = lib.getFile(luid);
if (file == null) {
File file = lib.getFile(luid);
if (file == null) {
-
luid =
imprt(luid);
+ imprt(luid);
file = lib.getFile(luid);
file = lib.getFile(luid);
- meta = lib.getInfo(luid);
}
return file;
}
@Override
}
return file;
}
@Override
- public void start(S
upportType
type) {
- final S
upportType
typeFinal = type;
+ public void start(S
tring
type) {
+ final S
tring
typeFinal = type;
EventQueue.invokeLater(new Runnable() {
public void run() {
new LocalReaderFrame(LocalReader.this, typeFinal)
EventQueue.invokeLater(new Runnable() {
public void run() {
new LocalReaderFrame(LocalReader.this, typeFinal)
@@
-85,8
+82,4
@@
class LocalReader extends BasicReader {
}
});
}
}
});
}
-
- public static void main(String[] args) throws IOException {
- new LocalReader().start(null);
- }
}
}