X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=953bc45a50b776a99b533fab67bbd9dc5dafa7d9;hp=06287f1236457860b833399274933202db9e7a55;hb=e10b51a2a23135fbdf9539933d7e729354e8ddcd;hpb=39c3c6896743a3b6e375d51499036bb32f752114

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 06287f1..953bc45 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -4,19 +4,27 @@ import java.io.File;
 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.data.MetaData;
 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.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.fanfix.supported.SupportType;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.Version;
-import be.nikiroo.utils.ui.UIUtils;
+import be.nikiroo.utils.serial.server.ServerObject;
 
 /**
  * Main program entry point.
@@ -25,7 +33,7 @@ import be.nikiroo.utils.ui.UIUtils;
  */
 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, STOP_SERVER, REMOTE, SET_SOURCE, SET_TITLE, SET_AUTHOR
 	}
 
 	/**
@@ -52,9 +60,16 @@ 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>--set-reader [reader type]: set the reader type to CLI or LOCAL for
-	 * this command</li>
+	 * <li>--set-source [id] [new source]: change the source of the given story</li>
+	 * <li>--set-title [id] [new title]: change the title of the given story</li>
+	 * <li>--set-author [id] [new author]: change the author of the given story</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 [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
@@ -63,11 +78,16 @@ public class Main {
 	public static void main(String[] args) {
 		String urlString = null;
 		String luid = null;
-		String typeString = null;
+		String sourceString = null;
+		String titleString = null;
+		String authorString = null;
 		String chapString = null;
 		String target = null;
+		String key = null;
 		MainAction action = MainAction.START;
 		Boolean plusInfo = null;
+		String host = null;
+		Integer port = null;
 
 		boolean noMoreActions = false;
 
@@ -82,8 +102,9 @@ public class Main {
 						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;
 					}
 				}
@@ -102,8 +123,8 @@ public class Main {
 			case EXPORT:
 				if (luid == null) {
 					luid = args[i];
-				} else if (typeString == null) {
-					typeString = args[i];
+				} else if (sourceString == null) {
+					sourceString = args[i];
 				} else if (target == null) {
 					target = args[i];
 				} else {
@@ -113,8 +134,8 @@ public class Main {
 			case CONVERT:
 				if (urlString == null) {
 					urlString = args[i];
-				} else if (typeString == null) {
-					typeString = args[i];
+				} else if (sourceString == null) {
+					sourceString = args[i];
 				} else if (target == null) {
 					target = args[i];
 				} else if (plusInfo == null) {
@@ -128,8 +149,35 @@ public class Main {
 				}
 				break;
 			case LIST:
-				if (typeString == null) {
-					typeString = args[i];
+				if (sourceString == null) {
+					sourceString = args[i];
+				} else {
+					exitCode = 255;
+				}
+				break;
+			case SET_SOURCE:
+				if (luid == null) {
+					luid = args[i];
+				} else if (sourceString == null) {
+					sourceString = args[i];
+				} else {
+					exitCode = 255;
+				}
+				break;
+			case SET_TITLE:
+				if (luid == null) {
+					luid = args[i];
+				} else if (sourceString == null) {
+					titleString = args[i];
+				} else {
+					exitCode = 255;
+				}
+				break;
+			case SET_AUTHOR:
+				if (luid == null) {
+					luid = args[i];
+				} else if (sourceString == null) {
+					authorString = args[i];
 				} else {
 					exitCode = 255;
 				}
@@ -157,12 +205,42 @@ public class Main {
 				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 SERVER:
+			case STOP_SERVER:
+				if (key == null) {
+					key = args[i];
+				} else if (port == null) {
+					port = Integer.parseInt(args[i]);
+				} else {
+					exitCode = 255;
+				}
+				break;
+			case REMOTE:
+				if (key == null) {
+					key = args[i];
+				} else if (host == null) {
+					host = args[i];
+				} else if (port == null) {
+					port = Integer.parseInt(args[i]);
+
+					BasicLibrary lib = new RemoteLibrary(key, host, port);
+					lib = new CacheLibrary(Instance.getRemoteDir(host), lib);
+
+					BasicReader.setDefaultLibrary(lib);
+
+					action = MainAction.START;
+				} else {
+					exitCode = 255;
+				}
+				break;
 			}
 		}
 
@@ -170,10 +248,14 @@ public class Main {
 		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;
 
+				if (diff <= 0)
+					return;
+
 				StringBuilder builder = new StringBuilder();
 				for (int i = 0; i < diff; i++) {
 					builder.append('.');
@@ -189,25 +271,91 @@ public class Main {
 		Progress pg = new Progress();
 		mainProgress.addProgress(pg, mainProgress.getMax());
 
+		VersionCheck updates = VersionCheck.check();
+		if (updates.isNewVersionAvailable()) {
+			// Sent to syserr so not to cause problem if one tries to capture a
+			// story content in text mode
+			System.err
+					.println("A new version of the program is available at https://github.com/nikiroo/fanfix/releases");
+			System.err.println("");
+			for (Version v : updates.getNewer()) {
+				System.err.println("\tVersion " + v);
+				System.err.println("\t-------------");
+				System.err.println("");
+				for (String item : updates.getChanges().get(v)) {
+					System.err.println("\t- " + item);
+				}
+				System.err.println("");
+			}
+		}
+
 		if (exitCode != 255) {
 			switch (action) {
 			case IMPORT:
 				exitCode = imprt(urlString, pg);
+				updates.ok(); // we consider it read
 				break;
 			case EXPORT:
-				exitCode = export(luid, typeString, target, pg);
+				exitCode = export(luid, sourceString, target, pg);
+				updates.ok(); // we consider it read
 				break;
 			case CONVERT:
-				exitCode = convert(urlString, typeString, target,
+				exitCode = convert(urlString, sourceString, target,
 						plusInfo == null ? false : plusInfo, pg);
+				updates.ok(); // we consider it read
 				break;
 			case LIST:
-				exitCode = list(typeString);
+				if (BasicReader.getReader() == null) {
+					Instance.getTraceHandler()
+							.error(new Exception(
+									"No reader type has been configured"));
+					exitCode = 10;
+					break;
+				}
+				exitCode = list(sourceString);
+				break;
+			case SET_SOURCE:
+				try {
+					Instance.getLibrary().changeSource(luid, sourceString, pg);
+				} catch (IOException e1) {
+					Instance.getTraceHandler().error(e1);
+					exitCode = 21;
+				}
+				break;
+			case SET_TITLE:
+				try {
+					Instance.getLibrary().changeTitle(luid, titleString, pg);
+				} catch (IOException e1) {
+					Instance.getTraceHandler().error(e1);
+					exitCode = 22;
+				}
+				break;
+			case SET_AUTHOR:
+				try {
+					Instance.getLibrary().changeAuthor(luid, authorString, pg);
+				} catch (IOException e1) {
+					Instance.getTraceHandler().error(e1);
+					exitCode = 23;
+				}
 				break;
 			case READ:
+				if (BasicReader.getReader() == null) {
+					Instance.getTraceHandler()
+							.error(new Exception(
+									"No reader type has been configured"));
+					exitCode = 10;
+					break;
+				}
 				exitCode = read(luid, chapString, true);
 				break;
 			case READ_URL:
+				if (BasicReader.getReader() == null) {
+					Instance.getTraceHandler()
+							.error(new Exception(
+									"No reader type has been configured"));
+					exitCode = 10;
+					break;
+				}
 				exitCode = read(urlString, chapString, false);
 				break;
 			case HELP:
@@ -215,33 +363,70 @@ public class Main {
 				exitCode = 0;
 				break;
 			case SET_READER:
+				exitCode = 255;
 				break;
 			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:
-				UIUtils.setLookAndFeel();
-				BasicReader.setDefaultReaderType(ReaderType.LOCAL);
-				BasicReader.getReader().start(null);
+				if (BasicReader.getReader() == null) {
+					Instance.getTraceHandler()
+							.error(new Exception(
+									"No reader type has been configured"));
+					exitCode = 10;
+					break;
+				}
+				BasicReader.getReader().browse(null);
+				break;
+			case SERVER:
+				if (port == null) {
+					exitCode = 255;
+					break;
+				}
+				try {
+					ServerObject server = new RemoteLibraryServer(key, port);
+					server.setTraceHandler(Instance.getTraceHandler());
+					server.run();
+				} catch (IOException e) {
+					Instance.getTraceHandler().error(e);
+				}
+				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;
 			}
 		}
 
+		try {
+			Instance.getTempFiles().close();
+		} catch (IOException e) {
+			Instance.getTraceHandler()
+					.error(new IOException(
+							"Cannot dispose of the temporary files", e));
+		}
+
 		if (exitCode == 255) {
 			syntax(false);
 		}
 
-		if (exitCode != 0) {
-			System.exit(exitCode);
-		}
+		System.exit(exitCode);
 	}
 
 	/**
-	 * Import the given resource into the {@link Library}.
+	 * Import the given resource into the {@link LocalLibrary}.
 	 * 
 	 * @param urlString
 	 *            the resource to import
@@ -257,7 +442,7 @@ public class Main {
 			System.out.println(story.getMeta().getLuid() + ": \""
 					+ story.getMeta().getTitle() + "\" imported.");
 		} catch (IOException e) {
-			Instance.syserr(e);
+			Instance.getTraceHandler().error(e);
 			return 1;
 		}
 
@@ -265,7 +450,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
@@ -280,17 +466,17 @@ public class Main {
 	 */
 	public static int export(String luid, String typeString, String target,
 			Progress pg) {
-		OutputType type = OutputType.valueOfNullOkUC(typeString);
+		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) {
-			Instance.syserr(e);
+			Instance.getTraceHandler().error(e);
 			return 4;
 		}
 
