From 2d377be221210f902959fefca34ae743d4dc485e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <pavlix@pavlix.net>
Date: Wed, 25 Jan 2012 12:29:51 +0100
Subject: [PATCH] Improved CLI

'invoice show' now invokes a pager, while 'invoice pdf [-g]' is used
to generate and view PDF invoices.
---
 README             |  4 +++-
 lib/invoice/cli.py | 23 +++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/README b/README
index a0e5c4f..91be6d8 100644
--- a/README
+++ b/README
@@ -48,14 +48,16 @@ Manage companies:
 
 invoice new-company <id>
 invoice edit-company <id>
+invoice show-company <id>
 invoice delete-company <id>
 
 Manage invoices:
 
 invoice new <company-id>
 invoice edit [<number>]
+invoice show [<number>]
 invoice delete [<number>]
 
 Generate and display invoice PDF:
 
-invoice show --generate [<number>]
+invoice pdf --generate [<number>]
diff --git a/lib/invoice/cli.py b/lib/invoice/cli.py
index 93407c6..396c4f7 100644
--- a/lib/invoice/cli.py
+++ b/lib/invoice/cli.py
@@ -49,19 +49,21 @@ class Application:
             help="additional help")
 
         for list_ in "invoices", "companies":
-            for action in "list", "new", "edit", "show", "delete":
+            for action in "list", "new", "edit", "show", "pdf", "delete":
+                if action == "pdf" and list_ != "invoices":
+                    continue
                 suffix = ''
                 if list_ == "companies":
                     suffix = "-companies" if action=="list" else "-company"
                 method = getattr(self, "do_"+(action+suffix).replace("-", "_"))
                 subparser = subparsers.add_parser(action+suffix, help=method.__doc__)
-                if method == self.do_show:
+                if method == self.do_pdf:
                     subparser.add_argument("--generate", "-g", action="store_true")
                 if action == "delete":
                     subparser.add_argument("--force", "-f", action="store_true")
                 if action == "new":
                     subparser.add_argument("name" if suffix else "company_name")
-                if action in ("show", "edit", "delete"):
+                if action in ("show", "pdf", "edit", "delete"):
                     subparser.add_argument("selector", nargs="?")
                 subparser.set_defaults(method=method)
 
@@ -108,9 +110,18 @@ class Application:
         assert os.path.exists(path)
         subprocess.call((self.editor, path))
 
-    def do_show(self, selector, generate):
+    def do_show(self, selector):
+        """View invoice in external viewer.
+
+        The external viewer is determined by PAGER environment variable
+        using 'less' as the default.
+        """
+        item = self.db.invoices[selector]
+        self._show(item._path)
+
+    def do_pdf(self, selector, generate):
         """Generate and view a PDF invoice.
-        
+
         This requires Tempita 0.5.
         """
         import tempita
@@ -198,7 +209,7 @@ class Application:
         self._edit(item._path)
 
     def do_show_company(self, selector):
-        """View company in external editor.
+        """View company in external viewer.
 
         The external viewer is determined by PAGER environment variable
         using 'less' as the default.