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
Update to latest nikiroo-utils
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
Main.java
diff --git
a/src/be/nikiroo/fanfix/Main.java
b/src/be/nikiroo/fanfix/Main.java
index 38f58af3814fcc484f966112af59ec4f96618129..9ac48845ce87d4bc57416bfd2daf7e7f30fa4364 100644
(file)
--- a/
src/be/nikiroo/fanfix/Main.java
+++ b/
src/be/nikiroo/fanfix/Main.java
@@
-8,10
+8,14
@@
import java.net.URL;
import be.nikiroo.fanfix.bundles.StringId;
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.bundles.StringId;
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.fanfix.library.LocalLibrary;
+import be.nikiroo.fanfix.library.RemoteLibrary;
+import be.nikiroo.fanfix.library.RemoteLibraryServer;
import be.nikiroo.fanfix.output.BasicOutput;
import be.nikiroo.fanfix.output.BasicOutput.OutputType;
import be.nikiroo.fanfix.reader.BasicReader;
import be.nikiroo.fanfix.output.BasicOutput;
import be.nikiroo.fanfix.output.BasicOutput.OutputType;
import be.nikiroo.fanfix.reader.BasicReader;
-import be.nikiroo.fanfix.reader.BasicReader.ReaderType;
+import be.nikiroo.fanfix.reader.Reader;
+import be.nikiroo.fanfix.reader.Reader.ReaderType;
import be.nikiroo.fanfix.supported.BasicSupport;
import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
import be.nikiroo.utils.Progress;
import be.nikiroo.fanfix.supported.BasicSupport;
import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
import be.nikiroo.utils.Progress;
@@
-181,12
+185,8
@@
public class Main {
host = args[i];
} else if (port == null) {
port = Integer.parseInt(args[i]);
host = args[i];
} else if (port == null) {
port = Integer.parseInt(args[i]);
- try {
- BasicReader.setDefaultLibrary(new RemoteLibrary(host,
- port));
- } catch (IOException e) {
- Instance.syserr(e);
- }
+ BasicReader
+ .setDefaultLibrary(new RemoteLibrary(host, port));
action = MainAction.START;
} else {
exitCode = 255;
action = MainAction.START;
} else {
exitCode = 255;
@@
-199,6
+199,7
@@
public class Main {
mainProgress.addProgressListener(new Progress.ProgressListener() {
private int current = mainProgress.getMin();
mainProgress.addProgressListener(new Progress.ProgressListener() {
private int current = mainProgress.getMin();
+ @Override
public void progress(Progress progress, String name) {
int diff = progress.getProgress() - current;
current += diff;
public void progress(Progress progress, String name) {
int diff = progress.getProgress() - current;
current += diff;
@@
-307,7
+308,7
@@
public class Main {
}
/**
}
/**
- * Import the given resource into the {@link Library}.
+ * Import the given resource into the {@link L
ocalL
ibrary}.
*
* @param urlString
* the resource to import
*
* @param urlString
* the resource to import
@@
-331,7
+332,8
@@
public class Main {
}
/**
}
/**
- * Export the {@link Story} from the {@link Library} to the given target.
+ * Export the {@link Story} from the {@link LocalLibrary} to the given
+ * target.
*
* @param luid
* the story LUID
*
* @param luid
* the story LUID
@@
-364,8
+366,8
@@
public class Main {
}
/**
}
/**
- * List the stories of the given source from the {@link L
ibrary} (unless
- * NULL is passed, in which case all stories will be listed).
+ * List the stories of the given source from the {@link L
ocalLibrary}
+ *
(unless
NULL is passed, in which case all stories will be listed).
*
* @param source
* the source to list the known stories of, or NULL to list all
*
* @param source
* the source to list the known stories of, or NULL to list all
@@
-382,8
+384,8
@@
public class Main {
* Start the CLI reader for this {@link Story}.
*
* @param story
* Start the CLI reader for this {@link Story}.
*
* @param story
- * the LUID of the {@link Story} in the {@link L
ibrary} <b>or</b>
- * the {@link Story} {@link URL}
+ * the LUID of the {@link Story} in the {@link L
ocalLibrary}
+ *
<b>or</b>
the {@link Story} {@link URL}
* @param chapString
* which {@link Chapter} to read (starting at 1), or NULL to get
* the {@link Story} description
* @param chapString
* which {@link Chapter} to read (starting at 1), or NULL to get
* the {@link Story} description
@@
-395,16
+397,17
@@
public class Main {
*/
private static int read(String story, String chapString, boolean library) {
try {
*/
private static int read(String story, String chapString, boolean library) {
try {
-
Basic
Reader reader = BasicReader.getReader();
+ Reader reader = BasicReader.getReader();
if (library) {
if (library) {
- reader.set
Story(story, null
);
+ reader.set
Meta(story
);
} else {
} else {
- reader.set
Story
(BasicReader.getUrl(story), null);
+ reader.set
Meta
(BasicReader.getUrl(story), null);
}
if (chapString != null) {
try {
}
if (chapString != null) {
try {
- reader.read(Integer.parseInt(chapString));
+ reader.setChapter(Integer.parseInt(chapString));
+ reader.read();
} catch (NumberFormatException e) {
Instance.syserr(new IOException(
"Chapter number cannot be parsed: " + chapString, e));
} catch (NumberFormatException e) {
Instance.syserr(new IOException(
"Chapter number cannot be parsed: " + chapString, e));