X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=automanga;h=f2281dfbe646f1d281068a329f4ea5a5c4df89a9;hb=8eb3c44efac5c567ad08eab3b0abee487e2d4fc3;hp=a3e7af4ba5ac1b9b912cff26ef434c558d0db4c3;hpb=acdde6cabb481343d32450ac88873cf0ee063c9a;p=automanga.git

diff --git a/automanga b/automanga
index a3e7af4..f2281df 100755
--- a/automanga
+++ b/automanga
@@ -1,11 +1,8 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-import sys, getopt
+import sys, getopt, pathlib
 import manga.lib, manga.reader, manga.profile, manga.local
-import glib, gobject, gtk
-
-gobject.threads_init()
-gtk.gdk.threads_init()
+from gi.repository import Gtk, Gdk, GObject
 
 def usage(out):
     out.write("usage: automanga [-h] [-p PROFILE] {DIRECTORY|-l LIBRARY ID|-a ALIAS}\n")
@@ -81,9 +78,10 @@ def main():
             for mprof in profile.bytag(listtag):
                 try:
                     mng = mprof.open()
-                    sys.stdout.write("%s %s: \"%s\"\n" % (mprof.libnm, mprof.id, mng.name))
                 except KeyError:
-                    sys.stdout.write("%s %s: no longer exists\n" % (mprof.libnm, mprof.id))
+                    sys.stderr.write("%s %s: no longer found\n" % (mprof.libnm, mprof.id))
+                    continue
+                sys.stdout.write("%s %s: \"%s\"\n" % (mprof.libnm, mprof.id, mng.name))
         return
 
     if alias and (alias.find('=') > 0):
@@ -109,7 +107,7 @@ def main():
         try:
             libname, mid = profile.getalias(alias)
         except KeyError:
-            sys.stderr("automanga: no such alias: %s\n" % alias)
+            sys.stderr.write("automanga: no such alias: %s\n" % alias)
             sys.exit(1)
         try:
             lib = manga.lib.findlib(libname)
@@ -138,11 +136,11 @@ def main():
     else:
         libname = "local"
         try:
-            if len(args) > 0:
-                mdir = args.pop(0)
-            else:
-                mdir = "."
-            mng = manga.local.manga(mdir)
+            if len(args) < 1:
+                usage(sys.stderr)
+                sys.exit(1)
+            mdir = args.pop(0)
+            mng = manga.local.manga(pathlib.Path(mdir))
         except TypeError:
             sys.stderr.write("automanga: not a valid manga directory: %s\n" % mdir)
             sys.exit(1)
@@ -161,7 +159,7 @@ def main():
 
     reader = manga.reader.reader(mng, mprof)
     reader.show()
-    gtk.main()
+    Gtk.main()
 
 try:
     main()