icpc · kunyavskiy · Jun 16, 2024 · Jun 2, 2024 · Jun 2, 2024 · Jun 2, 2024
diff --git a/config/__tests/ejudge_icpc_unfreeze/2023-voronezh/settings.json b/config/__tests/ejudge_icpc_unfreeze/2023-voronezh/settings.json
@@ -1,4 +1,4 @@
 {
   "type": "ejudge",
-  "url": "http://ioi-russia.vdi.mipt.ru/~ejudge/voronezh2023day1.xml"
+  "source": "http://ioi-russia.vdi.mipt.ru/~ejudge/voronezh2023day1.xml"
 }
diff --git a/config/__tests/ejudge_ioi/regionalroi-lpk-2021-d1/settings.json b/config/__tests/ejudge_ioi/regionalroi-lpk-2021-d1/settings.json
@@ -1,5 +1,5 @@
 {
   "type": "ejudge",
   "resultType": "IOI",
-  "url": "https://ejudge.strategy48.ru/regional-2021-d1.xml"
+  "source": "https://ejudge.strategy48.ru/regional-2021-d1.xml"
 }
diff --git a/config/__tests/ejudge_ioi_virtual/mosh-2023-keldysh/settings.json b/config/__tests/ejudge_ioi_virtual/mosh-2023-keldysh/settings.json
@@ -1,5 +1,5 @@
 {
   "type": "ejudge",
   "resultType": "IOI",
-  "url": "https://olympiads.ru/GDUvPbXKZ6lXalSG/external.xml"
+  "source": "https://olympiads.ru/GDUvPbXKZ6lXalSG/external.xml"
 }
diff --git a/config/__tests/pcms_icpc_freeze/icpc-nef-2022-2023/settings.json b/config/__tests/pcms_icpc_freeze/icpc-nef-2022-2023/settings.json
@@ -1,4 +1,4 @@
 {
   "type": "pcms",
-  "url": "https://nerc.itmo.ru/archive/2022/standings.xml"
+  "source": "https://nerc.itmo.ru/archive/2022/standings.xml"
 }
diff --git a/config/__tests/pcms_icpc_overrides/icpc-nef-2021-2022/settings.json b/config/__tests/pcms_icpc_overrides/icpc-nef-2021-2022/settings.json
@@ -1,4 +1,4 @@
 {
   "type": "pcms",
-  "url": "https://nerc.itmo.ru/archive/2021/standings.xml"
+  "source": "https://nerc.itmo.ru/archive/2021/standings.xml"
 }
diff --git a/config/__tests/pcms_ioi/innopolis-open-2022-2023-final/settings.json b/config/__tests/pcms_ioi/innopolis-open-2022-2023-final/settings.json
@@ -1,5 +1,5 @@
 {
   "type": "pcms",
-  "url": "https://pcms.university.innopolis.ru/results/innopolis/2022-2023/final-main.xml",
+  "source": "https://pcms.university.innopolis.ru/results/innopolis/2022-2023/final-main.xml",
   "resultType": "IOI"
 }
diff --git a/config/__tests/testsys_icpc/spbsu-2023-may/settings.json b/config/__tests/testsys_icpc/spbsu-2023-may/settings.json
@@ -1,4 +1,4 @@
 {
   "type": "testsys",
-  "url": "http://acm.math.spbu.ru/cgi-bin/view.pl/m230514.dat"
+  "source": "http://acm.math.spbu.ru/cgi-bin/view.pl/m230514.dat"
 }
