Correct work with relative urls in clics API

icpc · Sep 8, 2023 · f2c7bf4 · f2c7bf4
1 parent 09979cc
commit f2c7bf4
Show file tree

Hide file tree

Showing 34 changed files with 148 additions and 75 deletions.
diff --git a/.run/nwerc-2018.run.xml b/.run/nwerc-2018.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="nwerc-2018" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-Plive.dev.contest=icpc-nwerc/2018/native" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="backend:run" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/config/_examples/_domjudge_test1/settings.json b/config/_examples/_domjudge_test1/settings.json
@@ -4,7 +4,8 @@
     {
       "login":"live",
       "password":"$creds.cds_password_pretest_dhaka",
-      "url":"https://cds.storm.vu/api/contests/pretest_dhaka"
+      "url":"https://cds.storm.vu/api",
+      "contestId": "pretest_dhaka"
     }
   ]
 }
diff --git a/config/_examples/_pc2/settings.json b/config/_examples/_pc2/settings.json
@@ -3,6 +3,8 @@
   "feeds": [
     {
       "url": "_examples/_pc2",
+      "contestId": "",
+      "eventFeedPath": "",
       "feedVersion": "2020_03"
     }
   ],

diff --git a/config/icpc-bapc/2022/settings.json b/config/icpc-bapc/2022/settings.json
@@ -4,7 +4,8 @@
     {
       "login": "$creds.login",
       "password": "$creds.password",
-      "url": "https://cds.gehack.nl/api/contests/bapc2022"
+      "url": "https://cds.gehack.nl/api",
+      "contestId": "bapc2022"
     }
   ]
 }
diff --git a/config/icpc-nac/2022/practice4/settings.json b/config/icpc-nac/2022/practice4/settings.json
@@ -2,7 +2,8 @@
   "type": "clics",
   "feeds": [
     {
-      "url": "https://open.kattis.com/clics-api/contests/nac22practice4",
+      "url": "https://open.kattis.com/clics-api",
+      "contestId": "nac22practice4",
       "feedVersion": "2020_03",
       "login":"$creds.kattis_login",
       "password":"$creds.kattis_token"

diff --git a/config/icpc-nac/2023/contest/settings.json b/config/icpc-nac/2023/contest/settings.json
@@ -4,9 +4,9 @@
     {
       "login": "$creds.cds_login",
       "password": "$creds.cds_password",
-      "url": "https://10.3.3.207/api/contests/NAC-2023-real"
+      "url": "https://10.3.3.207/api",
+      "contestId": "NAC-2023-real"
     }
   ],
-  "useTeamNames": false,
-  "mediaBaseUrl": "http://10.3.3.207/api"
+  "useTeamNames": false
 }
diff --git a/config/icpc-nac/2023/dr/settings.json b/config/icpc-nac/2023/dr/settings.json
@@ -4,10 +4,10 @@
     {
       "login": "$creds.cds_login",
       "password": "$creds.cds_password",
-      "url": "https://10.3.3.207/api/contests/NAC-2023-dress"
+      "url": "https://10.3.3.207/api",
+      "contestId": "NAC-2023-dress"
     }
   ],
-  "useTeamNames": false,
-  "mediaBaseUrl": "http://10.3.3.207/api"
+  "useTeamNames": false
 }
 
diff --git a/config/icpc-nac/2023/test1/settings.json b/config/icpc-nac/2023/test1/settings.json
@@ -4,9 +4,9 @@
     {
       "login": "$creds.cds_login",
       "password": "$creds.cds_password",
-      "url": "https://10.3.3.207/api/contests/NAC-2023-test1"
+      "url": "https://10.3.3.207/api",
+      "contestId": "NAC-2023-test1"
     }
   ],
-  "useTeamNames": false,
-  "mediaBaseUrl": "http://10.3.3.207/api"
+  "useTeamNames": false
 }
diff --git a/config/icpc-nac/2023/test2/settings.json b/config/icpc-nac/2023/test2/settings.json
@@ -1,13 +1,13 @@
 {
-  "type":"clics",
+  "type": "clics",
   "feeds": [
     {
       "login": "$creds.cds_login",
       "password": "$creds.cds_password",
-      "url": "https://10.3.3.207/api/contests/NAC-2023-test2"
+      "url": "https://10.3.3.207/api",
+      "contestId": "NAC-2023-test2"
     }
   ],
-  "useTeamNames":false,
-  "mediaBaseUrl":"http://10.3.3.207/api"
+  "useTeamNames": false
 }
 
