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 version of 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 85d74928458e1589926bd0e0ab0f8d34be725c78..adbd5a374bb3f280dd43a6dd6581a61ab0f1e789 100644
(file)
--- a/
src/be/nikiroo/fanfix/Main.java
+++ b/
src/be/nikiroo/fanfix/Main.java
@@
-8,15
+8,19
@@
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.utils.Version;
import be.nikiroo.fanfix.supported.BasicSupport;
import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Version;
-import be.nikiroo.utils.
ui.UIUtils
;
+import be.nikiroo.utils.
serial.Server
;
/**
* Main program entry point.
/**
* Main program entry point.
@@
-25,7
+29,7
@@
import be.nikiroo.utils.ui.UIUtils;
*/
public class Main {
private enum MainAction {
*/
public class Main {
private enum MainAction {
- IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION,
+ IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION,
SERVER, REMOTE,
}
/**
}
/**
@@
-52,9
+56,11
@@
public class Main {
* <li>--read-url [URL] ([chapter number]): convert on the fly and read the
* story, without saving it</li>
* <li>--list ([type]): list the stories present in the library</li>
* <li>--read-url [URL] ([chapter number]): convert on the fly and read the
* story, without saving it</li>
* <li>--list ([type]): list the stories present in the library</li>
- * <li>--set-reader [reader type]: set the reader type to CLI
or LOCAL for
- * this command</li>
+ * <li>--set-reader [reader type]: set the reader type to CLI
, TUI or LOCAL
+ *
for
this command</li>
* <li>--version: get the version of the program</li>
* <li>--version: get the version of the program</li>
+ * <li>--server [port]: start a server on this port</li>
+ * <li>--remote [host] [port]: use a the given remote library</li>
* </ul>
*
* @param args
* </ul>
*
* @param args
@@
-63,11
+69,13
@@
public class Main {
public static void main(String[] args) {
String urlString = null;
String luid = null;
public static void main(String[] args) {
String urlString = null;
String luid = null;
- String
typ
eString = null;
+ String
sourc
eString = null;
String chapString = null;
String target = null;
MainAction action = MainAction.START;
Boolean plusInfo = null;
String chapString = null;
String target = null;
MainAction action = MainAction.START;
Boolean plusInfo = null;
+ String host = null;
+ Integer port = null;
boolean noMoreActions = false;
boolean noMoreActions = false;
@@
-102,8
+110,8
@@
public class Main {
case EXPORT:
if (luid == null) {
luid = args[i];
case EXPORT:
if (luid == null) {
luid = args[i];
- } else if (
typ
eString == null) {
-
typ
eString = args[i];
+ } else if (
sourc
eString == null) {
+
sourc
eString = args[i];
} else if (target == null) {
target = args[i];
} else {
} else if (target == null) {
target = args[i];
} else {
@@
-113,8
+121,8
@@
public class Main {
case CONVERT:
if (urlString == null) {
urlString = args[i];
case CONVERT:
if (urlString == null) {
urlString = args[i];
- } else if (
typ
eString == null) {
-
typ
eString = args[i];
+ } else if (
sourc
eString == null) {
+
sourc
eString = args[i];
} else if (target == null) {
target = args[i];
} else if (plusInfo == null) {
} else if (target == null) {
target = args[i];
} else if (plusInfo == null) {
@@
-128,8
+136,8
@@
public class Main {
}
break;
case LIST:
}
break;
case LIST:
- if (
typ
eString == null) {
-
typ
eString = args[i];
+ if (
sourc
eString == null) {
+
sourc
eString = args[i];
} else {
exitCode = 255;
}
} else {
exitCode = 255;
}
@@
-157,12
+165,33
@@
public class Main {
break;
case SET_READER:
exitCode = setReaderType(args[i]);
break;
case SET_READER:
exitCode = setReaderType(args[i]);
+ action = MainAction.START;
break;
case START:
exitCode = 255; // not supposed to be selected by user
break;
case VERSION:
exitCode = 255; // no arguments for this option
break;
case START:
exitCode = 255; // not supposed to be selected by user
break;
case VERSION:
exitCode = 255; // no arguments for this option
+ break;
+ case SERVER:
+ if (port == null) {
+ port = Integer.parseInt(args[i]);
+ } else {
+ exitCode = 255;
+ }
+ break;
+ case REMOTE:
+ if (host == null) {
+ host = args[i];
+ } else if (port == null) {
+ port = Integer.parseInt(args[i]);
+ BasicReader
+ .setDefaultLibrary(new RemoteLibrary(host, port));
+ action = MainAction.START;
+ } else {
+ exitCode = 255;
+ }
+ break;
}
}
}
}
@@
-214,16
+243,16
@@
public class Main {
updates.ok(); // we consider it read
break;
case EXPORT:
updates.ok(); // we consider it read
break;
case EXPORT:
- exitCode = export(luid,
typ
eString, target, pg);
+ exitCode = export(luid,
sourc
eString, target, pg);
updates.ok(); // we consider it read
break;
case CONVERT:
updates.ok(); // we consider it read
break;
case CONVERT:
- exitCode = convert(urlString,
typ
eString, target,
+ exitCode = convert(urlString,
sourc
eString, target,
plusInfo == null ? false : plusInfo, pg);
updates.ok(); // we consider it read
break;
case LIST:
plusInfo == null ? false : plusInfo, pg);
updates.ok(); // we consider it read
break;
case LIST:
- exitCode = list(
typ
eString);
+ exitCode = list(
sourc
eString);
break;
case READ:
exitCode = read(luid, chapString, true);
break;
case READ:
exitCode = read(luid, chapString, true);
@@
-236,6
+265,7
@@
public class Main {
exitCode = 0;
break;
case SET_READER:
exitCode = 0;
break;
case SET_READER:
+ exitCode = 255;
break;
case VERSION:
System.out
break;
case VERSION:
System.out
@@
-246,9
+276,23
@@
public class Main {
updates.ok(); // we consider it read
break;
case START:
updates.ok(); // we consider it read
break;
case START:
- UIUtils.setLookAndFeel();
- BasicReader.setDefaultReaderType(ReaderType.LOCAL);
- BasicReader.getReader().start(null);
+ BasicReader.getReader().browse(null);
+ break;
+ case SERVER:
+ if (port == null) {
+ exitCode = 255;
+ break;
+ }
+ try {
+ Server server = new RemoteLibraryServer(port);
+ server.start();
+ System.out.println("Remote server started on: " + port);
+ } catch (IOException e) {
+ Instance.syserr(e);
+ }
+ return;
+ case REMOTE:
+ exitCode = 255;
break;
}
}
break;
}
}
@@
-263,7
+307,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
@@
-287,7
+331,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
@@
-320,17
+365,17
@@
public class Main {
}
/**
}
/**
- * List the stories of the given
type from the {@link Library} (unless NULL
- * is passed, in which case all stories will be listed).
+ * List the stories of the given
source from the {@link LocalLibrary}
+ *
(unless NULL
is passed, in which case all stories will be listed).
*
*
- * @param
typeString
- * the
typ
e to list the known stories of, or NULL to list all
+ * @param
source
+ * the
sourc
e to list the known stories of, or NULL to list all
* stories
*
* @return the exit return code (0 = success)
*/
* stories
*
* @return the exit return code (0 = success)
*/
- private static int list(String
typ
e) {
- BasicReader.getReader().
start(typ
e);
+ private static int list(String
sourc
e) {
+ BasicReader.getReader().
browse(sourc
e);
return 0;
}
return 0;
}
@@
-338,8
+383,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
@@
-351,16
+396,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));