X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=automanga;h=e581b74a298b7f30c72c410bde47ddc231267be7;hb=f03018e9fefd3eb81cf3b59f973e6c94b3fcf0e0;hp=81d602d47abdd50802fa32a336dc234179c062a2;hpb=271d68da6cb2a273fd3ce29e95c4a021cc6da125;p=automanga.git

diff --git a/automanga b/automanga
index 81d602d..e581b74 100755
--- a/automanga
+++ b/automanga
@@ -10,13 +10,13 @@ gtk.gdk.threads_init()
 def usage(out):
     out.write("usage: automanga [-h] [-p PROFILE] {DIRECTORY|-l LIBRARY ID|-a ALIAS}\n")
     out.write("       automanga -a ALIAS=LIBRARY:ID\n")
-    out.write("       automanga -s LIBRARY NAME\n")
+    out.write("       automanga -{s|S} LIBRARY NAME\n")
 
 libname = None
-search = False
+search = None
 profile = ""
 alias = None
-opts, args = getopt.getopt(sys.argv[1:], "hl:sp:a:")
+opts, args = getopt.getopt(sys.argv[1:], "hl:sSp:a:")
 for o, a in opts:
     if o == "-h":
         usage(sys.stdout)
@@ -26,7 +26,9 @@ for o, a in opts:
     elif o == "-a":
         alias = a
     elif o == "-s":
-        search = True
+        search = "name"
+    elif o == "-S":
+        search = "match"
     elif o == "-p":
         if a == "":
             profile = None
@@ -40,84 +42,102 @@ if profile == "":
 elif profile is not None:
     profile = manga.profile.profile.byname(profile)
 
-if search:
-    if len(args) < 2:
-        usage(sys.stderr)
-        sys.exit(1)
-    try:
-        lib = manga.lib.findlib(args[0])
-    except ImportError:
-        sys.stderr.write("automanga: no such library: %s\n" % args[0])
-        sys.exit(1)
-    for manga in lib.byname(args[1]):
-        sys.stdout.write("\"%s\": %s\n" % (manga.name, manga.id))
-    sys.exit(0)
+def main():
+    global libname
 
-if alias and (alias.find('=') > 0):
-    alias, nm = alias.split('=', 1)
-    if not ':' in nm:
-        usage(sys.stderr)
-        sys.exit(1)
-    libname, mid = nm.split(':', 1)
-    try:
-        lib = manga.lib.findlib(libname)
-    except ImportError:
-        sys.stderr.write("automanga: no such library: %s\n" % libname)
-        sys.exit(1)
-    try:
-        mng = lib.byid(mid)
-    except KeyError:
-        sys.stderr.write("automanga: no such manga: %s\n" % mid)
-        sys.exit(1)
-    profile.setalias(alias, libname, mid)
-    sys.exit(0)
+    if search:
+        if len(args) < 2:
+            usage(sys.stderr)
+            sys.exit(1)
+        try:
+            lib = manga.lib.findlib(args[0])
+        except ImportError:
+            sys.stderr.write("automanga: no such library: %s\n" % args[0])
+            sys.exit(1)
+        try:
+            if search == "name":
+                results = lib.byname(args[1])
+            elif search == "match":
+                results = lib.search(args[1])
+                if hasattr(results, "__length_hint__"):
+                    sys.stderr.write("%i results:\n" % results.__length_hint__())
+        except NotImplementedError:
+            sys.stderr.write("automanga: %s does not support searching\n" % args[0])
+            sys.exit(1)
+        for mng in results:
+            sys.stdout.write("\"%s\": %s\n" % (mng.name, mng.id))
+        return
 
-if alias:
-    try:
-        libname, mid = profile.getalias(alias)
-    except KeyError:
-        sys.stderr("automanga: no such alias: %s\n" % alias)
-        sys.exit(1)
-    try:
-        lib = manga.lib.findlib(libname)
-    except ImportError:
-        sys.stderr.write("automanga: no such library: %s\n" % libname)
-        sys.exit(1)
-    try:
-        mng = lib.byid(mid)
-    except KeyError:
-        sys.stderr.write("automanga: manga no longer found: %s\n" % mid)
-        sys.exit(1)
-elif libname is not None:
-    if len(args) < 1:
-        usage(sys.stderr)
-        sys.exit(1)
-    try:
-        lib = manga.lib.findlib(libname)
-    except ImportError:
-        sys.stderr.write("automanga: no such library: %s\n" % libname)
-        sys.exit(1)
-    try:
-        mng = lib.byid(args[0])
-    except KeyError:
-        sys.stderr.write("automanga: no such manga: %s\n" % args[0])
-        sys.exit(1)
-else:
-    libname = "local"
-    try:
-        if len(args) > 0:
-            mdir = args[0]
-        else:
-            mdir = "."
-        mng = manga.local.manga(mdir)
-    except TypeError:
-        sys.stderr.write("automanga: not a valid manga directory: %s\n" % mdir)
-        sys.exit(1)
+    if alias and (alias.find('=') > 0):
+        tgt, nm = alias.split('=', 1)
+        if not ':' in nm:
+            usage(sys.stderr)
+            sys.exit(1)
+        libname, mid = nm.split(':', 1)
+        try:
+            lib = manga.lib.findlib(libname)
+        except ImportError:
+            sys.stderr.write("automanga: no such library: %s\n" % libname)
+            sys.exit(1)
+        try:
+            mng = lib.byid(mid)
+        except KeyError as e:
+            sys.stderr.write("automanga: no such manga: %s\n" % str(e))
+            sys.exit(1)
+        profile.setalias(tgt, libname, mng.id)
+        return
+
+    if alias:
+        try:
+            libname, mid = profile.getalias(alias)
+        except KeyError:
+            sys.stderr("automanga: no such alias: %s\n" % alias)
+            sys.exit(1)
+        try:
+            lib = manga.lib.findlib(libname)
+        except ImportError:
+            sys.stderr.write("automanga: no such library: %s\n" % libname)
+            sys.exit(1)
+        try:
+            mng = lib.byid(mid)
+        except KeyError:
+            sys.stderr.write("automanga: manga no longer found: %s\n" % mid)
+            sys.exit(1)
+    elif libname is not None:
+        if len(args) < 1:
+            usage(sys.stderr)
+            sys.exit(1)
+        try:
+            lib = manga.lib.findlib(libname)
+        except ImportError:
+            sys.stderr.write("automanga: no such library: %s\n" % libname)
+            sys.exit(1)
+        try:
+            mng = lib.byid(args[0])
+        except KeyError as e:
+            sys.stderr.write("automanga: no such manga: %s\n" % str(e))
+            sys.exit(1)
+    else:
+        libname = "local"
+        try:
+            if len(args) > 0:
+                mdir = args[0]
+            else:
+                mdir = "."
+            mng = manga.local.manga(mdir)
+        except TypeError:
+            sys.stderr.write("automanga: not a valid manga directory: %s\n" % mdir)
+            sys.exit(1)
+
+    mprof = None if profile is None else profile.getmanga(libname, mng.id, True)
+    if profile is not None:
+        profile.setlast()
 
-mprof = None if profile is None else profile.getmanga(libname, mng.id, True)
-if profile is not None:
-    profile.setlast()
+    reader = manga.reader.reader(mng, mprof)
+    reader.show()
+    gtk.main()
 
-reader = manga.reader.reader(mng, mprof)
-reader.show()
-gtk.main()
+try:
+    main()
+except KeyboardInterrupt:
+    pass