DocBook: make all make* functions have the same argument order.

[lyx.git] / lib / scripts / lyxpaperview.py

diff --git a/lib/scripts/lyxpaperview.py b/lib/scripts/lyxpaperview.py
index 2b33434a83db86b931f57709ddfa7f5b053ab8fc..09256da7cbdedcb4bec0b5ce7bbbb447d9bee18a 100755 (executable)
--- a/lib/scripts/lyxpaperview.py
+++ b/lib/scripts/lyxpaperview.py
@@ -6,6 +6,7 @@
 # Licence details can be found in the file COPYING.
 
 # author Jürgen Spitzmüller
+# This draws on a bash script and conceptual idea by Pavel Sanda
 # Full author contact details are available in file CREDITS
 
 # This script searches the home directory for a PDF or PS
@@ -31,7 +32,9 @@ def error(message):
     exit(1)
 
 def usage(prog_name):
-    msg = "Usage: %s [-v pdfviewer] [-w psviewer] year author"
+    msg = "Usage: %s [-v pdfviewer] [-w psviewer] titletoken-1 [titletoken-2] ... [titletoken-n]\n" \
+          "    Each title token must occur in the filename (at an arbitrary position).\n" \
+          "    You might use quotes to enter multi-word tokens"
     return  msg % prog_name
 
 # Copied from lyxpreview_tools.py
@@ -70,14 +73,18 @@ def find_exe_or_terminate(candidates):
 
     return exe
 
-def find(year, author, path):
+def find(args, path):
     if os.name != 'nt':
         # use locate if possible (faster)
         if find_exe(['locate']):
-            p1 = subprocess.Popen(['locate', '-i', author], stdout=subprocess.PIPE)
-            p2 = subprocess.Popen(['grep', '-Ei', '\.pdf$|\.ps$'], stdin=p1.stdout, stdout=subprocess.PIPE)
-            p3 = subprocess.Popen(['grep', year], stdin=p2.stdout, stdout=subprocess.PIPE)
-            p4 = subprocess.Popen(['head', '-n 2'], stdin=p3.stdout, stdout=subprocess.PIPE)
+            p1 = subprocess.Popen(['locate', '-i', args[0].lower()], stdout=subprocess.PIPE)
+            px = subprocess.Popen(['grep', '-Ei', '\.pdf$|\.ps$'], stdin=p1.stdout, stdout=subprocess.PIPE)
+            for arg in args:
+               if arg == args[0]:
+                   # have this already
+                   continue
+               px = subprocess.Popen(['grep', '-i', arg], stdin=px.stdout, stdout=subprocess.PIPE)
+            p4 = subprocess.Popen(['head', '-n 1'], stdin=px.stdout, stdout=subprocess.PIPE)
             p1.stdout.close()
             output = p4.communicate()
             return output[0].decode("utf8")[:-1]# strip trailing '\n'
@@ -87,8 +94,14 @@ def find(year, author, path):
     for root, dirs, files in os.walk(path):
         for fname in files:
             lfname = fname.lower()
-            if lfname.endswith(('.pdf', '.ps')) and lfname.find(author) != -1 and lfname.find(year) != -1:
-                return os.path.join(root, fname)
+            if lfname.endswith(('.pdf', '.ps')):
+                caught = True
+                for arg in args:
+                    if lfname.find(arg.lower()) == -1:
+                        caught = False
+                        break
+                if caught:
+                    return os.path.join(root, fname)
     return ""
 
 def main(argv):
@@ -103,16 +116,13 @@ def main(argv):
       if o == "-w":
         psviewer = v
     
-    if len(args) != 2:
+    if len(args) < 1:
       error(usage(progname))
 
-    year = args[0]
-    author = args[1]
-
-    result = find(year, author.lower(), path = os.environ["HOME"])
+    result = find(args, path = os.environ["HOME"])
     if result == "":
         message("no document found!")
-        return 0
+        exit(2)
     else:
         message("found document %s" % result)
 
@@ -130,7 +140,7 @@ def main(argv):
     
     subprocess.call([viewer, result])
     
-    return 0
+    exit(0)
 
 if __name__ == "__main__":
     main(sys.argv)