diff --git a/config/_achievements_simple/settings.json b/config/_achievements_simple/settings.json
@@ -1,5 +1,5 @@
 {
-  "url":"http://nerc.itmo.ru/archive/2020/standings.xml",
+  "source":"http://nerc.itmo.ru/archive/2020/standings.xml",
   "type":"pcms",
 
   "emulation":{"speed":1, "startTime":"now"}

diff --git a/config/_examples/cats_icpc/settings.json b/config/_examples/cats_icpc/settings.json
@@ -1,6 +1,6 @@
 {
   "type":"cats",
-  "url":"https://imcs.dvfu.ru/cats",
+  "source":"https://imcs.dvfu.ru/cats",
   "cid":"5481581",
   "timeZone":"UTC+10",
   "resultType":"ICPC",

diff --git a/config/_examples/cats_ioi/settings.json b/config/_examples/cats_ioi/settings.json
@@ -1,5 +1,5 @@
 {
-  "url":"https://imcs.dvfu.ru/cats",
+  "source":"https://imcs.dvfu.ru/cats",
   "cid":"5974394",
   "type":"cats",
   "timeZone":"UTC+10",

diff --git a/config/_examples/clics/settings.json b/config/_examples/clics/settings.json
@@ -2,9 +2,11 @@
   "type":"clics",
   "feeds": [
     {
-      "login":"live",
-      "password":"$creds.cds_password_pretest_dhaka",
-      "url":"https://cds.storm.vu/api",
+      "source": {
+        "url": "https://cds.storm.vu/api",
+        "login":"live",
+        "password":"$creds.cds_password_pretest_dhaka"
+      },
       "contestId": "pretest_dhaka"
     }
   ]

diff --git a/config/_examples/cms/settings.json b/config/_examples/cms/settings.json
@@ -2,5 +2,5 @@
   "type": "cms",
   "activeContest": "ceoi22_5f2",
   "otherContests": ["ceoi22_5f1"],
-  "url": "https://ceoi.hsin.hr/ranking/"
+  "source": "https://ceoi.hsin.hr/ranking/"
 }
diff --git a/config/_examples/dmoj-icpc/settings.json b/config/_examples/dmoj-icpc/settings.json
@@ -1,6 +1,6 @@
 {
   "type": "dmoj",
-  "url": "https://dmoj.ca/",
+  "source": "https://dmoj.ca/",
   "contestId": "waterloo2023f",
   "apiKey": "$creds.dmoj"
 }
diff --git a/config/_examples/krsu/settings.json b/config/_examples/krsu/settings.json
@@ -1,8 +1,8 @@
 {
   "type":"krsu",
 
-  "submissionsUrl":"https://olymp.krsu.edu.kg/web/api/contestsubmissions/submissions?apiKey=a1f4d25se3&size=1000000&lowerBound=-1&upperBound=2000000000&contest=772&probe=0&isAdmin=1",
-  "contestUrl":"https://olymp.krsu.edu.kg/web/api/contestsubmissions/contestinfo?apiKey=a1f4d25se3&id=772",
+  "submissionsSource":"https://olymp.krsu.edu.kg/web/api/contestsubmissions/submissions?apiKey=a1f4d25se3&size=1000000&lowerBound=-1&upperBound=2000000000&contest=772&probe=0&isAdmin=1",
+  "contestSource":"https://olymp.krsu.edu.kg/web/api/contestsubmissions/contestinfo?apiKey=a1f4d25se3&id=772",
 
   "emulation":{"speed":5,"startTime":"now"}
 }

diff --git a/config/_examples/nsu/settings.json b/config/_examples/nsu/settings.json
@@ -4,5 +4,5 @@
   "password": "$creds.nsu_password",
   "olympiadId": 228,
   "tourId": 11881,
-  "url": "https://olympic.nsu.ru/nsuts-new"
+  "source": "https://olympic.nsu.ru/nsuts-new"
 }
diff --git a/config/_examples/pcms/settings.json b/config/_examples/pcms/settings.json
@@ -1,4 +1,4 @@
 {
   "type":"pcms",
-  "url":"https://nerc.itmo.ru/archive/2023/northern/nwq-2023.xml"
+  "source":"https://nerc.itmo.ru/archive/2023/northern/nwq-2023.xml"
 }
diff --git a/config/_examples/testsys/settings.json b/config/_examples/testsys/settings.json
@@ -1,4 +1,4 @@
 {
   "type": "testsys",
-  "url": "http://acm.math.spbu.ru/cgi-bin/view.pl/n201206.dat",
+  "source": "http://acm.math.spbu.ru/cgi-bin/view.pl/n201206.dat",
 }
diff --git a/config/ceoi/2022/settings.json b/config/ceoi/2022/settings.json
@@ -2,7 +2,7 @@
     "type": "cms",
     "activeContest": "ceoi22_5f2",
     "otherContests": ["ceoi22_5f1"],
-    "url": "https://ceoi.hsin.hr/ranking/",
+    "source": "https://ceoi.hsin.hr/ranking/",
     "emulation": {
         "speed": 3,
         "startTime": "now"

diff --git a/config/chu/2023/d1/settings.json b/config/chu/2023/d1/settings.json
@@ -1,5 +1,5 @@
 {
   "type":"ejudge",
-  "url":"https://timus.online/admin/spacelog.aspx/log-2.xml?space=1499&action=getejudgelog",
+  "source":"https://timus.online/admin/spacelog.aspx/log-2.xml?space=1499&action=getejudgelog",
   //"#timusSessionId":"123"
 }
diff --git a/config/chu/2023/d2/settings.json b/config/chu/2023/d2/settings.json
@@ -1,5 +1,5 @@
 {
   "type":"ejudge",
-  "url":"https://timus.online/admin/spacelog.aspx/log-2.xml?space=1500&action=getejudgelog",
+  "source":"https://timus.online/admin/spacelog.aspx/log-2.xml?space=1500&action=getejudgelog",
   //"timusSessionId":"123"
 }
diff --git a/config/chu/2023/dress/settings.json b/config/chu/2023/dress/settings.json
@@ -1,5 +1,5 @@
 {
   "type":"ejudge",
-  "url":"https://timus.online/admin/spacelog.aspx/log-2.xml?space=1498&action=getejudgelog",
+  "source":"https://timus.online/admin/spacelog.aspx/log-2.xml?space=1498&action=getejudgelog",
   //"#timusSessionId":"123"
 }
diff --git a/config/chu/2024/d1/settings.json b/config/chu/2024/d1/settings.json
@@ -1,7 +1,13 @@
 {
   "type": "ejudge",
-  "url": "log-1605.xml",
+  //"url": {
+  //  "url": "https://timus.online/admin/spacelog.aspx/log-1606.xml?space=1606&action=getejudgelog",
+  //  "auth": {
+  //    "cookies": {
+  //      "ASP.NET_SessionId": "123"
+  //    }
+  //  }
+  //},
+  "source": "log-1605.xml",
   "timeZone": "Asia/Yekaterinburg",
-  "authCookieName": "ASP.NET_SessionId",
-  "authCookieValue": "123"
 }
diff --git a/config/chu/2024/d2/settings.json b/config/chu/2024/d2/settings.json
@@ -1,7 +1,13 @@
 {
   "type": "ejudge",
-  "url": "log-1606.xml",
+  //"url": {
+  //  "url": "https://timus.online/admin/spacelog.aspx/log-1606.xml?space=1606&action=getejudgelog",
+  //  "auth": {
+  //    "cookies": {
+  //      "ASP.NET_SessionId": "123"
+  //    }
+  //  }
+  //},
+  "source": "log-1606.xml",
   "timeZone": "Asia/Yekaterinburg",
-  "authCookieName": "ASP.NET_SessionId",
-  "authCookieValue": "123"
 }
diff --git a/config/code-work/2023/main-tour/settings.json b/config/code-work/2023/main-tour/settings.json
@@ -1,6 +1,6 @@
 {
   "type":"cats",
-  "url":"https://imcs.dvfu.ru/cats",
+  "source":"https://imcs.dvfu.ru/cats",
   "cid":"6715954",
   "timeZone":"UTC+10",
   "resultType":"ICPC",

diff --git a/config/code-work/2023/test/settings.json b/config/code-work/2023/test/settings.json
@@ -1,6 +1,6 @@
 {
   "type":"cats",
-  "url":"https://imcs.dvfu.ru/cats",
+  "source":"https://imcs.dvfu.ru/cats",
   "cid":"6715945",
   "timeZone":"UTC+10",
   "resultType":"ICPC",

diff --git a/config/code-work/2023/testTour/settings.json b/config/code-work/2023/testTour/settings.json
@@ -1,6 +1,6 @@
 {
   "type":"cats",
-  "url":"https://imcs.dvfu.ru/cats",
+  "source":"https://imcs.dvfu.ru/cats",
   "cid":"6747059",
   "timeZone":"UTC+10",
   "resultType":"ICPC",

diff --git a/config/ejoi/2023/settings.json b/config/ejoi/2023/settings.json
@@ -2,5 +2,5 @@
     "type": "cms",
     "activeContest": "day2",
     "otherContests": ["day1"],
-    "url": "http://ranking.ejoi2023.kiu.edu.ge"
+    "source": "http://ranking.ejoi2023.kiu.edu.ge"
 }
diff --git a/config/fake/settings.json b/config/fake/settings.json
@@ -2,7 +2,7 @@
   "type": "clics",
   "feeds": [
     {
-    "url": "http://localhost:8000",
+    "source": "http://localhost:8000",
     "contestId": "",
     "eventFeedPath": "",
     "feedVersion": "2020_03"

diff --git a/config/fed/2023-voronezh/settings.json b/config/fed/2023-voronezh/settings.json
@@ -1,4 +1,4 @@
 {
   "type":"ejudge",
-  "url":"http://ioi-russia.vdi.mipt.ru/~ejudge/voronezh2023day1.xml"
+  "source":"http://ioi-russia.vdi.mipt.ru/~ejudge/voronezh2023day1.xml"
 }
diff --git a/config/icpc-asia-pacific/settings.json b/config/icpc-asia-pacific/settings.json
@@ -2,9 +2,11 @@
   "type":"clics",
   "feeds": [
     {
-      "login":"login",
-      "password":"password",
-      "url":"https://icpc2024-pacific-maingate.gusmachine.com/api",
+      "source": {
+        "url": "https://icpc2024-pacific-maingate.gusmachine.com/api",
+        "login":"login",
+        "password":"password"
+      },
       "contestId": "3"
     }
   ]

diff --git a/config/icpc-europe/bapc-2022-2023/settings.json b/config/icpc-europe/bapc-2022-2023/settings.json
@@ -2,9 +2,11 @@
   "type": "clics",
   "feeds": [
     {
-      "login": "$creds.login",
-      "password": "$creds.password",
-      "url": "https://cds.gehack.nl/api",
+      "source": {
+        "url": "https://cds.gehack.nl/api",
+        "login": "$creds.login",
+        "password": "$creds.password"
+      },
       "contestId": "bapc2022"
     }
   ]

diff --git a/config/icpc-europe/dapc-2023-2024/settings.json b/config/icpc-europe/dapc-2023-2024/settings.json
@@ -2,10 +2,12 @@
   "type": "clics",
   "feeds": [
     {
-      "url": "https://cds.chipcie.ch.tudelft.nl/api",
-      "contestId": "DAPC-2023",
-      "login": "live",
-      "password": "password"
+      "source": {
+        "url": "https://cds.chipcie.ch.tudelft.nl/api",
+        "login": "live",
+        "password": "password"
+      },
+      "contestId": "DAPC-2023"
     }
   ]
 }
diff --git a/config/icpc-europe/euc-2023-2024/settings.json b/config/icpc-europe/euc-2023-2024/settings.json
@@ -2,12 +2,10 @@
   "type": "clics",
   "feeds": [
     {
-      "url": ".",
-      "login": "live",
+      "source": ".",
       "eventFeedPath": "",
       "contestId": "EUC24",
       "feedVersion": "2022_07",
-      "password": "pass"
     }
   ]
 }
diff --git a/config/icpc-europe/nwerc-2018-2019/cds/settings.json b/config/icpc-europe/nwerc-2018-2019/cds/settings.json
@@ -2,9 +2,11 @@
   "type":"clics",
   "feeds": [
     {
-      "login": "$creds.nwerc18_login_cds",
-      "password": "$creds.nwerc18_password_cds",
-      "url": "https://cds.gehack.nl/api",
+      "source": {
+        "url": "https://cds.gehack.nl/api",
+        "login": "$creds.nwerc18_login_cds",
+        "password": "$creds.nwerc18_password_cds"
+      },
       "contestId": "nwerc18"
     }
   ]

diff --git a/config/icpc-europe/nwerc-2018-2019/native/settings.json b/config/icpc-europe/nwerc-2018-2019/native/settings.json
@@ -2,9 +2,11 @@
   "type": "clics",
   "feeds": [
     {
-      "login": "$creds.nwerc18_login",
-      "password": "$creds.nwerc18_password",
-      "url": "https://www.domjudge.org/demoweb/api",
+      "source": {
+        "url": "https://www.domjudge.org/demoweb/api",
+        "login": "$creds.nwerc18_login",
+        "password": "$creds.nwerc18_password"
+      },
       "contestId": "nwerc18"
     }
   ]

diff --git a/config/icpc-europe/nwerc-2019-2020/settings.json b/config/icpc-europe/nwerc-2019-2020/settings.json
@@ -2,9 +2,11 @@
   "type":"clics",
   "feeds": [
     {
-      "login": "live",
-      "password": "monger-lawless-hymn-inhaler",
-      "url": "https://judge.gehack.nl:8443/api",
+      "source": {
+        "url": "https://judge.gehack.nl:8443/api",
+        "login": "live",
+        "password": "monger-lawless-hymn-inhaler"
+      },
       "contestId": "3"
     }
   ]

diff --git a/config/icpc-europe/nwerc-2022-2023/settings.json b/config/icpc-europe/nwerc-2022-2023/settings.json
@@ -2,9 +2,11 @@
   "type":"clics",
   "feeds": [
     {
-      "login": "$creds.login",
-      "password": "$creds.password",
-      "url": "https://cds.chipcie.ch.tudelft.nl/api",
+      "source": {
+        "url": "https://cds.chipcie.ch.tudelft.nl/api",
+        "login": "$creds.login",
+        "password": "$creds.password"
+      },
       "contestId": "nwerc2022"
     }
   ]

diff --git a/config/icpc-europe/swerc-2021-2022/contest/settings.json b/config/icpc-europe/swerc-2021-2022/contest/settings.json
@@ -2,9 +2,11 @@
   "type": "clics",
   "feeds": [
     {
-      "login": "live",
-      "password": "secret",
-      "url": "https://cds.swerc.eu/api",
+      "source": {
+        "url": "https://cds.swerc.eu/api",
+        "login": "live",
+        "password": "secret"
+      },
       "contestId": "swerc2021"
     }
   ]