-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
#
# fdroid.py - part of the FDroid server tools
# Copyright (C) 2010-2015, Ciaran Gultnieks, ciaran@ciarang.com
-# Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
+# Copyright (C) 2013-2014 Daniel Marti <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
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import sys
+import os
import logging
import fdroidserver.common
+import fdroidserver.metadata
+from fdroidserver import _
from argparse import ArgumentError
-
-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",
- "signindex": "Sign indexes created using update --nosign",
-}
+from collections import OrderedDict
+
+
+commands = OrderedDict([
+ ("build", _("Build a package from source")),
+ ("init", _("Quickly start a new repository")),
+ ("publish", _("Sign and place packages in the repo")),
+ ("gpgsign", _("Add PGP signatures using GnuPG for packages in repo")),
+ ("update", _("Update repo information for new packages")),
+ ("deploy", _("Interact with the repo HTTP server")),
+ ("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")),
+ ("dscanner", _("Dynamically scan APKs post build")),
+ ("stats", _("Update the stats of the repo")),
+ ("server", _("Old, deprecated name for fdroid deploy")),
+ ("signindex", _("Sign indexes created using update --nosign")),
+ ("btlog", _("Update the binary transparency log for a URL")),
+ ("signatures", _("Extract signatures from APKs")),
+ ("nightly", _("Set up an app build for a nightly build repo")),
+ ("mirror", _("Download complete mirrors of small repos")),
+])
def print_help():
- print "usage: fdroid [-h|--help|--version] <command> [<args>]"
- print
- print "Valid commands are:"
+ print(_("usage: ") + _("fdroid [<command>] [-h|--help|--version|<args>]"))
+ print("")
+ print(_("Valid commands are:"))
for cmd, summary in commands.items():
- print " " + cmd + ' ' * (15 - len(cmd)) + summary
- print
+ print(" " + cmd + ' ' * (15 - len(cmd)) + summary)
+ print("")
def main():
print_help()
sys.exit(0)
elif command == '--version':
- import os.path
- output = 'no version info found!'
+ output = _('no version info found!')
cmddir = os.path.realpath(os.path.dirname(__file__))
moduledir = os.path.realpath(os.path.dirname(fdroidserver.common.__file__) + '/..')
if cmddir == moduledir:
import subprocess
try:
output = subprocess.check_output(['git', 'describe'],
- stderr=subprocess.STDOUT)
+ stderr=subprocess.STDOUT,
+ universal_newlines=True)
except subprocess.CalledProcessError:
- output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'])
+ output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'],
+ universal_newlines=True)
elif os.path.exists('setup.py'):
import re
m = re.search(r'''.*[\s,\(]+version\s*=\s*["']([0-9a-z.]+)["'].*''',
print(output),
sys.exit(0)
else:
- print "Command '%s' not recognised.\n" % command
+ 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'])
+ # Helpful to differentiate warnings from errors even when on quiet
+ logformat = '%(levelname)s: %(message)s'
+ loglevel = logging.INFO
if verbose:
- logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
+ loglevel = logging.DEBUG
elif quiet:
- logging.basicConfig(format='%(message)s', level=logging.WARN)
- else:
- logging.basicConfig(format='%(message)s', level=logging.INFO)
+ loglevel = logging.WARN
+
+ logging.basicConfig(format=logformat, level=loglevel)
if verbose and quiet:
logging.critical("Specifying --verbose and --quiet and the same time is silly")
sys.exit(1)
+ # temporary workaround until server.py becomes deploy.py
+ if command == 'deploy':
+ command = 'server'
+ sys.argv.insert(1, 'update')
+
# Trick optparse into displaying the right usage when --help is used.
sys.argv[0] += ' ' + command
try:
mod.main()
# These are ours, contain a proper message and are "expected"
- except fdroidserver.common.FDroidException, e:
+ except (fdroidserver.common.FDroidException,
+ fdroidserver.metadata.MetaDataException) as e:
if verbose:
raise
else:
sys.exit(1)
except KeyboardInterrupt:
print('')
- sys.exit(1)
+ sys.stdout.flush()
+ sys.stderr.flush()
+ os._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!")
+ except Exception as e:
+ logging.critical(_("Unknown exception found!"))
raise
sys.exit(0)
+
if __name__ == "__main__":
main()
~ianmdlvl / fdroidserver.git / blobdiff