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

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 953bc45..995251d 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 
 import be.nikiroo.fanfix.bundles.StringId;
@@ -20,6 +21,7 @@ import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.fanfix.reader.BasicReader;
 import be.nikiroo.fanfix.reader.Reader;
 import be.nikiroo.fanfix.reader.Reader.ReaderType;
+import be.nikiroo.fanfix.searchable.BasicSearchable;
 import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.fanfix.supported.SupportType;
 import be.nikiroo.utils.Progress;
@@ -33,7 +35,7 @@ import be.nikiroo.utils.serial.server.ServerObject;
  */
 public class Main {
 	private enum MainAction {
-		IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, STOP_SERVER, REMOTE, SET_SOURCE, SET_TITLE, SET_AUTHOR
+		IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, STOP_SERVER, REMOTE, SET_SOURCE, SET_TITLE, SET_AUTHOR, SEARCH, SEARCH_TAG
 	}
 
 	/**
@@ -59,6 +61,14 @@ public class Main {
 	 * </li>
 	 * <li>--read-url [URL] ([chapter number]): convert on the fly and read the
 	 * story, without saving it</li>
+	 * <li>--search: list the supported websites (where)</li>
+	 * <li>--search [where] [keywords] (page [page]) (item [item]): search on
+	 * the supported website and display the given results page of stories it
+	 * found, or the story details if asked</li>
+	 * <li>--search-tag [where]: list all the tags supported by this website</li>
+	 * <li>--search-tag [index 1]... (page [page]) (item [item]): search for the
+	 * given stories or subtags, tag by tag, and display information about a
+	 * specific page of results or about a specific item if requested</li>
 	 * <li>--list ([type]): list the stories present in the library</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>
@@ -88,6 +98,11 @@ public class Main {
 		Boolean plusInfo = null;
 		String host = null;
 		Integer port = null;
+		SupportType searchOn = null;
+		String search = null;
+		List<Integer> tags = new ArrayList<Integer>();
+		Integer page = null;
+		Integer item = null;
 
 		boolean noMoreActions = false;
 
@@ -200,6 +215,103 @@ public class Main {
 					exitCode = 255;
 				}
 				break;
+			case SEARCH:
+				if (searchOn == null) {
+					searchOn = SupportType.valueOfAllOkUC(args[i]);
+
+					if (searchOn == null) {
+						Instance.getTraceHandler().error(
+								"Website not known: <" + args[i] + ">");
+						exitCode = 41;
+						break;
+					}
+
+					if (BasicSearchable.getSearchable(searchOn) == null) {
+						Instance.getTraceHandler().error(
+								"Website not supported: " + searchOn);
+						exitCode = 42;
+						break;
+					}
+				} else if (search == null) {
+					search = args[i];
+				} else if (page != null && page == -1) {
+					try {
+						page = Integer.parseInt(args[i]);
+					} catch (Exception e) {
+						page = -2;
+					}
+				} else if (item != null && item == -1) {
+					try {
+						item = Integer.parseInt(args[i]);
+					} catch (Exception e) {
+						item = -2;
+					}
+				} else if (page == null || item == null) {
+					if (page == null && "page".equals(args[i])) {
+						page = -1;
+					} else if (item == null && "item".equals(args[i])) {
+						item = -1;
+					} else {
+						exitCode = 255;
+					}
+				} else {
+					exitCode = 255;
+				}
+				break;
+			case SEARCH_TAG:
+				if (searchOn == null) {
+					searchOn = SupportType.valueOfAllOkUC(args[i]);
+
+					if (searchOn == null) {
+						Instance.getTraceHandler().error(
+								"Website not known: <" + args[i] + ">");
+						exitCode = 255;
+					}
+
+					if (BasicSearchable.getSearchable(searchOn) == null) {
+						Instance.getTraceHandler().error(
+								"Website not supported: " + searchOn);
+						exitCode = 255;
+					}
+				} else if (page == null && item == null) {
+					if ("page".equals(args[i])) {
+						page = -1;
+					} else if ("item".equals(args[i])) {
+						item = -1;
+					} else {
+						try {
+							int index = Integer.parseInt(args[i]);
+							tags.add(index);
+						} catch (NumberFormatException e) {
+							Instance.getTraceHandler().error(
+									"Invalid tag index: " + args[i]);
+							exitCode = 255;
+						}
+					}
+				} else if (page != null && page == -1) {
+					try {
+						page = Integer.parseInt(args[i]);
+					} catch (Exception e) {
+						page = -2;
+					}
+				} else if (item != null && item == -1) {
+					try {
+						item = Integer.parseInt(args[i]);
+					} catch (Exception e) {
+						item = -2;
+					}
+				} else if (page == null || item == null) {
+					if (page == null && "page".equals(args[i])) {
+						page = -1;
+					} else if (item == null && "item".equals(args[i])) {
+						item = -1;
+					} else {
+						exitCode = 255;
+					}
+				} else {
+					exitCode = 255;
+				}
+				break;
 			case HELP:
 				exitCode = 255;
 				break;
@@ -282,14 +394,14 @@ public class Main {
 				System.err.println("\tVersion " + v);
 				System.err.println("\t-------------");
 				System.err.println("");
-				for (String item : updates.getChanges().get(v)) {
-					System.err.println("\t- " + item);
+				for (String it : updates.getChanges().get(v)) {
+					System.err.println("\t- " + it);
 				}
 				System.err.println("");
 			}
 		}
 
-		if (exitCode != 255) {
+		if (exitCode == 0) {
 			switch (action) {
 			case IMPORT:
 				exitCode = imprt(urlString, pg);
@@ -357,6 +469,81 @@ public class Main {
 					break;
 				}
 				exitCode = read(urlString, chapString, false);
+				break;
+			case SEARCH:
+				page = page == null ? 1 : page;
+				if (page < 0) {
+					Instance.getTraceHandler().error("Incorrect page number");
+					exitCode = 255;
+					break;
+				}
+
+				item = item == null ? 0 : item;
+				if (item < 0) {
+					Instance.getTraceHandler().error("Incorrect item number");
+					exitCode = 255;
+					break;
+				}
+
+				if (BasicReader.getReader() == null) {
+					Instance.getTraceHandler()
+							.error(new Exception(
+									"No reader type has been configured"));
+					exitCode = 10;
+					break;
+				}
+
+				try {
+					if (searchOn == null) {
+						BasicReader.getReader().search(true);
+					} else if (search != null) {
+
+						BasicReader.getReader().search(searchOn, search, page,
+								item, true);
+					} else {
+						exitCode = 255;
+					}
+				} catch (IOException e1) {
+					Instance.getTraceHandler().error(e1);
+					exitCode = 20;
+				}
+
+				break;
+			case SEARCH_TAG:
+				if (searchOn == null) {
+					exitCode = 255;
+					break;
+				}
+
+				page = page == null ? 1 : page;
+				if (page < 0) {
+					Instance.getTraceHandler().error("Incorrect page number");
+					exitCode = 255;
+					break;
+				}
+
+				item = item == null ? 0 : item;
+				if (item < 0) {
+					Instance.getTraceHandler().error("Incorrect item number");
+					exitCode = 255;
+					break;
+				}
+
+				if (BasicReader.getReader() == null) {
+					Instance.getTraceHandler()
+							.error(new Exception(
+									"No reader type has been configured"));
+					exitCode = 10;
+					break;
+				}
+
+				try {
+					BasicReader.getReader().searchTag(searchOn, page, item,
+							true, tags.toArray(new Integer[] {}));
+				} catch (IOException e1) {
+					Instance.getTraceHandler().error(e1);
+				}
+
 				break;
 			case HELP:
 				syntax(true);