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
Fix tests:
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
Main.java
diff --git
a/src/be/nikiroo/fanfix/Main.java
b/src/be/nikiroo/fanfix/Main.java
index c17a1d8b988f0a52c7c763efd9bad67f48bebd92..e1b9c650c328b91a47c57d4b2e4f97c38262c265 100644
(file)
--- a/
src/be/nikiroo/fanfix/Main.java
+++ b/
src/be/nikiroo/fanfix/Main.java
@@
-4,10
+4,14
@@
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.List;
import be.nikiroo.fanfix.bundles.StringId;
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.bundles.StringId;
import be.nikiroo.fanfix.data.Chapter;
+import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.fanfix.library.BasicLibrary;
+import be.nikiroo.fanfix.library.CacheLibrary;
import be.nikiroo.fanfix.library.LocalLibrary;
import be.nikiroo.fanfix.library.RemoteLibrary;
import be.nikiroo.fanfix.library.RemoteLibraryServer;
import be.nikiroo.fanfix.library.LocalLibrary;
import be.nikiroo.fanfix.library.RemoteLibrary;
import be.nikiroo.fanfix.library.RemoteLibraryServer;
@@
-17,10
+21,10
@@
import be.nikiroo.fanfix.reader.BasicReader;
import be.nikiroo.fanfix.reader.Reader;
import be.nikiroo.fanfix.reader.Reader.ReaderType;
import be.nikiroo.fanfix.supported.BasicSupport;
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.fanfix.supported.SupportType;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.
Server
;
+import be.nikiroo.utils.serial.
server.ServerObject
;
/**
* Main program entry point.
/**
* Main program entry point.
@@
-29,7
+33,7
@@
import be.nikiroo.utils.serial.Server;
*/
public class Main {
private enum MainAction {
*/
public class Main {
private enum MainAction {
- IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, REMOTE,
+ IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER,
STOP_SERVER,
REMOTE,
}
/**
}
/**
@@
-59,8
+63,10
@@
public class Main {
* <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>--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>--server [port]: start a server on this port</li>
- * <li>--remote [host] [port]: use a the given remote library</li>
+ * <li>--server [key] [port]: start a server on this port</li>
+ * <li>--stop-server [key] [port]: stop the running server on this port if
+ * any</li>
+ * <li>--remote [key] [host] [port]: use a the given remote library</li>
* </ul>
*
* @param args
* </ul>
*
* @param args
@@
-72,6
+78,7
@@
public class Main {
String sourceString = null;
String chapString = null;
String target = null;
String sourceString = null;
String chapString = null;
String target = null;
+ String key = null;
MainAction action = MainAction.START;
Boolean plusInfo = null;
String host = null;
MainAction action = MainAction.START;
Boolean plusInfo = null;
String host = null;
@@
-90,8
+97,9
@@
public class Main {
action = MainAction.valueOf(args[i].substring(2)
.toUpperCase().replace("-", "_"));
} catch (Exception e) {
action = MainAction.valueOf(args[i].substring(2)
.toUpperCase().replace("-", "_"));
} catch (Exception e) {
- Instance.syserr(new IllegalArgumentException(
- "Unknown action: " + args[i], e));
+ Instance.getTraceHandler().error(
+ new IllegalArgumentException("Unknown action: "
+ + args[i], e));
exitCode = 255;
}
}
exitCode = 255;
}
}
@@
-174,19
+182,28
@@
public class Main {
exitCode = 255; // no arguments for this option
break;
case SERVER:
exitCode = 255; // no arguments for this option
break;
case SERVER:
- if (port == null) {
+ case STOP_SERVER:
+ if (key == null) {
+ key = args[i];
+ } else if (port == null) {
port = Integer.parseInt(args[i]);
} else {
exitCode = 255;
}
break;
case REMOTE:
port = Integer.parseInt(args[i]);
} else {
exitCode = 255;
}
break;
case REMOTE:
- if (host == null) {
+ if (key == null) {
+ key = args[i];
+ } else if (host == null) {
host = args[i];
} else if (port == null) {
port = Integer.parseInt(args[i]);
host = args[i];
} else if (port == null) {
port = Integer.parseInt(args[i]);
- BasicReader
- .setDefaultLibrary(new RemoteLibrary(host, port));
+
+ BasicLibrary lib = new RemoteLibrary(key, host, port);
+ lib = new CacheLibrary(Instance.getRemoteDir(host), lib);
+
+ BasicReader.setDefaultLibrary(lib);
+
action = MainAction.START;
} else {
exitCode = 255;
action = MainAction.START;
} else {
exitCode = 255;
@@
-254,8
+271,9
@@
public class Main {
break;
case LIST:
if (BasicReader.getReader() == null) {
break;
case LIST:
if (BasicReader.getReader() == null) {
- Instance.syserr(new Exception(
- "No reader type has been configured"));
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
exitCode = 10;
break;
}
exitCode = 10;
break;
}
@@
-263,8
+281,9
@@
public class Main {
break;
case READ:
if (BasicReader.getReader() == null) {
break;
case READ:
if (BasicReader.getReader() == null) {
- Instance.syserr(new Exception(
- "No reader type has been configured"));
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
exitCode = 10;
break;
}
exitCode = 10;
break;
}
@@
-272,8
+291,9
@@
public class Main {
break;
case READ_URL:
if (BasicReader.getReader() == null) {
break;
case READ_URL:
if (BasicReader.getReader() == null) {
- Instance.syserr(new Exception(
- "No reader type has been configured"));
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
exitCode = 10;
break;
}
exitCode = 10;
break;
}
@@
-289,15
+309,16
@@
public class Main {
case VERSION:
System.out
.println(String.format("Fanfix version %s"
case VERSION:
System.out
.println(String.format("Fanfix version %s"
- + "
\
nhttps://github.com/nikiroo/fanfix/"
- + "
\
n\tWritten by Nikiroo",
+ + "
%
nhttps://github.com/nikiroo/fanfix/"
+ + "
%
n\tWritten by Nikiroo",
Version.getCurrentVersion()));
updates.ok(); // we consider it read
break;
case START:
if (BasicReader.getReader() == null) {
Version.getCurrentVersion()));
updates.ok(); // we consider it read
break;
case START:
if (BasicReader.getReader() == null) {
- Instance.syserr(new Exception(
- "No reader type has been configured"));
+ Instance.getTraceHandler()
+ .error(new Exception(
+ "No reader type has been configured"));
exitCode = 10;
break;
}
exitCode = 10;
break;
}
@@
-309,13
+330,21
@@
public class Main {
break;
}
try {
break;
}
try {
- Server
server = new RemoteLibraryServer(
port);
- server.s
tart(
);
-
System.out.println("Remote server started on: " + port
);
+ Server
Object server = new RemoteLibraryServer(key,
port);
+ server.s
etTraceHandler(Instance.getTraceHandler()
);
+
server.run(
);
} catch (IOException e) {
} catch (IOException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
}
return;
}
return;
+ case STOP_SERVER:
+ if (port == null) {
+ exitCode = 255;
+ break;
+ }
+
+ new RemoteLibrary(key, host, port).exit();
+ break;
case REMOTE:
exitCode = 255; // should not be reachable (REMOTE -> START)
break;
case REMOTE:
exitCode = 255; // should not be reachable (REMOTE -> START)
break;
@@
-348,7
+377,7
@@
public class Main {
System.out.println(story.getMeta().getLuid() + ": \""
+ story.getMeta().getTitle() + "\" imported.");
} catch (IOException e) {
System.out.println(story.getMeta().getLuid() + ": \""
+ story.getMeta().getTitle() + "\" imported.");
} catch (IOException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
return 1;
}
return 1;
}
@@
-374,15
+403,15
@@
public class Main {
Progress pg) {
OutputType type = OutputType.valueOfNullOkUC(typeString, null);
if (type == null) {
Progress pg) {
OutputType type = OutputType.valueOfNullOkUC(typeString, null);
if (type == null) {
- Instance.
syserr(new Exception(trans(StringId.OUTPUT_DESC,
- typeString)));
+ Instance.
getTraceHandler().error(
+
new Exception(trans(StringId.OUTPUT_DESC,
typeString)));
return 1;
}
try {
Instance.getLibrary().export(luid, type, target, pg);
} catch (IOException e) {
return 1;
}
try {
Instance.getLibrary().export(luid, type, target, pg);
} catch (IOException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
return 4;
}
return 4;
}
@@
-400,7
+429,18
@@
public class Main {
* @return the exit return code (0 = success)
*/
private static int list(String source) {
* @return the exit return code (0 = success)
*/
private static int list(String source) {
- BasicReader.getReader().browse(source);
+ List<MetaData> stories;
+ stories = BasicReader.getReader().getLibrary().getListBySource(source);
+
+ for (MetaData story : stories) {
+ String author = "";
+ if (story.getAuthor() != null && !story.getAuthor().isEmpty()) {
+ author = " (" + story.getAuthor() + ")";
+ }
+
+ System.out.println(story.getLuid() + ": " + story.getTitle()
+ + author);
+ }
return 0;
}
return 0;
}
@@
-433,15
+473,16
@@
public class Main {
reader.setChapter(Integer.parseInt(chapString));
reader.read();
} catch (NumberFormatException e) {
reader.setChapter(Integer.parseInt(chapString));
reader.read();
} catch (NumberFormatException e) {
- Instance.syserr(new IOException(
- "Chapter number cannot be parsed: " + chapString, e));
+ Instance.getTraceHandler().error(
+ new IOException("Chapter number cannot be parsed: "
+ + chapString, e));
return 2;
}
} else {
reader.read();
}
} catch (IOException e) {
return 2;
}
} else {
reader.read();
}
} catch (IOException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
return 1;
}
return 1;
}
@@
-465,7
+506,7
@@
public class Main {
*
* @return the exit return code (0 = success)
*/
*
* @return the exit return code (0 = success)
*/
- p
rivate
static int convert(String urlString, String typeString,
+ p
ublic
static int convert(String urlString, String typeString,
String target, boolean infoCover, Progress pg) {
int exitCode = 0;
String target, boolean infoCover, Progress pg) {
int exitCode = 0;
@@
-479,8
+520,9
@@
public class Main {
OutputType type = OutputType.valueOfAllOkUC(typeString, null);
if (type == null) {
OutputType type = OutputType.valueOfAllOkUC(typeString, null);
if (type == null) {
- Instance.syserr(new IOException(trans(
- StringId.ERR_BAD_OUTPUT_TYPE, typeString)));
+ Instance.getTraceHandler().error(
+ new IOException(trans(StringId.ERR_BAD_OUTPUT_TYPE,
+ typeString)));
exitCode = 2;
} else {
exitCode = 2;
} else {
@@
-496,31
+538,35
@@
public class Main {
pg.addProgress(pgOut, 1);
}
pg.addProgress(pgOut, 1);
}
- Story story = support.process(
source,
pgIn);
+ Story story = support.process(pgIn);
try {
target = new File(target).getAbsolutePath();
try {
target = new File(target).getAbsolutePath();
- BasicOutput.getOutput(type, infoCover
).process(
- story, target, pgOut);
+ BasicOutput.getOutput(type, infoCover
, infoCover)
+
.process(
story, target, pgOut);
} catch (IOException e) {
} catch (IOException e) {
- Instance.syserr(new IOException(trans(
- StringId.ERR_SAVING, target), e));
+ Instance.getTraceHandler().error(
+ new IOException(trans(StringId.ERR_SAVING,
+ target), e));
exitCode = 5;
}
} else {
exitCode = 5;
}
} else {
- Instance.syserr(new IOException(trans(
- StringId.ERR_NOT_SUPPORTED, source)));
+ Instance.getTraceHandler().error(
+ new IOException(trans(
+ StringId.ERR_NOT_SUPPORTED, source)));
exitCode = 4;
}
} catch (IOException e) {
exitCode = 4;
}
} catch (IOException e) {
- Instance.syserr(new IOException(trans(StringId.ERR_LOADING,
- sourceName), e));
+ Instance.getTraceHandler().error(
+ new IOException(trans(StringId.ERR_LOADING,
+ sourceName), e));
exitCode = 3;
}
}
} catch (MalformedURLException e) {
exitCode = 3;
}
}
} catch (MalformedURLException e) {
- Instance.syserr(new IOException(trans(StringId.ERR_BAD_URL,
- sourceName), e));
+ Instance.getTraceHandler()
+ .error(new IOException(trans(StringId.ERR_BAD_URL,
+ sourceName), e));
exitCode = 1;
}
exitCode = 1;
}
@@
-586,8
+632,9
@@
public class Main {
BasicReader.setDefaultReaderType(readerType);
return 0;
} catch (IllegalArgumentException e) {
BasicReader.setDefaultReaderType(readerType);
return 0;
} catch (IllegalArgumentException e) {
- Instance.syserr(new IOException("Unknown reader type: "
- + readerTypeString, e));
+ Instance.getTraceHandler().error(
+ new IOException("Unknown reader type: " + readerTypeString,
+ e));
return 1;
}
}
return 1;
}
}