X-Git-Url: http://dolda2000.com/gitweb/?p=automanga.git;a=blobdiff_plain;f=automanga;h=39262a75e1912cd0f3a3370577f9cb38d86844ca;hp=f2b7ed9aa216be28898d375ca2bca6b709c0afd0;hb=HEAD;hpb=67a47acceac34ad380d4a7cbe67b95d55dcf9667

diff --git a/automanga b/automanga
index f2b7ed9..6e51e29 100755
--- a/automanga
+++ b/automanga
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-import sys, getopt
+import sys, getopt, pathlib
 import manga.lib, manga.reader, manga.profile, manga.local
 from gi.repository import Gtk, Gdk, GObject
 
@@ -9,7 +9,7 @@ def usage(out):
     out.write("       automanga -a ALIAS=LIBRARY:ID\n")
     out.write("       automanga -t {DIRECTORY|-l LIBRARY ID|-a ALIAS} [-]TAG...\n")
     out.write("       automanga -{s|S} LIBRARY NAME\n")
-    out.write("       automanga -L TAG\n")
+    out.write("       automanga -L TAG [-o ORDER]\n")
 
 libname = None
 search = None
@@ -17,7 +17,8 @@ profile = ""
 alias = None
 settags = False
 listtag = None
-opts, args = getopt.getopt(sys.argv[1:], "hl:sSp:a:tL:")
+listorder = None
+opts, args = getopt.getopt(sys.argv[1:], "hl:sSp:a:tL:o:")
 for o, a in opts:
     if o == "-h":
         usage(sys.stdout)
@@ -39,6 +40,8 @@ for o, a in opts:
         settags = True
     elif o == "-L":
         listtag = a
+    elif o == "-o":
+        listorder = a
 if profile == "":
     try:
         profile = manga.profile.profile.last()
@@ -75,13 +78,30 @@ def main():
 
     if listtag is not None:
         if profile is not None:
+            results = []
             for mprof in profile.bytag(listtag):
                 try:
                     mng = mprof.open()
                 except KeyError:
                     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))
+                except Exception as exc:
+                    sys.stderr.write("%s %s: unexpected error: %s\n" % (mprof.libnm, mprof.id, str(exc)))
+                    continue
+                line = "%s %s: \"%s\"" % (mprof.libnm, mprof.id, mng.name)
+                if listorder is None:
+                    sys.stdout.write("%s\n" % (line,))
+                else:
+                    if listorder == "mtime":
+                        key = -mprof.mtime()
+                    else:
+                        sys.stderr.write("automanga: undefined order: %s\n" % (listorder,))
+                        sys.exit(1)
+                    results.append((line, key))
+            if len(results) > 0:
+                results.sort(key=lambda o: o[1])
+                for line, key in results:
+                    sys.stdout.write("%s\n" % (line,))
         return
 
     if alias and (alias.find('=') > 0):
@@ -140,7 +160,7 @@ def main():
                 usage(sys.stderr)
                 sys.exit(1)
             mdir = args.pop(0)
-            mng = manga.local.manga(mdir)
+            mng = manga.local.manga(pathlib.Path(mdir))
         except TypeError:
             sys.stderr.write("automanga: not a valid manga directory: %s\n" % mdir)
             sys.exit(1)