all: deduplicate -v/-q setup

fdroidserver/build.py

@@ -935,11 +935,8 @@ def parse_commandline():
     """Parse the command line. Returns options, parser."""
 
     parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
+    common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help="app-id with optional versioncode in the form APPID[:VERCODE]")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     parser.add_argument("-l", "--latest", action="store_true", default=False,
                         help="Build only the latest version of each package")
     parser.add_argument("-s", "--stop", action="store_true", default=False,

fdroidserver/checkupdates.py

@@ -527,11 +527,8 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
+    common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help="app-id to check for updates")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     parser.add_argument("--auto", action="store_true", default=False,
                         help="Process auto-updates")
     parser.add_argument("--autoonly", action="store_true", default=False,

fdroidserver/common.py

@@ -91,6 +91,13 @@ default_config = {
 }
 
 
+def setup_global_opts(parser):
+    parser.add_argument("-v", "--verbose", action="store_true", default=False,
+                        help="Spew out even more information than normal")
+    parser.add_argument("-q", "--quiet", action="store_true", default=False,
+                        help="Restrict output to warnings and errors")
+
+
 def fill_config_defaults(thisconfig):
     for k, v in default_config.items():
         if k not in thisconfig:

fdroidserver/gpgsign.py

@@ -36,10 +36,7 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options]")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
+    common.setup_global_opts(parser)
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     options = parser.parse_args()
 
     config = common.read_config(options)

fdroidserver/import.py

@@ -158,10 +158,7 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser()
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
+    common.setup_global_opts(parser)
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     parser.add_argument("-u", "--url", default=None,
                         help="Project URL to import from.")
     parser.add_argument("-s", "--subdir", default=None,

fdroidserver/init.py

@@ -51,10 +51,7 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser()
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
+    common.setup_global_opts(parser)
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     parser.add_argument("-d", "--distinguished-name", default=None,
                         help="X.509 'Distiguished Name' used when generating keys")
     parser.add_argument("--keystore", default=None,

fdroidserver/install.py

@@ -50,11 +50,8 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
+    common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help="app-id with optional versioncode in the form APPID[:VERCODE]")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     parser.add_argument("-a", "--all", action="store_true", default=False,
                         help="Install all signed applications available")
     options = parser.parse_args()

fdroidserver/lint.py

@@ -307,11 +307,8 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
+    common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help="app-id in the form APPID")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     options = parser.parse_args()
 
     config = common.read_config(options)

fdroidserver/publish.py

@@ -41,11 +41,8 @@ def main():
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] "
                             "[APPID[:VERCODE] [APPID[:VERCODE] ...]]")
+    common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help="app-id with optional versioncode in the form APPID[:VERCODE]")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     options = parser.parse_args()
 
     config = common.read_config(options)

fdroidserver/readmeta.py

@@ -25,10 +25,7 @@ import metadata
 def main():
 
     parser = ArgumentParser(usage="%(prog)s")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
+    common.setup_global_opts(parser)
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     parser.parse_args()
     common.read_config(None)
 

fdroidserver/rewritemeta.py

@@ -34,11 +34,8 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
+    common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help="app-id in the form APPID")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     options = parser.parse_args()
 
     config = common.read_config(options)

fdroidserver/scanner.py

@@ -250,11 +250,8 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
+    common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help="app-id with optional versioncode in the form APPID[:VERCODE]")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     options = parser.parse_args()
 
     config = common.read_config(options)

fdroidserver/server.py

@@ -196,6 +196,7 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser()
+    common.setup_global_opts(parser)
     parser.add_argument("command", help="command to execute, either 'init' or 'update'")
     parser.add_argument("-i", "--identity-file", default=None,
                         help="Specify an identity file to provide to SSH for rsyncing")
@@ -203,10 +204,6 @@ def main():
                         help="Specify a local folder to sync the repo to")
     parser.add_argument("--sync-from-local-copy-dir", action="store_true", default=False,
                         help="Before uploading to servers, sync from local copy dir")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     parser.add_argument("--no-checksum", action="store_true", default=False,
                         help="Don't use rsync checksums")
     options = parser.parse_args()

fdroidserver/signindex.py

@@ -35,10 +35,7 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options]")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
+    common.setup_global_opts(parser)
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     options = parser.parse_args()
 
     config = common.read_config(options)

fdroidserver/stats.py

@@ -51,10 +51,7 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser()
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
+    common.setup_global_opts(parser)
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     parser.add_argument("-d", "--download", action="store_true", default=False,
                         help="Download logs we don't have")
     parser.add_argument("--recalc", action="store_true", default=False,

fdroidserver/update.py

@@ -1049,16 +1049,13 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser()
+    common.setup_global_opts(parser)
     parser.add_argument("--create-key", action="store_true", default=False,
                         help="Create a repo signing key in a keystore")
     parser.add_argument("-c", "--create-metadata", action="store_true", default=False,
                         help="Create skeleton metadata files that are missing")
     parser.add_argument("--delete-unknown", action="store_true", default=False,
                         help="Delete APKs without metadata from the repo")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     parser.add_argument("-b", "--buildreport", action="store_true", default=False,
                         help="Report on build data status")
     parser.add_argument("-i", "--interactive", default=False, action="store_true",

fdroidserver/verify.py

@@ -37,11 +37,8 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
+    common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help="app-id with optional versioncode in the form APPID[:VERCODE]")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     options = parser.parse_args()
 
     config = common.read_config(options)