X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=9ac48845ce87d4bc57416bfd2daf7e7f30fa4364;hb=211f7ddb50f68aa8a999023ef6d63d5756bdace6;hp=06287f1236457860b833399274933202db9e7a55;hpb=39c3c6896743a3b6e375d51499036bb32f752114;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 06287f1..9ac4884 100644
--- 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.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.utils.Progress;
 import be.nikiroo.utils.Version;
-import be.nikiroo.utils.ui.UIUtils;
+import be.nikiroo.utils.serial.Server;
 
 /**
  * Main program entry point.
@@ -25,7 +29,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, 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>--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>--server [port]: start a server on this port</li>
+	 * <li>--remote [host] [port]: use a the given remote library</li>
 	 * </ul>
 	 * 
 	 * @param args
@@ -63,11 +69,13 @@ public class Main {
 	public static void main(String[] args) {
 		String urlString = null;
 		String luid = null;
-		String typeString = null;
+		String sourceString = null;
 		String chapString = null;
 		String target = null;
 		MainAction action = MainAction.START;
 		Boolean plusInfo = null;
+		String host = null;
+		Integer port = null;
 
 		boolean noMoreActions = false;
 
@@ -102,8 +110,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 +121,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 +136,8 @@ public class Main {
 				}
 				break;
 			case LIST:
-				if (typeString == null) {
-					typeString = args[i];
+				if (sourceString == null) {
+					sourceString = args[i];
 				} else {
 					exitCode = 255;
 				}
@@ -157,12 +165,33 @@ 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:
+				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;
 			}
 		}
 
@@ -170,6 +199,7 @@ 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;
@@ -189,20 +219,41 @@ 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);
+				exitCode = list(sourceString);
 				break;
 			case READ:
 				exitCode = read(luid, chapString, true);
@@ -215,6 +266,7 @@ public class Main {
 				exitCode = 0;
 				break;
 			case SET_READER:
+				exitCode = 255;
 				break;
 			case VERSION:
 				System.out
@@ -222,11 +274,26 @@ public class Main {
 								+ "\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);
+				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;
 			}
 		}
@@ -241,7 +308,7 @@ public class Main {
 	}
 
 	/**
-	 * Import the given resource into the {@link Library}.
+	 * Import the given resource into the {@link LocalLibrary}.
 	 * 
 	 * @param urlString
 	 *            the resource to import
@@ -265,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
@@ -298,17 +366,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 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) {
+		BasicReader.getReader().browse(source);
 		return 0;
 	}
 
@@ -316,8 +384,8 @@ public class Main {
 	 * Start the CLI 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,16 +397,17 @@ 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();
 				} catch (NumberFormatException e) {
 					Instance.syserr(new IOException(
 							"Chapter number cannot be parsed: " + chapString, e));