search: cleanup

[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 6fc49c549764cbba0a7439086c49e79e981af3ad..faf882006fccfb0b1e9c8a3774c74802d6b8ee78 100644 (file)
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -222,13 +222,15 @@ public class Main {
                                        if (searchOn == null) {
                                                Instance.getTraceHandler().error(
                                                                "Website not known: <" + args[i] + ">");
-                                               exitCode = 255;
+                                               exitCode = 41;
+                                               break;
                                        }
 
                                        if (BasicSearchable.getSearchable(searchOn) == null) {
                                                Instance.getTraceHandler().error(
                                                                "Website not supported: " + searchOn);
-                                               exitCode = 255;
+                                               exitCode = 42;
+                                               break;
                                        }
                                } else if (search == null) {
                                        search = args[i];
@@ -399,7 +401,7 @@ public class Main {
                        }
                }
 
-               if (exitCode != 255) {
+               if (exitCode == 0) {
                        switch (action) {
                        case IMPORT:
                                exitCode = imprt(urlString, pg);
@@ -491,20 +493,19 @@ public class Main {
                                        break;
                                }
 
-                               if (searchOn == null || search == null) {
-                                       // TODO: do on reader!!!
-                                       for (SupportType type : SupportType.values()) {
-                                               if (BasicSearchable.getSearchable(type) != null) {
-                                                       System.out.println(type);
-                                               }
-                                       }
-                               } else {
-                                       try {
+                               try {
+                                       if (searchOn == null) {
+                                               BasicReader.getReader().search(true);
+                                       } else if (search != null) {
+
                                                BasicReader.getReader().search(searchOn, search, page,
-                                                               item);
-                                       } catch (IOException e1) {
-                                               Instance.getTraceHandler().error(e1);
+                                                               item, true);
+                                       } else {
+                                               exitCode = 255;
                                        }
+                               } catch (IOException e1) {
+                                       Instance.getTraceHandler().error(e1);
+                                       exitCode = 20;
                                }
 
                                break;
@@ -538,7 +539,7 @@ public class Main {
 
                                try {
                                        BasicReader.getReader().searchTag(searchOn, page, item,
-                                                       tags.toArray(new Integer[] {}));
+                                                       true, tags.toArray(new Integer[] {}));
                                } catch (IOException e1) {
                                        Instance.getTraceHandler().error(e1);
                                }