Add contest export script

misc-tools/.gitignore

@@ -5,4 +5,5 @@
 /dj_make_chroot_docker
 /dj_run_chroot
 /dj_judgehost_cleanup
+/dj_utils.py
 /force-passwords

misc-tools/Makefile

@@ -9,7 +9,8 @@ include $(TOPDIR)/Makefile.global
 TARGETS =
 OBJECTS =
 
-SUBST_DOMSERVER = fix_permissions configure-domjudge import-contest force-passwords
+SUBST_DOMSERVER = fix_permissions configure-domjudge dj_utils.py \
+                  import-contest export-contest force-passwords
 
 SUBST_JUDGEHOST = dj_make_chroot dj_run_chroot dj_make_chroot_docker \
                   dj_judgehost_cleanup

misc-tools/configure-domjudge.in

@@ -14,23 +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
 
-webappdir = '@domserver_webappdir@'
-
-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
@@ -57,12 +51,16 @@ def _keyify_list(l: List) -> Set:
     return { elem['id']: elem for elem in l }
 
 
-if len(sys.argv) == 1:
-    dj_utils.domjudge_webapp_folder_or_api_url = webappdir
-elif len(sys.argv) == 2:
-    dj_utils.domjudge_webapp_folder_or_api_url = sys.argv[1]
-else:
-    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']:
@@ -88,7 +86,7 @@ if os.path.exists('config.json'):
             print(f'  - missing keys from new config = {missing_keys}')
         if diffs or new_keys or missing_keys:
             if dj_utils.confirm('  - Upload these configuration changes?', True):
-                actual_config = dj_utils.do_api_request('config', 'PUT', expected_config)
+                actual_config = dj_utils.do_api_request('config', 'PUT', jsonData=expected_config)
                 diffs, new_keys, missing_keys = compare_configs(
                         actual_config=actual_config,
                         expected_config=expected_config