diff --git a/config/icpc-nwerc/2018/cds/settings.json b/config/icpc-nwerc/2018/cds/settings.json
@@ -4,7 +4,8 @@
     {
       "login": "$creds.nwerc18_login_cds",
       "password": "$creds.nwerc18_password_cds",
-      "url": "https://cds.gehack.nl/api/contests/nwerc18"
+      "url": "https://cds.gehack.nl/api",
+      "contestId": "nwerc18"
     }
   ]
 }
diff --git a/config/icpc-nwerc/2018/native/settings.json b/config/icpc-nwerc/2018/native/settings.json
@@ -4,7 +4,8 @@
     {
       "login": "$creds.nwerc18_login",
       "password": "$creds.nwerc18_password",
-      "url": "https://www.domjudge.org/demoweb/api/contests/nwerc18"
+      "url": "https://www.domjudge.org/demoweb/api",
+      "contestId": "nwerc18"
     }
   ]
 }
diff --git a/config/icpc-nwerc/2019/settings.json b/config/icpc-nwerc/2019/settings.json
@@ -4,7 +4,8 @@
     {
       "login": "live",
       "password": "monger-lawless-hymn-inhaler",
-      "url": "https://judge.gehack.nl:8443/api/contests/3"
+      "url": "https://judge.gehack.nl:8443/api",
+      "contestId": "3"
     }
   ]
 }
diff --git a/config/icpc-nwerc/2022/settings.json b/config/icpc-nwerc/2022/settings.json
@@ -4,8 +4,8 @@
     {
       "login": "$creds.login",
       "password": "$creds.password",
-      "url": "https://cds.chipcie.ch.tudelft.nl/api/contests/nwerc2022"
+      "url": "https://cds.chipcie.ch.tudelft.nl/api",
+      "contestId": "nwerc2022"
     }
-  ],
-  "mediaBaseUrl":"https://cds.chipcie.ch.tudelft.nl/api"
+  ]
 }
diff --git a/config/icpc-rmc/2021/settings.json b/config/icpc-rmc/2021/settings.json
@@ -4,7 +4,8 @@
     {
       "login": "$creds.kattis_login",
       "password": "$creds.kattis_token",
-      "url": "https://open.kattis.com/clics-api/contests/rmc21",
+      "url": "https://open.kattis.com/clics-api",
+      "contestId": "rmc21",
       "feedVersion": "2020_03"
     }
   ],

diff --git a/config/icpc-swerc/2021/contest/settings.json b/config/icpc-swerc/2021/contest/settings.json
@@ -4,7 +4,8 @@
     {
       "login": "live",
       "password": "secret",
-      "url": "https://cds.swerc.eu/api/contests/swerc2021"
+      "url": "https://cds.swerc.eu/api",
+      "contestId": "swerc2021"
     }
   ]
 }
diff --git a/config/icpc-swerc/2021/dress/settings.json b/config/icpc-swerc/2021/dress/settings.json
@@ -4,7 +4,8 @@
     {
       "login": "live",
       "password": "SECRET",
-      "url": "https://cds.swerc.eu/api/contests/demo",
+      "url": "https://cds.swerc.eu/api",
+      "contestId": "demo",
       "feedVersion": "2020_03"
     }
   ]

diff --git a/config/icpc-swerc/2022/contest/settings.json b/config/icpc-swerc/2022/contest/settings.json
@@ -4,7 +4,8 @@
     {
       "login": "live",
       "password": "$creds.swerc22",
-      "url": "https://cds.swerc.eu/api/contests/swerc2022"
+      "url": "https://cds.swerc.eu/api",
+      "contestId": "swerc2022"
     }
   ]
 }
diff --git a/config/icpc-swerc/2022/practice/settings.json b/config/icpc-swerc/2022/practice/settings.json
@@ -4,7 +4,8 @@
     {
       "login": "live",
       "password": "$creds.swerc22",
-      "url": "https://cds.swerc.eu/api/contests/practice"
+      "url": "https://cds.swerc.eu/api",
+      "contestId": "practice"
     }
   ]
 }
diff --git a/config/icpc-wf/2020/settings.json b/config/icpc-wf/2020/settings.json
@@ -3,6 +3,8 @@
   "feeds": [
     {
       "url": "icpc-wf/2020",
+      "contestId": "",
+      "eventFeedPath": "",
       "feedVersion": "2020_03"
     }
   ],

