fixes

icpc · Dec 14, 2024 · 9e90311 · 9e90311
1 parent 1ae3c54
commit 9e90311
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ If you don't need auth, you can disable it by `--no-auth` command-line option.
 
 # Run in development mode
 
-[Check separate document](https://github.com/icpc/live-v3/blob/main/docs/development.md)
+g[Check separate document](./docs/development.md)
 
 # Previous versions:
 

diff --git a/icpc-live-v3.code-workspace b/icpc-live-v3.code-workspace
@@ -0,0 +1,33 @@
+{
+	"folders": [
+		{
+			"name": "✨ root",
+			"path": "."
+		},
+		{
+			"name": "🚀 icpc-live-v3",
+			"path": "src/frontend"
+		},
+		{
+			"name": "🚀 icpc-live-v3-admin",
+			"path": "src/frontend/admin"
+		},
+		{
+			"name": "🚀 shared-code",
+			"path": "src/frontend/common"
+		},
+		{
+			"name": "🚀 content-gen",
+			"path": "src/frontend/content-gen"
+		},
+		{
+			"name": "🚀 icpc-live-v3-locator",
+			"path": "src/frontend/locator"
+		},
+		{
+			"name": "🚀 icpc-live-v3-overlay",
+			"path": "src/frontend/overlay"
+		}
+	],
+	"settings": {}
+}
diff --git a/src/frontend/content-gen/gen_video.bash b/src/frontend/content-gen/gen_video.bash
@@ -1,16 +1,17 @@
 #!/bin/bash
 set -e
 set -o pipefail
-# set -x
+set -x
 
 OFFSET=4
 SPEEDUP=15
-CONTEST_NAME="finals"
+CONTEST_NAME="vkoshp"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 
 # echo "Step 1: Download latest event-feed.json"
 # rm -f event-feed-$CONTEST_NAME.ndjson
 # timeout 10s wget --header 'cookie: JSESSIONID=0000ij9lihNPu7Xe7kc_R9VimX0:cde8627c-75ce-43c7-a09a-af5b62653e86:9eb3971a-d235-44b6-af0e-68c25f91e474:6e590761-52bd-44b0-8ab8-bb8884df8caf' \ -k https://172.24.0.7:7443/api/contests/wf48_$CONTEST_NAME/event-feed -q -O event-feed-$CONTEST_NAME.ndjson || true
+timeout 10s wget -k https://nerc.itmo.ru/school/archive/2024-2025/ru-olymp-team-russia-2024-standings-sdcjaccjhzvzkvskvkasbvkazsxkcvbaskdvbjkasdbvjkzsbkv.xml -q -O config/$CONTEST_NAME/runs.xml || true
 
 # echo "Step 2: Edit the config for backend"
 # cp $REPO_ROOT/artifacts/live-v3-dev.jar ./
@@ -35,20 +36,9 @@ echo "Start time: $startTime"
 
 cat <<EOF > config/$CONTEST_NAME/settings.json
 {
-  "type": "clics",
+  "type": "pcms",
   "network": { "allowUnsecureConnections": true },
-  "feeds": [
-    {
-      "source": ".",
-      "contestId": "",
-      "eventFeedPath": "",
-      "eventFeedName": "event-feed.ndjson",
-      "urlPrefixMapping": {
-        "https://172.24.0.7:7443/": "http://172.24.0.20:4323/", 
-        "contests": "http://172.24.0.20:4323/api/contests"
-      }
-    }
-  ],
+  "source": "runs.xml",
   "emulation": {
     "speed": $SPEEDUP,
     "startTime": "$startTime",
@@ -57,6 +47,7 @@ cat <<EOF > config/$CONTEST_NAME/settings.json
 EOF
 
 echo "Step 3: add ticker messages"
+mkdir config/$CONTEST_NAME/presets || true
 cat <<EOF > config/$CONTEST_NAME/presets/ticker.json
 [
     {
@@ -75,7 +66,7 @@ cat <<EOF > config/$CONTEST_NAME/presets/ticker.json
 EOF
 
 echo "Step 4: Start backend"
-java -jar live-v3-dev.jar -c config/$CONTEST_NAME --custom-fields-csv=config/custom-fields.csv --no-auth > ./backend.log &
+java -jar live-v3-dev.jar -c config/$CONTEST_NAME --no-auth > ./backend.log &
 BACKEND_PID=$!
 function cleanup {
   echo "Step INF: Cleanup"