Apply some autopep8-python2 suggestions

[fdroidserver.git] / fdroid

diff --git a/fdroid b/fdroid
index 76cd597c70d7097d550246a8817c73d664c83ee7..ab901a7bb8038d15382b1f150cb9d7a569cea5e9 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -1,2 +1,114 @@
-#!/bin/sh
-./fdroid.py $*
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+#
+# fdroid.py - part of the FDroid server tools
+# Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# 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",
+}
+
+
+def print_help():
+    print "usage: fdroid [-h|--help] <command> [<args>]"
+    print
+    print "Valid commands are:"
+    for cmd, summary in commands.items():
+        print "   " + cmd + ' ' * (15 - len(cmd)) + summary
+    print
+
+
+def main():
+
+    if len(sys.argv) <= 1:
+        print_help()
+        sys.exit(0)
+
+    command = sys.argv[1]
+    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.
+    sys.argv[0] += ' ' + command
+
+    del sys.argv[1]
+    mod = __import__('fdroidserver.' + command, None, None, [command])
+
+    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()