diff --git a/config/icpc-wf/2021/dress/settings.json b/config/icpc-wf/2021/dress/settings.json
@@ -3,6 +3,8 @@
   "feeds": [
     {
       "url": "2021/dress",
+      "contestId": "",
+      "eventFeedPath": "",
       "login": "live",
       "password": "landed-wafer-state-diner"
     }

diff --git a/config/icpc-wf/2021/finals/settings.json b/config/icpc-wf/2021/finals/settings.json
@@ -4,17 +4,17 @@
     {
       "url": "icpc-wf/2021/finals",
       "login": "live",
+      "contestId": "",
+      "eventFeedPath": "",
       "password": "landed-wafer-state-diner"
     },
     {
       "url": "icpc-wf/2021/finals",
       "eventFeedName": "commentary-messages",
+      "contestId": "",
+      "eventFeedPath": "",
       "feedVersion": "2020_03"
     }
   ],
-  "useTeamNames": false,
-  "emulation": {
-    "startTime": "now",
-    "speed": 5
-  }
+  "useTeamNames": false
 }
diff --git a/config/icpc-wf/2021/mock/settings.json b/config/icpc-wf/2021/mock/settings.json
@@ -1,7 +1,10 @@
 {
   "type": "clics",
   "feeds": [
-    {"url": "https://172.29.1.207:8443/api/contests/mock"}
+    {
+      "url": "https://172.29.1.207:8443/api",
+      "contestId": "mock"
+    }
   ],
   "useTeamNames": false
 }
diff --git a/config/icpc-wf/2021/pretest/settings.json b/config/icpc-wf/2021/pretest/settings.json
@@ -2,9 +2,10 @@
   "type": "clics",
   "feeds": [
     {
-      "url": "https://cds.storm.vu/api/contests/pretest_dhaka",
+      "url": "https://cds.storm.vu/api",
       "password": "$creds.pretest_dhaka_pass",
-      "login": "live"
+      "login": "live",
+      "contestId": "pretest_dhaka"
     }
   ],
   "useTeamNames": false

diff --git a/config/icpc-wf/2021/systest1/settings.json b/config/icpc-wf/2021/systest1/settings.json
@@ -2,7 +2,9 @@
   "type": "clics",
   "feeds": [
     {
-      "url": "2021/systest1"
+      "url": "2021/systest1",
+      "contestId": "",
+      "eventFeedPath": ""
     }
   ]
 }
diff --git a/config/icpc-wf/2021/systest2/settings.json b/config/icpc-wf/2021/systest2/settings.json
@@ -2,7 +2,9 @@
   "type": "clics",
   "feeds": [
     {
-      "url": "2021/systest2"
+      "url": "2021/systest2",
+      "contestId": "",
+      "eventFeedPath": ""
     }
   ],
   "useTeamNames": false

diff --git a/config/icpc-wf/2021/test0/settings.json b/config/icpc-wf/2021/test0/settings.json
@@ -2,7 +2,9 @@
   "type": "clics",
   "feeds": [
     {
-      "url": "2021/test0"
+      "url": "2021/test0",
+      "contestId": "",
+      "eventFeedPath": ""
     }
   ],
   "useTeamNames": false

diff --git a/config/icpc-wf/2021/test0_1/settings.json b/config/icpc-wf/2021/test0_1/settings.json
@@ -2,7 +2,9 @@
   "type": "clics",
   "feeds": [
     {
-      "url": "https://172.29.1.207:8443/api/contests/test0"
+      "url": "https://172.29.1.207:8443/api/contests/test0",
+      "contestId": "",
+      "eventFeedPath": ""
     }
   ],
   "useTeamNames": false

diff --git a/schemas/settings.schema.json b/schemas/settings.schema.json
@@ -190,6 +190,9 @@
                             "url": {
                                 "type": "string"
                             },
+                            "contestId": {
+                                "type": "string"
+                            },
                             "login": {
                                 "type": "string"
                             },
@@ -199,6 +202,9 @@
                             "eventFeedName": {
                                 "type": "string"
                             },
+                            "eventFeedPath": {
+                                "type": "string"
+                            },
                             "feedVersion": {
                                 "enum": [
                                     "2020_03",
@@ -208,7 +214,8 @@
                         },
                         "additionalProperties": false,
                         "required": [
-                            "url"
+                            "url",
+                            "contestId"
                         ]
                     }
                 },