Apply some autopep8-python2 suggestions

[fdroidserver.git] / fdroid

diff --git a/fdroid b/fdroid
index 0f75fc96a33f50964727b7aa43afa1f2d8d310a5..ab901a7bb8038d15382b1f150cb9d7a569cea5e9 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -3,7 +3,7 @@
 #
 # fdroid.py - part of the FDroid server tools
 # Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
-# Copyright (C) 2013 Daniel Martí <mvdan@mvdan.cc>
+# Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -19,26 +19,38 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
+import logging
+
+from fdroidserver.common import FDroidException
+from optparse import OptionError
+
+commands = {
+    "build": "Build a package from source",
+    "init": "Quickly start a new repository",
+    "publish": "Sign and place packages in the repo",
+    "gpgsign": "Add gpg signatures for packages in repo",
+    "update": "Update repo information for new packages",
+    "verify": "Verify the integrity of downloaded packages",
+    "checkupdates": "Check for updates to applications",
+    "import": "Add a new application from its source code",
+    "install": "Install built packages on devices",
+    "readmeta": "Read all the metadata files and exit",
+    "rewritemeta": "Rewrite all the metadata files",
+    "lint": "Warn about possible metadata errors",
+    "scanner": "Scan the source code of a package",
+    "stats": "Update the stats of the repo",
+    "server": "Interact with the repo HTTP server",
+}
 
-commands = [
-        "build",
-        "init",
-        "install",
-        "update",
-        "publish",
-        "verify",
-        "checkupdates",
-        "import",
-        "rewritemeta",
-        "scanner",
-        "stats",
-        "server"]
 
 def print_help():
+    print "usage: fdroid [-h|--help] <command> [<args>]"
+    print
     print "Valid commands are:"
-    for command in commands:
-        print "  " + command
-    print "Use '%s <command> --help' for more info about that command."%sys.argv[0]
+    for cmd, summary in commands.items():
+        print "   " + cmd + ' ' * (15 - len(cmd)) + summary
+    print
+
 
 def main():
 
@@ -47,10 +59,27 @@ def main():
         sys.exit(0)
 
     command = sys.argv[1]
-    if not command in commands:
-        if command not in ('-h', '--help'):
-            print "Command '" + command + "' not recognised.\n"
-        print_help()
+    if command not in commands:
+        if command in ('-h', '--help'):
+            print_help()
+            sys.exit(0)
+        else:
+            print "Command '%s' not recognised.\n" % command
+            print_help()
+            sys.exit(1)
+
+    verbose = any(s in sys.argv for s in ['-v', '--verbose'])
+    quiet = any(s in sys.argv for s in ['-q', '--quiet'])
+
+    if verbose:
+        logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
+    elif quiet:
+        logging.basicConfig(format='%(message)s', level=logging.WARN)
+    else:
+        logging.basicConfig(format='%(message)s', level=logging.INFO)
+
+    if verbose and quiet:
+        logging.critical("Specifying --verbose and --quiet and the same time is silly")
         sys.exit(1)
 
     # Trick optparse into displaying the right usage when --help is used.
@@ -58,9 +87,28 @@ def main():
 
     del sys.argv[1]
     mod = __import__('fdroidserver.' + command, None, None, [command])
-    mod.main()
+
+    try:
+        mod.main()
+    # These are ours, contain a proper message and are "expected"
+    except FDroidException, e:
+        if verbose:
+            raise
+        else:
+            logging.critical(str(e))
+        sys.exit(1)
+    except OptionError, e:
+        logging.critical(str(e))
+        sys.exit(1)
+    except KeyboardInterrupt:
+        print('')
+        sys.exit(1)
+    # These should only be unexpected crashes due to bugs in the code
+    # str(e) often doesn't contain a reason, so just show the backtrace
+    except Exception, e:
+        logging.critical("Unknown exception found!")
+        raise
     sys.exit(0)
 
 if __name__ == "__main__":
     main()
-