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
add json lib
[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 b3633612713996f8651bffda5f480fc2607b54be..961816a3f63e96afc4611489e5d83d85c9e2898a 100644
(file)
--- a/
src/be/nikiroo/fanfix/Main.java
+++ b/
src/be/nikiroo/fanfix/Main.java
@@
-12,6
+12,7
@@
import javax.net.ssl.SSLException;
import be.nikiroo.fanfix.bundles.Config;
import be.nikiroo.fanfix.bundles.StringId;
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.bundles.Config;
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.library.BasicLibrary;
import be.nikiroo.fanfix.library.CacheLibrary;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.library.BasicLibrary;
import be.nikiroo.fanfix.library.CacheLibrary;
@@
-121,9
+122,8
@@
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.getTraceHandler().error(
- new IllegalArgumentException("Unknown action: "
- + args[i], e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IllegalArgumentException("Unknown action: " + args[i], e));
exitCode = 255;
}
}
exitCode = 255;
}
}
@@
-224,15
+224,13
@@
public class Main {
searchOn = SupportType.valueOfAllOkUC(args[i]);
if (searchOn == null) {
searchOn = SupportType.valueOfAllOkUC(args[i]);
if (searchOn == null) {
- Instance.getTraceHandler().error(
- "Website not known: <" + args[i] + ">");
+ Instance.getInstance().getTraceHandler().error("Website not known: <" + args[i] + ">");
exitCode = 41;
break;
}
if (BasicSearchable.getSearchable(searchOn) == null) {
exitCode = 41;
break;
}
if (BasicSearchable.getSearchable(searchOn) == null) {
- Instance.getTraceHandler().error(
- "Website not supported: " + searchOn);
+ Instance.getInstance().getTraceHandler().error("Website not supported: " + searchOn);
exitCode = 42;
break;
}
exitCode = 42;
break;
}
@@
-267,14
+265,12
@@
public class Main {
searchOn = SupportType.valueOfAllOkUC(args[i]);
if (searchOn == null) {
searchOn = SupportType.valueOfAllOkUC(args[i]);
if (searchOn == null) {
- Instance.getTraceHandler().error(
- "Website not known: <" + args[i] + ">");
+ Instance.getInstance().getTraceHandler().error("Website not known: <" + args[i] + ">");
exitCode = 255;
}
if (BasicSearchable.getSearchable(searchOn) == null) {
exitCode = 255;
}
if (BasicSearchable.getSearchable(searchOn) == null) {
- Instance.getTraceHandler().error(
- "Website not supported: " + searchOn);
+ Instance.getInstance().getTraceHandler().error("Website not supported: " + searchOn);
exitCode = 255;
}
} else if (page == null && item == null) {
exitCode = 255;
}
} else if (page == null && item == null) {
@@
-287,8
+283,7
@@
public class Main {
int index = Integer.parseInt(args[i]);
tags.add(index);
} catch (NumberFormatException e) {
int index = Integer.parseInt(args[i]);
tags.add(index);
} catch (NumberFormatException e) {
- Instance.getTraceHandler().error(
- "Invalid tag index: " + args[i]);
+ Instance.getInstance().getTraceHandler().error("Invalid tag index: " + args[i]);
exitCode = 255;
}
}
exitCode = 255;
}
}
@@
-344,7
+339,8
@@
public class Main {
port = Integer.parseInt(args[i]);
BasicLibrary lib = new RemoteLibrary(key, host, port);
port = Integer.parseInt(args[i]);
BasicLibrary lib = new RemoteLibrary(key, host, port);
- lib = new CacheLibrary(Instance.getRemoteDir(host), lib);
+ lib = new CacheLibrary(Instance.getInstance().getRemoteDir(host), lib,
+ Instance.getInstance().getUiConfig());
BasicReader.setDefaultLibrary(lib);
BasicReader.setDefaultLibrary(lib);
@@
-418,9
+414,7
@@
public class Main {
break;
case LIST:
if (BasicReader.getReader() == null) {
break;
case LIST:
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
exitCode = 10;
break;
}
@@
-428,33
+422,31
@@
public class Main {
break;
case SET_SOURCE:
try {
break;
case SET_SOURCE:
try {
- Instance.getLibrary().changeSource(luid, sourceString, pg);
+ Instance.get
Instance().get
Library().changeSource(luid, sourceString, pg);
} catch (IOException e1) {
} catch (IOException e1) {
- Instance.getTraceHandler().error(e1);
+ Instance.get
Instance().get
TraceHandler().error(e1);
exitCode = 21;
}
break;
case SET_TITLE:
try {
exitCode = 21;
}
break;
case SET_TITLE:
try {
- Instance.getLibrary().changeTitle(luid, titleString, pg);
+ Instance.get
Instance().get
Library().changeTitle(luid, titleString, pg);
} catch (IOException e1) {
} catch (IOException e1) {
- Instance.getTraceHandler().error(e1);
+ Instance.get
Instance().get
TraceHandler().error(e1);
exitCode = 22;
}
break;
case SET_AUTHOR:
try {
exitCode = 22;
}
break;
case SET_AUTHOR:
try {
- Instance.getLibrary().changeAuthor(luid, authorString, pg);
+ Instance.get
Instance().get
Library().changeAuthor(luid, authorString, pg);
} catch (IOException e1) {
} catch (IOException e1) {
- Instance.getTraceHandler().error(e1);
+ Instance.get
Instance().get
TraceHandler().error(e1);
exitCode = 23;
}
break;
case READ:
if (BasicReader.getReader() == null) {
exitCode = 23;
}
break;
case READ:
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
exitCode = 10;
break;
}
@@
-462,9
+454,7
@@
public class Main {
break;
case READ_URL:
if (BasicReader.getReader() == null) {
break;
case READ_URL:
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
exitCode = 10;
break;
}
@@
-473,22
+463,20
@@
public class Main {
case SEARCH:
page = page == null ? 1 : page;
if (page < 0) {
case SEARCH:
page = page == null ? 1 : page;
if (page < 0) {
- Instance.getTraceHandler().error("Incorrect page number");
+ Instance.get
Instance().get
TraceHandler().error("Incorrect page number");
exitCode = 255;
break;
}
item = item == null ? 0 : item;
if (item < 0) {
exitCode = 255;
break;
}
item = item == null ? 0 : item;
if (item < 0) {
- Instance.getTraceHandler().error("Incorrect item number");
+ Instance.get
Instance().get
TraceHandler().error("Incorrect item number");
exitCode = 255;
break;
}
if (BasicReader.getReader() == null) {
exitCode = 255;
break;
}
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
exitCode = 10;
break;
}
@@
-504,7
+492,7
@@
public class Main {
exitCode = 255;
}
} catch (IOException e1) {
exitCode = 255;
}
} catch (IOException e1) {
- Instance.getTraceHandler().error(e1);
+ Instance.get
Instance().get
TraceHandler().error(e1);
exitCode = 20;
}
exitCode = 20;
}
@@
-517,22
+505,20
@@
public class Main {
page = page == null ? 1 : page;
if (page < 0) {
page = page == null ? 1 : page;
if (page < 0) {
- Instance.getTraceHandler().error("Incorrect page number");
+ Instance.get
Instance().get
TraceHandler().error("Incorrect page number");
exitCode = 255;
break;
}
item = item == null ? 0 : item;
if (item < 0) {
exitCode = 255;
break;
}
item = item == null ? 0 : item;
if (item < 0) {
- Instance.getTraceHandler().error("Incorrect item number");
+ Instance.get
Instance().get
TraceHandler().error("Incorrect item number");
exitCode = 255;
break;
}
if (BasicReader.getReader() == null) {
exitCode = 255;
break;
}
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
exitCode = 10;
break;
}
@@
-541,7
+527,7
@@
public class Main {
BasicReader.getReader().searchTag(searchOn, page, item,
true, tags.toArray(new Integer[] {}));
} catch (IOException e1) {
BasicReader.getReader().searchTag(searchOn, page, item,
true, tags.toArray(new Integer[] {}));
} catch (IOException e1) {
- Instance.getTraceHandler().error(e1);
+ Instance.get
Instance().get
TraceHandler().error(e1);
}
break;
}
break;
@@
-562,22
+548,20
@@
public class Main {
break;
case START:
if (BasicReader.getReader() == null) {
break;
case START:
if (BasicReader.getReader() == null) {
- Instance.getTraceHandler()
- .error(new Exception(
- "No reader type has been configured"));
+ Instance.getInstance().getTraceHandler().error(new Exception("No reader type has been configured"));
exitCode = 10;
break;
}
try {
BasicReader.getReader().browse(null);
} catch (IOException e) {
exitCode = 10;
break;
}
try {
BasicReader.getReader().browse(null);
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
exitCode = 66;
}
break;
case SERVER:
exitCode = 66;
}
break;
case SERVER:
- key = Instance.getConfig().getString(Config.SERVER_KEY);
- port = Instance.getConfig().getInteger(Config.SERVER_PORT);
+ key = Instance.get
Instance().get
Config().getString(Config.SERVER_KEY);
+ port = Instance.get
Instance().get
Config().getInteger(Config.SERVER_PORT);
if (port == null) {
System.err.println("No port configured in the config file");
exitCode = 15;
if (port == null) {
System.err.println("No port configured in the config file");
exitCode = 15;
@@
-585,28
+569,32
@@
public class Main {
}
try {
ServerObject server = new RemoteLibraryServer(key, port);
}
try {
ServerObject server = new RemoteLibraryServer(key, port);
- server.setTraceHandler(Instance.getTraceHandler());
+ server.setTraceHandler(Instance.get
Instance().get
TraceHandler());
server.run();
} catch (IOException e) {
server.run();
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
return;
case STOP_SERVER:
}
return;
case STOP_SERVER:
- key = Instance.getConfig().getString(Config.SERVER_KEY);
- port = Instance.getConfig().getInteger(Config.SERVER_PORT);
+ // Can be given via "--remote XX XX XX"
+ if (key == null)
+ key = Instance.getInstance().getConfig().getString(Config.SERVER_KEY);
+ if (port == null)
+ port = Instance.getInstance().getConfig().getInteger(Config.SERVER_PORT);
+
if (port == null) {
if (port == null) {
- System.err.println("No port configured in the config file");
+ System.err.println("No port
given nor
configured in the config file");
exitCode = 15;
break;
}
try {
new RemoteLibrary(key, host, port).exit();
} catch (SSLException e) {
exitCode = 15;
break;
}
try {
new RemoteLibrary(key, host, port).exit();
} catch (SSLException e) {
- Instance.getTraceHandler().error(
+ Instance.get
Instance().get
TraceHandler().error(
"Bad access key for remote library");
exitCode = 43;
} catch (IOException e) {
"Bad access key for remote library");
exitCode = 43;
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
exitCode = 44;
}
exitCode = 44;
}
@@
-618,11
+606,9
@@
public class Main {
}
try {
}
try {
- Instance.getTempFiles().close();
+ Instance.get
Instance().get
TempFiles().close();
} catch (IOException e) {
} catch (IOException e) {
- Instance.getTraceHandler()
- .error(new IOException(
- "Cannot dispose of the temporary files", e));
+ Instance.getInstance().getTraceHandler().error(new IOException("Cannot dispose of the temporary files", e));
}
if (exitCode == 255) {
}
if (exitCode == 255) {
@@
-644,12
+630,10
@@
public class Main {
*/
public static int imprt(String urlString, Progress pg) {
try {
*/
public static int imprt(String urlString, Progress pg) {
try {
- Story story = Instance.getLibrary().imprt(
- BasicReader.getUrl(urlString), pg);
- System.out.println(story.getMeta().getLuid() + ": \""
- + story.getMeta().getTitle() + "\" imported.");
+ MetaData meta = Instance.getInstance().getLibrary().imprt(BasicReader.getUrl(urlString), pg);
+ System.out.println(meta.getLuid() + ": \"" + meta.getTitle() + "\" imported.");
} catch (IOException e) {
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
return 1;
}
return 1;
}
@@
-675,15
+659,14
@@
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.getTraceHandler().error(
- new Exception(trans(StringId.OUTPUT_DESC, typeString)));
+ Instance.getInstance().getTraceHandler().error(new Exception(trans(StringId.OUTPUT_DESC, typeString)));
return 1;
}
try {
return 1;
}
try {
- Instance.getLibrary().export(luid, type, target, pg);
+ Instance.get
Instance().get
Library().export(luid, type, target, pg);
} catch (IOException e) {
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
return 4;
}
return 4;
}
@@
-705,7
+688,7
@@
public class Main {
try {
BasicReader.getReader().browse(source);
} catch (IOException e) {
try {
BasicReader.getReader().browse(source);
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
return 66;
}
return 66;
}
@@
-741,16
+724,15
@@
public class Main {
reader.setChapter(Integer.parseInt(chapString));
reader.read(true);
} catch (NumberFormatException e) {
reader.setChapter(Integer.parseInt(chapString));
reader.read(true);
} catch (NumberFormatException e) {
- Instance.getTraceHandler().error(
- new IOException("Chapter number cannot be parsed: "
- + chapString, e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException("Chapter number cannot be parsed: " + chapString, e));
return 2;
}
} else {
reader.read(true);
}
} catch (IOException e) {
return 2;
}
} else {
reader.read(true);
}
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
return 1;
}
return 1;
}
@@
-778,20
+760,19
@@
public class Main {
String target, boolean infoCover, Progress pg) {
int exitCode = 0;
String target, boolean infoCover, Progress pg) {
int exitCode = 0;
- Instance.getTraceHandler().trace("Convert: " + urlString);
+ Instance.get
Instance().get
TraceHandler().trace("Convert: " + urlString);
String sourceName = urlString;
try {
URL source = BasicReader.getUrl(urlString);
sourceName = source.toString();
String sourceName = urlString;
try {
URL source = BasicReader.getUrl(urlString);
sourceName = source.toString();
- if (source
.toString()
.startsWith("file://")) {
+ if (source
Name
.startsWith("file://")) {
sourceName = sourceName.substring("file://".length());
}
OutputType type = OutputType.valueOfAllOkUC(typeString, null);
if (type == null) {
sourceName = sourceName.substring("file://".length());
}
OutputType type = OutputType.valueOfAllOkUC(typeString, null);
if (type == null) {
- Instance.getTraceHandler().error(
- new IOException(trans(StringId.ERR_BAD_OUTPUT_TYPE,
- typeString)));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException(trans(StringId.ERR_BAD_OUTPUT_TYPE, typeString)));
exitCode = 2;
} else {
exitCode = 2;
} else {
@@
-799,8
+780,7
@@
public class Main {
BasicSupport support = BasicSupport.getSupport(source);
if (support != null) {
BasicSupport support = BasicSupport.getSupport(source);
if (support != null) {
- Instance.getTraceHandler().trace(
- "Support found: " + support.getClass());
+ Instance.getInstance().getTraceHandler().trace("Support found: " + support.getClass());
Progress pgIn = new Progress();
Progress pgOut = new Progress();
if (pg != null) {
Progress pgIn = new Progress();
Progress pgOut = new Progress();
if (pg != null) {
@@
-812,32
+792,26
@@
public class Main {
Story story = support.process(pgIn);
try {
target = new File(target).getAbsolutePath();
Story story = support.process(pgIn);
try {
target = new File(target).getAbsolutePath();
- BasicOutput.getOutput(type, infoCover, infoCover)
- .process(story, target, pgOut);
+ BasicOutput.getOutput(type, infoCover, infoCover).process(story, target, pgOut);
} catch (IOException e) {
} catch (IOException e) {
- Instance.getTraceHandler().error(
- new IOException(trans(StringId.ERR_SAVING,
- target), e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException(trans(StringId.ERR_SAVING, target), e));
exitCode = 5;
}
} else {
exitCode = 5;
}
} else {
- Instance.getTraceHandler().error(
- new IOException(trans(
- StringId.ERR_NOT_SUPPORTED, source)));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException(trans( StringId.ERR_NOT_SUPPORTED, source)));
exitCode = 4;
}
} catch (IOException e) {
exitCode = 4;
}
} catch (IOException e) {
- Instance.getTraceHandler().error(
- new IOException(trans(StringId.ERR_LOADING,
- sourceName), e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException(trans(StringId.ERR_LOADING, sourceName), e));
exitCode = 3;
}
}
} catch (MalformedURLException e) {
exitCode = 3;
}
}
} catch (MalformedURLException e) {
- Instance.getTraceHandler()
- .error(new IOException(trans(StringId.ERR_BAD_URL,
- sourceName), e));
+ Instance.getInstance().getTraceHandler().error(new IOException(trans(StringId.ERR_BAD_URL, sourceName), e));
exitCode = 1;
}
exitCode = 1;
}
@@
-853,7
+827,7
@@
public class Main {
* @return the translated result
*/
private static String trans(StringId id, Object... params) {
* @return the translated result
*/
private static String trans(StringId id, Object... params) {
- return Instance.getTrans().getString(id, params);
+ return Instance.get
Instance().get
Trans().getString(id, params);
}
/**
}
/**
@@
-903,9
+877,8
@@
public class Main {
BasicReader.setDefaultReaderType(readerType);
return 0;
} catch (IllegalArgumentException e) {
BasicReader.setDefaultReaderType(readerType);
return 0;
} catch (IllegalArgumentException e) {
- Instance.getTraceHandler().error(
- new IOException("Unknown reader type: " + readerTypeString,
- e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException("Unknown reader type: " + readerTypeString, e));
return 1;
}
}
return 1;
}
}