Sort books by series, serial number and title

[m_librarian.git] / scripts / ml-search.py

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index 81d74f9a2cdb1a35fa396880b6ba767a3817166e..b4c01e2d717f3cc285e2f5a72093cac6a8ef5671 100755 (executable)
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -60,9 +60,9 @@ def _search_books(case_sensitive, search_type, args):
     if case_sensitive is None:
         case_sensitive = _guess_case_sensitivity(values)
     for book in search_books(search_type, case_sensitive, values,
-                             orderBy='title'):
+                             orderBy=('series', 'ser_no', 'title')):
         print book.title.encode(default_encoding)
-        if args.details > 0:
+        if args.details >= 1:
             print " ", _("Author(s)"), ":",
             for author in book.authors:
                 names = filter(None,
@@ -70,6 +70,25 @@ def _search_books(case_sensitive, search_type, args):
                 fullname = u' '.join(names)
                 print fullname.encode(default_encoding),
             print
+            print " ", _("Genre(s)"), ":",
+            for genre in book.genres:
+                print (genre.title or genre.name).encode(default_encoding),
+            print
+            if book.series:
+                print " ", _("Series"), ":",
+                print book.series.encode(default_encoding), \
+                    "(%d)" % book.ser_no
+
+        if args.details >= 2:
+            print " ", _("Date"), ":", book.date
+            print " ", _("Language"), ":", book.language.name
+
+        if args.details >= 3:
+            print " ", _("Archive"), ":", book.archive
+            print " ", _("File"), ":", book.file
+            print " ", _("Extension"), ":", book.extension.name
+            print " ", _("Size"), ":", book.size, _("bytes")
+            print " ", _("Deleted"), ":", _(str(book.deleted))
 
 
 def _search_extensions(case_sensitive, search_type, args):