fix sync

Cargo.lock

@@ -953,7 +953,7 @@ dependencies = [
 
 [[package]]
 name = "demostf-frontend"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "async-session",
  "axum",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "demostf-frontend"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2021"
 
 [dependencies]

flake.lock

@@ -22,17 +22,14 @@
         ]
       },
       "locked": {
-        "lastModified": 1731933812,
+        "lastModified": 1732198790,
-        "narHash": "sha256-PeuRDDq1DcHxbOmXWb3nWMp5PqWUn5PSKimNbUzWEaQ=",
+        "narHash": "sha256-VNTFKcX52PRh3I88ofYTyBWCtqVQB3fVIMO64HHs3+0=",
-        "owner": "nix-community",
+        "path": "/home/robin/Projects/flakelight",
-        "repo": "flakelight",
+        "type": "path"
-        "rev": "f4b26f683be5c9ac1ec05f968dbbcb35f4bb6346",
-        "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "path": "/home/robin/Projects/flakelight",
-        "repo": "flakelight",
+        "type": "path"
-        "type": "github"
       }
     },
     "mill-scale": {
@@ -44,17 +41,14 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1732197065,
+        "lastModified": 1732212005,
-        "narHash": "sha256-Lyosd/rJHFp1xnWPNhukQkW1hFtIiIiVDxQ+fcVypgI=",
+        "narHash": "sha256-t2+yKoxZe2JkvyHkJAAyyLS6N8yzyx0o95DuzHqv7JA=",
-        "owner": "icewind1991",
+        "path": "/home/robin/Projects/mill-scale",
-        "repo": "mill-scale",
+        "type": "path"
-        "rev": "8051d162308a80dde168b7efe012bfa1363be4ba",
-        "type": "github"
       },
       "original": {
-        "owner": "icewind1991",
+        "path": "/home/robin/Projects/mill-scale",
-        "repo": "mill-scale",
+        "type": "path"
-        "type": "github"
       }
     },
     "nixpkgs": {

flake.nix

@@ -2,11 +2,13 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-24.05";
     flakelight = {
-      url = "github:nix-community/flakelight";
+      # url = "github:nix-community/flakelight";
+      url = "path:/home/robin/Projects/flakelight";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     mill-scale = {
-      url = "github:icewind1991/mill-scale";
+      # url = "github:icewind1991/mill-scale";
+      url = "path:/home/robin/Projects/mill-scale";
       inputs.flakelight.follows = "flakelight";
     };
     npmlock2nix = {
@@ -37,6 +39,8 @@
     ];
     toolchain = pkgs: pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
     tools = pkgs: with pkgs; [
+      bacon
+      cargo-edit
       nodejs
       nodePackages.svgo
       typescript

script/viewer/Analyse/AnalyseMenu.tsx

@@ -5,18 +5,21 @@ export interface AnalyseMenuProps {
     isShared: boolean;
 }
 
-export function AnalyseMenu({sessionName, onShare, canShare, isShared}:AnalyseMenuProps) {
+export function AnalyseMenu(props: AnalyseMenuProps) {
-
+    const loc = () => window.location.toString().replace(/\#.*/, '') + '#' + props.sessionName;
-	const loc = window.location.toString().replace(/\#.+/, '') + '#' + sessionName;
+    const shareText = () => (props.isShared) ?
-	const shareText = (isShared) ?
+        <input class="share-text" value={loc()} readOnly={true}
-		<input class="share-text" value={loc} readOnly={true}
                title="Use this link to join the current session"
-		       style={{width: `${(loc.length*8)}px`}}
+               style={{width: `${(loc().length * 8)}px`}}
-		       onFocus={(event)=>{(event.target as HTMLInputElement).select()}}/> : '';
+               onFocus={(event) => {
+                   (event.target as HTMLInputElement).select()
+               }}/> : '';
 
-	const shareButton = (canShare) ? <div class="analyse-menu">
+    const shareButton = () => (props.canShare) ? <div class="analyse-menu">
         <button class="share-session" title="Start a shared session"
-			        onClick={()=>{onShare()}}/>
+                onClick={() => {
+                    props.onShare()
+                }}/>
         {shareText}
     </div> : '';
 

script/viewer/Analyse/Analyser.tsx

@@ -34,8 +34,12 @@ export const Analyser = (props: AnalyseProps) => {
         if (update["tick"]) {
             setTick(update["tick"]);
         }
+        if (update.hasOwnProperty("playing")) {
             if (update["playing"]) {
-			setPlaying(update["playing"]);
+                play();
+            } else {
+                pause();
+            }
         }
     }
 
@@ -46,7 +50,7 @@ export const Analyser = (props: AnalyseProps) => {
             setTick(Math.floor(parsed));
         } else {
             const name = window.location.hash.substring(1);
-			Session.join(name, onUpdate);
+            session = Session.join(name, onUpdate);
             setSessionName(name);
         }
     }
@@ -86,7 +90,7 @@ export const Analyser = (props: AnalyseProps) => {
         setPlaying(true);
         requestAnimationFrame(animFrame);
         if (session) {
-			session.update({playing: false});
+            session.update({playing: true});
         }
     }
 
@@ -98,7 +102,7 @@ export const Analyser = (props: AnalyseProps) => {
         }
     }
 
-	const syncPlayTick = debounce(500, () => {
+    const syncPlayTick = throttle(2500, () => {
         if (session) {
             session.update({
                 playing: playing(),

script/viewer/Analyse/Session.ts

@@ -14,6 +14,7 @@ export class Session {
         this.sessionName = name;
         this.initialState = initialState;
         this.onState = onState;
+        this.open();
     }
 
     public static create(state: PlaybackState): Session {
@@ -98,7 +99,7 @@ export class Session {
                     tick: update["tick"]
                 }));
             }
-            if (update["playing"]) {
+            if (update.hasOwnProperty("playing")) {
                 this.socket.send(JSON.stringify({
                     type: 'play',
                     session: this.sessionName,

src/data/demo.rs

@@ -293,10 +293,10 @@ impl Render for DemoFormat {
             MapMode::Ultiduo => "Ultiduo",
             MapMode::Bball => "BBall",
             MapMode::Other => match self.player_count {
-                17 | 18 | 19 => "HL",
+                17..=19 => "HL",
-                15 | 14 => "Prolander",
+                14..=15 => "Prolander",
-                13 | 12 | 11 => "6v6",
+                11..=13 => "6v6",
-                7 | 8 | 9 => "4v4",
+                7..=9 => "4v4",
                 _ => "Other",
             },
         };

style/pages/viewer/AnalyseMenu.css

@@ -19,7 +19,7 @@
         margin: 10px;
         border: none;
         cursor: pointer;
-    background-image: url("images/link_white.svg");
+        background-image: url("inline://images//link_white.svg");
         background-size: contain;
 
         &:active, &:focus {

style/pages/viewer/Analyser.css

@@ -19,6 +19,10 @@
         bottom: 0;
         left: 64px;
         width: calc(100% - 64px);
+
+        & .timeline-progress[disabled] {
+            opacity: 0.2;
+        }
     }
 
     & .play-pause-button {
@@ -35,6 +39,10 @@
         &:focus, &:active {
             outline: none;
         }
+
+        &[disabled] {
+            opacity: 0.2;
+        }
     }
 }