Move predefined webapp dir into dj_utils.py

Also initialize `domjudge_api_url = None` and simply call the
API via CLI if `domjudge_api_url` is unset.

Author: eldering

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 force-passwords
 
 SUBST_JUDGEHOST = dj_make_chroot dj_run_chroot dj_make_chroot_docker \
                   dj_judgehost_cleanup

misc-tools/configure-domjudge.in

@@ -24,8 +24,6 @@ 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)
@@ -57,11 +55,9 @@ 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:
+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')

misc-tools/dj_utils.py renamed to misc-tools/dj_utils.py.in

@@ -16,7 +16,8 @@
 _myself = os.path.basename(sys.argv[0])
 _default_user_agent = requests.utils.default_user_agent()
 headers = {'user-agent': f'dj_utils/{_myself} ({_default_user_agent})'}
-domjudge_webapp_folder_or_api_url = 'unset'
+domjudge_webapp_dir = '@domserver_webappdir@'
+domjudge_api_url = None
 ca_check = True
 
 
@@ -50,8 +51,8 @@ def parse_api_response(name: str, response: requests.Response) -> bytes:
 def do_api_request(name: str, method: str = 'GET', jsonData: dict = {}, decode: bool = True):
     '''Perform an API call to the given endpoint and return its data.
 
-    Based on whether `domjudge_webapp_folder_or_api_url` is a folder or URL this
-    will use the DOMjudge CLI or HTTP API.
+    Based on whether `domjudge_api_url` is set, this will call the DOMjudge
+    API via HTTP or CLI.
 
     Parameters:
         name (str): the endpoint to call
@@ -67,12 +68,12 @@ def do_api_request(name: str, method: str = 'GET', jsonData: dict = {}, decode:
         cannot be JSON decoded.
     '''
 
-    if os.path.isdir(domjudge_webapp_folder_or_api_url):
+    if domjudge_api_url is None:
         result = api_via_cli(name, method, {}, {}, jsonData)
     else:
         global ca_check
-        url = f'{domjudge_webapp_folder_or_api_url}/{name}'
-        parsed = urlparse(domjudge_webapp_folder_or_api_url)
+        url = f'{domjudge_api_url}/{name}'
+        parsed = urlparse(domjudge_api_url)
         auth = None
         if parsed.username and parsed.password:
             auth = (parsed.username, parsed.password)
@@ -109,8 +110,8 @@ def do_api_request(name: str, method: str = 'GET', jsonData: dict = {}, decode:
 def upload_file(name: str, apifilename: str, file: str, data: dict = {}):
     '''Upload the given file to the API at the given path with the given name.
 
-    Based on whether `domjudge_webapp_folder_or_api_url` is a folder or URL this
-    will use the DOMjudge CLI or HTTP API.
+    Based on whether `domjudge_api_url` is set, this will call the DOMjudge
+    API via HTTP or CLI.
 
     Parameters:
         name (str): the endpoint to call
@@ -124,13 +125,13 @@ def upload_file(name: str, apifilename: str, file: str, data: dict = {}):
         RuntimeError when the HTTP status code is non 2xx.
     '''
 
-    if os.path.isdir(domjudge_webapp_folder_or_api_url):
+    if domjudge_api_url is None:
         response = api_via_cli(name, 'POST', data, {apifilename: file})
     else:
         global ca_check
         files = [(apifilename, open(file, 'rb'))]
 
-        url = f'{domjudge_webapp_folder_or_api_url}/{name}'
+        url = f'{domjudge_api_url}/{name}'
 
         try:
             response = requests.post(
@@ -166,7 +167,7 @@ def api_via_cli(name: str, method: str = 'GET', data: dict = {}, files: dict = {
     '''
 
     command = [
-        f'{domjudge_webapp_folder_or_api_url}/bin/console',
+        f'{domjudge_webapp_dir}/bin/console',
         'api:call',
         '-m',
         method

misc-tools/import-contest.in

@@ -29,7 +29,6 @@ sys.path.append('@domserver_libdir@')
 import dj_utils
 
 cid = None
-webappdir = '@domserver_webappdir@'
 
 
 def usage():
@@ -134,11 +133,9 @@ def import_contest_problemset_document(cid: str):
         else:
             print('Skipping contest problemset import.')
 
-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:
+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')