@@ -298,26 +484,37 @@ 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 type 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
 	 *            stories
 	 * 
 	 * @return the exit return code (0 = success)
 	 */
-	private static int list(String type) {
-		BasicReader.getReader().start(type);
+	private static int list(String 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;
 	}
 
 	/**
-	 * Start the CLI reader for this {@link Story}.
+	 * Start the current reader for this {@link Story}.
 	 * 
 	 * @param story
-	 *            the LUID of the {@link Story} in the {@link Library} <b>or</b>
-	 *            the {@link Story} {@link URL}
+	 *            the LUID of the {@link Story} in the {@link LocalLibrary}
+	 *            <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
@@ -329,26 +526,28 @@ public class Main {
 	 */
 	private static int read(String story, String chapString, boolean library) {
 		try {
-			BasicReader reader = BasicReader.getReader();
+			Reader reader = BasicReader.getReader();
 			if (library) {
-				reader.setStory(story, null);
+				reader.setMeta(story);
 			} else {
-				reader.setStory(BasicReader.getUrl(story), null);
+				reader.setMeta(BasicReader.getUrl(story), null);
 			}
 
 			if (chapString != null) {
 				try {
-					reader.read(Integer.parseInt(chapString));
+					reader.setChapter(Integer.parseInt(chapString));
+					reader.read(true);
 				} 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();
+				reader.read(true);
 			}
 		} catch (IOException e) {
-			Instance.syserr(e);
+			Instance.getTraceHandler().error(e);
 			return 1;
 		}
 
@@ -372,10 +571,11 @@ public class Main {
 	 * 
 	 * @return the exit return code (0 = success)
 	 */
-	private static int convert(String urlString, String typeString,
+	public static int convert(String urlString, String typeString,
 			String target, boolean infoCover, Progress pg) {
 		int exitCode = 0;
 
+		Instance.getTraceHandler().trace("Convert: " + urlString);
 		String sourceName = urlString;
 		try {
 			URL source = BasicReader.getUrl(urlString);
@@ -384,10 +584,11 @@ public class Main {
 				sourceName = sourceName.substring("file://".length());
 			}
 
-			OutputType type = OutputType.valueOfAllOkUC(typeString);
+			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 {
@@ -395,6 +596,8 @@ public class Main {
 					BasicSupport support = BasicSupport.getSupport(source);
 
 					if (support != null) {
+						Instance.getTraceHandler().trace(
+								"Support found: " + support.getClass());
 						Progress pgIn = new Progress();
 						Progress pgOut = new Progress();
 						if (pg != null) {
@@ -403,31 +606,35 @@ public class Main {
 							pg.addProgress(pgOut, 1);
 						}
 
-						Story story = support.process(source, pgIn);
+						Story story = support.process(pgIn);
 						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) {
-							Instance.syserr(new IOException(trans(
-									StringId.ERR_SAVING, target), e));
+							Instance.getTraceHandler().error(
+									new IOException(trans(StringId.ERR_SAVING,
+											target), e));
 							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) {
-					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) {
-			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;
 		}
 
@@ -493,8 +700,9 @@ public class Main {
 			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;
 		}
 	}