compress repository

.gitea/workflows/ci.yml

@@ -2,9 +2,6 @@ name: Generate Map Previews for Switzerland25 Tournament
 
 on:
   push:
-    paths:
-      - '.gitea/workflows/*'
-      - 'replays/**'
   workflow_dispatch:
 
 env:
@@ -55,97 +52,167 @@ jobs:
       - name: Move necessary files to Danser directory
         shell: bash
         run: |
+          echo "Moving necessary files to Danser directory..."
           mkdir -p "$DANSER_SKINS_DIR"
           mv "$SKINS_DIR"/* "$DANSER_SKINS_DIR"
           mkdir -p "$DANSER_MAPS_DIR"
           find "$MAPS_DIR" -type f -name '*.osz' -exec mv -t "$DANSER_MAPS_DIR" {} +
+          echo "Files moved."
 
       - name: Generate Danser videos
         shell: bash
         run: |
+          set +e
+
           JSON_FILE="$TIMESTAMPS_JSON"
           mapfile -t REPLAYS < <(find "$REPLAY_DIR" -type f -name "*.osr")
 
-          [ ! -f "$JSON_FILE" ] && exit 0
+          if [ ! -f "$JSON_FILE" ]; then
+            echo "WARNING: Timestamps JSON file not found at $JSON_FILE - skipping video generation"
+            exit 0
+          fi
+
+          echo "Found $(echo "${REPLAYS[@]}" | wc -w) replay files"
 
           choose_skin() {
             local name="$1"
             case "$name" in
               *FM*) echo "Aristia(Edit)+trail" ;;
               *HD*) echo "Aristia(Edit)+trail" ;;
-              *DT*) echo "boop" ;;
+              *DT*) echo "Aristia(Edit)+trail" ;;
               *EZ*) echo "Jace 6.25" ;;
               *TB*) echo "Aristia(Edit)+trail" ;;
               *HR*) echo "Aristia(Edit)+trail" ;;
-              *)    echo "OSCT_2023" ;;
+              *)    echo "Aristia(Edit)+trail" ;;
             esac
           }
 
+          processed=0
+          skipped=0
+
           for REPLAY in "${REPLAYS[@]}"; do
-            [ ! -f "$REPLAY" ] && continue
+            if [ ! -f "$REPLAY" ]; then
+              echo "WARNING: Replay file not found: $REPLAY"
+              continue
+            fi
+
             REPLAY_NAME=$(basename "$REPLAY" .osr)
             STAGE="${REPLAY_NAME%%_*}"
 
+            echo "Processing replay: $REPLAY_NAME"
+
             ENTRY=$(jq -c --arg name "$REPLAY_NAME" '
-              .[] | map(select(.name == $name)) | .[]' "$JSON_FILE")
+              .[] | map(select(.name == $name)) | .[]' "$JSON_FILE" 2>/dev/null)
 
             if [ -z "$ENTRY" ]; then
+              echo "   No timestamp entry found for $REPLAY_NAME - skipping"
+              ((skipped++))
               continue
             fi
 
-            DONE=$(echo "$ENTRY" | jq -r '.done')
+            DONE=$(echo "$ENTRY" | jq -r '.done' 2>/dev/null)
             if [ "$DONE" = "true" ]; then
+              echo "   Already processed $REPLAY_NAME - skipping"
+              ((skipped++))
               continue
             fi
 
-            START=$(echo "$ENTRY" | jq -r '.start')
-            END=$(echo "$ENTRY" | jq -r '.end')
+            START=$(echo "$ENTRY" | jq -r '.start' 2>/dev/null)
+            END=$(echo "$ENTRY" | jq -r '.end' 2>/dev/null)
+
+            if ! [[ "$START" =~ ^[0-9]+$ ]] || ! [[ "$END" =~ ^[0-9]+$ ]]; then
+              echo "   Invalid timestamp format for $REPLAY_NAME - skipping"
+              ((skipped++))
+              continue
+            fi
+
+            if [ "$START" -eq 0 ] && [ "$END" -eq 0 ]; then
+              echo "   No timestamps set for $REPLAY_NAME - skipping"
+              ((skipped++))
+              continue
+            fi
 
             OUT_VIDEO_DIR="$OUTPUT_DIR/$STAGE"
             OUT_VIDEO_FILE="$OUT_VIDEO_DIR/$REPLAY_NAME.mp4"
 
-            mkdir -p "$OUT_VIDEO_DIR"
+            mkdir -p "$OUT_VIDEO_DIR" 2>/dev/null
 
             SKIN=$(choose_skin "$REPLAY_NAME")
+            echo "   Using skin: $SKIN"
+            echo "   Timestamps: ${START}s - ${END}s"
+            echo "   Generating video with danser-cli..."
 
-            xvfb-run -a "$DANSER_DIR/danser-cli" \
+            if ! xvfb-run -a "$DANSER_DIR/danser-cli" \
               -replay "$REPLAY" -record -skip -settings="tourneypreview" -skin="$SKIN" -start=$START -end=$END -noupdatecheck \
-              -out="$REPLAY_NAME"
+              -out="$REPLAY_NAME" >/dev/null 2>&1; then
+              echo "   ERROR: Danser failed for $REPLAY_NAME"
+              ((skipped++))
+              continue
+            fi
 
             if [ -f "$DANSER_VIDEO_DIR/$REPLAY_NAME.mp4" ]; then
-              mv "$DANSER_VIDEO_DIR/$REPLAY_NAME.mp4" "$OUT_VIDEO_FILE"
+              echo "   Moving video to output directory..."
+              mv "$DANSER_VIDEO_DIR/$REPLAY_NAME.mp4" "$OUT_VIDEO_FILE" 2>/dev/null
 
-              ffmpeg -hide_banner -loglevel error \
+              echo "   Post-processing with ffmpeg..."
+              ffmpeg_output=$(ffmpeg -hide_banner -loglevel error \
                 -ss 5 \
                 -i "$OUT_VIDEO_FILE" \
                 -c:v h264_nvenc -preset slow -rc vbr -cq 19 -b:v 10M -maxrate 20M \
                 -c:a aac -b:a 192k \
-                "${OUT_VIDEO_FILE}.tmp.mp4"
+                "${OUT_VIDEO_FILE}.tmp.mp4" 2>&1)
 
-              mv "${OUT_VIDEO_FILE}.tmp.mp4" "$OUT_VIDEO_FILE"
+              if [ $? -ne 0 ]; then
+                echo "   ERROR: FFmpeg failed for $REPLAY_NAME:"
+                echo "$ffmpeg_output"
+                ((skipped++))
+                continue
+              fi
 
+              mv "${OUT_VIDEO_FILE}.tmp.mp4" "$OUT_VIDEO_FILE" 2>/dev/null
+
+              echo "   Marking as completed in timestamps..."
               tmp=$(mktemp)
               jq --arg name "$REPLAY_NAME" '
                 (.. | objects | select(has("name")) | select(.name == $name))
-                |= (.done = true)' "$JSON_FILE" > "$tmp" && mv "$tmp" "$JSON_FILE"
+                |= (.done = true)' "$JSON_FILE" > "$tmp" && mv "$tmp" "$JSON_FILE" 2>/dev/null
+
+              echo "   Successfully generated: $OUT_VIDEO_FILE"
+              ((processed++))
+            else
+              echo "   Failed to generate video for $REPLAY_NAME"
             fi
           done
 
+          echo ""
+          echo "Summary:"
+          echo "   Videos processed: $processed"
+          echo "   Files skipped: $skipped"
+
+          exit 0
+
       - name: Configure Git
         shell: bash
         run: |
+          echo "Configuring Git user settings..."
           git config user.email "arlind@sulej.ch"
           git config user.name "ci-bot"
+          echo "Git user configured."
 
       - name: Add and Commit changes
         shell: bash
         run: |
+          echo "Configuring Git settings..."
           git config advice.addIgnoredFile false
 
+          echo "Adding output files to Git..."
           git add outputs/
 
+          echo "Committing changes..."
           git commit -m "[ci skip] push back from pipeline" -q || echo "No changes to commit"
 
       - name: Push changes and create tag
         shell: bash
-        run: git push origin main || echo "No changes to push"
+        run: |
+          echo "Pushing changes to repository..."
+          git push origin main || echo "No changes to push"

.gitea/workflows/timestamps.json

@@ -1,70 +1,78 @@
 {
   "QF": [
-    { "name": "QF_FM1", "start": 0, "end": 0, "done": false },
-    { "name": "QF_FM2", "start": 0, "end": 0, "done": false },
-    { "name": "QF_FM3", "start": 0, "end": 0, "done": false },
-    { "name": "QF_FM4", "start": 0, "end": 0, "done": false },
-    { "name": "QF_FM5", "start": 0, "end": 0, "done": false },
-    { "name": "QF_HD1", "start": 0, "end": 0, "done": false },
-    { "name": "QF_HD2", "start": 0, "end": 0, "done": false },
-    { "name": "QF_HR1", "start": 0, "end": 0, "done": false },
-    { "name": "QF_HR2", "start": 0, "end": 0, "done": false },
-    { "name": "QF_DT1", "start": 0, "end": 0, "done": false },
-    { "name": "QF_DT2", "start": 0, "end": 0, "done": false },
-    { "name": "QF_DT3", "start": 0, "end": 0, "done": false }
+    { "name": "QF_FM1", "start": 47, "end": 77, "done": true },
+    { "name": "QF_FM2", "start": 120, "end": 154, "done": true },
+    { "name": "QF_FM3", "start": 55, "end": 99, "done": true },
+    { "name": "QF_FM4", "start": 87, "end": 999, "done": true  },
+    { "name": "QF_FM5", "start": 15, "end": 50, "done": true },
+    { "name": "QF_HD1", "start": 174, "end": 207, "done": true },
+    { "name": "QF_HD2", "start": 80, "end": 999, "done": true },
+    { "name": "QF_HR1", "start": 123, "end": 162, "done": true },
+    { "name": "QF_HR2", "start": 80, "end": 105, "done": true },
+    { "name": "QF_DT1", "start": 42, "end": 94, "done": true },
+    { "name": "QF_DT2", "start": 142, "end": 183, "done": true },
+    { "name": "QF_DT3", "start": 77, "end": 999, "done": true }
   ],
   "Ro16": [
-    { "name": "Ro16_FM1", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_FM2", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_FM3", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_FM4", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_FM5", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_FM6", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_HD1", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_HD2", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_HR1", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_DT1", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_DT2", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_DT3", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_EZ1", "start": 0, "end": 0, "done": false },
-    { "name": "Ro16_TB1", "start": 0, "end": 0, "done": false }
+    { "name": "Ro16_FM1", "start": 165, "end": 193, "done": true },
+    { "name": "Ro16_FM2", "start": 164, "end": 204, "done": true },
+    { "name": "Ro16_FM3", "start": 107, "end": 136, "done": true },
+    { "name": "Ro16_FM4", "start": 30, "end": 66, "done": true },
+    { "name": "Ro16_FM5", "start": 122, "end": 154, "done": true },
+    { "name": "Ro16_FM6", "start": 115, "end": 155, "done": true },
+    { "name": "Ro16_HD1", "start": 138, "end": 170, "done": true },
+    { "name": "Ro16_HD2", "start": 26, "end": 54, "done": true },
+    { "name": "Ro16_HR1", "start": 127, "end": 152, "done": true },
+    { "name": "Ro16_HR2", "start": 66, "end": 94, "done": true },
+    { "name": "Ro16_DT1", "start": 128, "end": 999, "done": true },
+    { "name": "Ro16_DT2", "start": 61, "end": 999, "done": true },
+    { "name": "Ro16_DT3", "start": 132, "end": 201, "done": true },
+    { "name": "Ro16_EZ1", "start": 83, "end": 999, "done": true },
+    { "name": "Ro16_TB1", "start": 198, "end": 229, "done": true }
   ],
   "SF": [
-    { "name": "SF_FM1", "start": 0, "end": 0, "done": false },
-    { "name": "SF_FM2", "start": 0, "end": 0, "done": false },
-    { "name": "SF_FM3", "start": 0, "end": 0, "done": false },
-    { "name": "SF_FM4", "start": 0, "end": 0, "done": false },
-    { "name": "SF_FM5", "start": 0, "end": 0, "done": false },
-    { "name": "SF_FM6", "start": 0, "end": 0, "done": false },
-    { "name": "SF_HD1", "start": 0, "end": 0, "done": false },
-    { "name": "SF_HD2", "start": 0, "end": 0, "done": false },
-    { "name": "SF_HR1", "start": 0, "end": 0, "done": false },
-    { "name": "SF_HR2", "start": 0, "end": 0, "done": false },
-    { "name": "SF_DT1", "start": 0, "end": 0, "done": false },
-    { "name": "SF_DT2", "start": 0, "end": 0, "done": false },
-    { "name": "SF_DT3", "start": 0, "end": 0, "done": false },
-    { "name": "SF_DT4", "start": 0, "end": 0, "done": false },
-    { "name": "SF_EZ1", "start": 0, "end": 0, "done": false },
-    { "name": "SF_TB1", "start": 0, "end": 0, "done": false }
+    { "name": "SF_FM1", "start": 148, "end": 193, "done": true },
+    { "name": "SF_FM2", "start": 192, "end": 999, "done": true },
+    { "name": "SF_FM3", "start": 25, "end": 59, "done": true },
+    { "name": "SF_FM4", "start": 66, "end": 104, "done": true },
+    { "name": "SF_FM5", "start": 136, "end": 186, "done": true },
+    { "name": "SF_FM6", "start": 138, "end": 166, "done": true },
+    { "name": "SF_FM7", "start": 78, "end": 110, "done": true },
+    { "name": "SF_HD1", "start": 146, "end": 178, "done": true },
+    { "name": "SF_HD2", "start": 164, "end": 200, "done": true },
+    { "name": "SF_HD3", "start": 90, "end": 999, "done": true },
+    { "name": "SF_HR1", "start": 119, "end": 149, "done": true },
+    { "name": "SF_HR2", "start": 63, "end": 98, "done": true },
+    { "name": "SF_HR3", "start": 156, "end": 197, "done": true },
+    { "name": "SF_DT1", "start": 146, "end": 180, "done": true },
+    { "name": "SF_DT2", "start": 215, "end": 262, "done": true },
+    { "name": "SF_DT3", "start": 79, "end": 110, "done": true },
+    { "name": "SF_DT4", "start": 150, "end": 187, "done": true },
+    { "name": "SF_EZ1", "start": 120, "end": 151, "done": true },
+    { "name": "SF_TB1", "start": 263, "end": 999, "done": true }
   ],
   "GF": [
-    { "name": "GF_FM1", "start": 0, "end": 0, "done": false },
-    { "name": "GF_FM2", "start": 0, "end": 0, "done": false },
-    { "name": "GF_FM3", "start": 0, "end": 0, "done": false },
-    { "name": "GF_FM4", "start": 0, "end": 0, "done": false },
-    { "name": "GF_FM5", "start": 0, "end": 0, "done": false },
-    { "name": "GF_FM6", "start": 0, "end": 0, "done": false },
-    { "name": "GF_FM7", "start": 0, "end": 0, "done": false },
-    { "name": "GF_HD1", "start": 0, "end": 0, "done": false },
-    { "name": "GF_HD2", "start": 0, "end": 0, "done": false },
-    { "name": "GF_HR1", "start": 0, "end": 0, "done": false },
-    { "name": "GF_HR2", "start": 0, "end": 0, "done": false },
-    { "name": "GF_HR3", "start": 100, "end": 120, "done": false },
-    { "name": "GF_DT1", "start": 0, "end": 0, "done": false },
-    { "name": "GF_DT2", "start": 0, "end": 0, "done": false },
-    { "name": "GF_DT3", "start": 0, "end": 0, "done": false },
-    { "name": "GF_DT4", "start": 0, "end": 0, "done": false },
-    { "name": "GF_EZ1", "start": 0, "end": 0, "done": false },
-    { "name": "GF_TB1", "start": 0, "end": 0, "done": false }
+    { "name": "GF_FM1", "start": 183, "end": 212, "done": true },
+    { "name": "GF_FM2", "start": 77, "end": 107, "done": true },
+    { "name": "GF_FM3", "start": 148, "end": 999, "done": true },
+    { "name": "GF_FM4", "start": 82, "end": 109, "done": true },
+    { "name": "GF_FM5", "start": 40, "end": 78, "done": true },
+    { "name": "GF_FM6", "start": 61, "end": 91, "done": true },
+    { "name": "GF_FM7", "start": 103, "end": 131, "done": true },
+    { "name": "GF_FM8", "start": 165, "end": 196, "done": true },
+    { "name": "GF_HD1", "start": 202, "end": 242, "done": true },
+    { "name": "GF_HD2", "start": 88, "end": 127, "done": true },
+    { "name": "GF_HD3", "start": 79, "end": 113, "done": true },
+    { "name": "GF_HD4", "start": 110, "end": 143, "done": true },
+    { "name": "GF_HR1", "start": 120, "end": 163, "done": true },
+    { "name": "GF_HR2", "start": 55, "end": 84, "done": true },
+    { "name": "GF_HR3", "start": 98, "end": 999, "done": true },
+    { "name": "GF_HR4", "start": 97, "end": 127, "done": true },
+    { "name": "GF_DT1", "start": 108, "end": 151, "done": true },
+    { "name": "GF_DT2", "start": 82, "end": 136, "done": true },
+    { "name": "GF_DT3", "start": 186, "end": 246, "done": true },
+    { "name": "GF_DT4", "start": 105, "end": 178, "done": true },
+    { "name": "GF_EZ1", "start": 54, "end": 91, "done": true },
+    { "name": "GF_TB1", "start": 0, "end": 999, "done": true }
   ]
 }

outputs/GF/README.md

@@ -1,20 +1,24 @@
 # Grand Finals Previews
 
-- [GF_FM1](./GF_FM1.mp4)
-- [GF_FM2](./GF_FM2.mp4)
-- [GF_FM3](./GF_FM3.mp4)
-- [GF_FM4](./GF_FM4.mp4)
-- [GF_FM5](./GF_FM5.mp4)
-- [GF_FM6](./GF_FM6.mp4)
-- [GF_FM7](./GF_FM7.mp4)
-- [GF_HD1](./GF_HD1.mp4)
-- [GF_HD2](./GF_HD2.mp4)
-- [GF_HR1](./GF_HR1.mp4)
-- [GF_HR2](./GF_HR2.mp4)
-- [GF_HR3](./GF_HR3.mp4)
-- [GF_DT1](./GF_DT1.mp4)
-- [GF_DT2](./GF_DT2.mp4)
-- [GF_DT3](./GF_DT3.mp4)
-- [GF_DT4](./GF_DT4.mp4)
-- [GF_EZ1](./GF_EZ1.mp4)
-- [GF_TB1](./GF_TB1.mp4)
+* [GF\_FM1](./GF_FM1.mp4)
+* [GF\_FM2](./GF_FM2.mp4)
+* [GF\_FM3](./GF_FM3.mp4)
+* [GF\_FM4](./GF_FM4.mp4)
+* [GF\_FM5](./GF_FM5.mp4)
+* [GF\_FM6](./GF_FM6.mp4)
+* [GF\_FM7](./GF_FM7.mp4)
+* [GF\_FM8](./GF_FM8.mp4)
+* [GF\_HD1](./GF_HD1.mp4)
+* [GF\_HD2](./GF_HD2.mp4)
+* [GF\_HD3](./GF_HD3.mp4)
+* [GF\_HD4](./GF_HD4.mp4)
+* [GF\_HR1](./GF_HR1.mp4)
+* [GF\_HR2](./GF_HR2.mp4)
+* [GF\_HR3](./GF_HR3.mp4)
+* [GF\_HR4](./GF_HR4.mp4)
+* [GF\_DT1](./GF_DT1.mp4)
+* [GF\_DT2](./GF_DT2.mp4)
+* [GF\_DT3](./GF_DT3.mp4)
+* [GF\_DT4](./GF_DT4.mp4)
+* [GF\_EZ1](./GF_EZ1.mp4)
+* [GF\_TB1](./GF_TB1.mp4)