Use ArgumentParser and make arguments optional

This gives more flexibility for extension in the future and
leaves the default usage without arguments unchanged.

Author: eldering

misc-tools/configure-domjudge.in

@@ -14,21 +14,17 @@ under the GNU GPL. See README and COPYING for details.
 '''
 
 import json
-import os.path
+import os
 import requests
 import requests.utils
 import shutil
 import sys
+from argparse import ArgumentParser
 from typing import List, Set
 
 sys.path.append('@domserver_libdir@')
 import dj_utils
 
-def usage():
-    print(f'Usage: {sys.argv[0]} [<domjudge-api-url>]')
-    exit(1)
-
-
 def compare_configs(expected_config: Set, actual_config: Set, num_spaces=4, key_mismatch_in_diff=False) -> (List, Set, Set):
     diffs = []
     space_string = ' ' * num_spaces
@@ -55,10 +51,16 @@ def _keyify_list(l: List) -> Set:
     return { elem['id']: elem for elem in l }
 
 
-if len(sys.argv) == 2:
-    dj_utils.domjudge_api_url = sys.argv[1]
-elif len(sys.argv) != 1:
-    usage()
+parser = ArgumentParser(description='Configure DOMjudge via the API.')
+parser.add_argument('-d', '--dir',  help="directory to read configuration from, defaults to current directory")
+parser.add_argument('-u', '--url',  help="DOMjudge API URL to use, if not specified use the CLI interface")
+args = parser.parse_args()
+
+if args.dir:
+    os.chdir(args.dir)
+
+if args.url:
+    dj_utils.domjudge_api_url = args.url
 
 user_data = dj_utils.do_api_request('user')
 if 'admin' not in user_data['roles']:

misc-tools/import-contest.in

@@ -15,7 +15,8 @@ Part of the DOMjudge Programming Contest Jury System and licensed
 under the GNU GPL. See README and COPYING for details.
 '''
 
-from os import listdir
+from argparse import ArgumentParser
+from os import chdir, listdir
 from typing import List
 import json
 import os.path
@@ -30,11 +31,15 @@ import dj_utils
 
 cid = None
 
+parser = ArgumentParser(description='Import a contest archive to DOMjudge via the API.')
+parser.add_argument('-d', '--dir',  help="directory containing the contest archive, defaults to current directory")
+parser.add_argument('-u', '--url',  help="DOMjudge API URL to use, if not specified use the CLI interface")
+args = parser.parse_args()
 
-def usage():
-    print(f'Usage: {sys.argv[0]} [<domjudge-api-url>]')
-    exit(1)
-
+if args.dir:
+    chdir(args.dir)
+if args.url:
+    dj_utils.domjudge_api_url = args.url
 
 def import_file(entity: str, files: List[str]) -> bool:
     any_matched = False
@@ -133,11 +138,6 @@ def import_contest_problemset_document(cid: str):
         else:
             print('Skipping contest problemset import.')
 
-if len(sys.argv) == 2:
-    dj_utils.domjudge_api_url = sys.argv[1]
-elif len(sys.argv) != 1:
-    usage()
-
 user_data = dj_utils.do_api_request('user')
 if 'admin' not in user_data['roles']:
     print('Your user does not have the \'admin\' role, can not import.')