flake reorg

.github/workflows/docker.yml

@@ -3,7 +3,7 @@ name: docker-build
 on:
   push:
     branches:
-      - 'master'
+      - "master"
 
 jobs:
   docker:

.sqlx/query-0000e8f1c60464bde61980810f4013b3ff71d318291de9d8cf595474f4ee8f32.json

@@ -11,11 +11,7 @@
           "Custom": {
             "name": "team",
             "kind": {
-              "Enum": [
+              "Enum": ["blue", "red", "other"]
-                "blue",
-                "red",
-                "other"
-              ]
             }
           }
         }

.sqlx/query-253ca64f81921ad7351335d8b47967a4b6831b16d8128a11b40daa63b31f5a4c.json

@@ -18,11 +18,7 @@
           "Custom": {
             "name": "team",
             "kind": {
-              "Enum": [
+              "Enum": ["blue", "red", "other"]
-                "blue",
-                "red",
-                "other"
-              ]
             }
           }
         },
@@ -64,9 +60,7 @@
         "Int4"
       ]
     },
-    "nullable": [
+    "nullable": [false]
-      false
-    ]
   },
   "hash": "253ca64f81921ad7351335d8b47967a4b6831b16d8128a11b40daa63b31f5a4c"
 }

.sqlx/query-25a688892917d80b8746d77ebbcdfb4652c7047d722c530b4560d6008cdd2b97.json

@@ -10,13 +10,9 @@
       }
     ],
     "parameters": {
-      "Left": [
+      "Left": ["Int2"]
-        "Int2"
-      ]
     },
-    "nullable": [
+    "nullable": [null]
-      null
-    ]
   },
   "hash": "25a688892917d80b8746d77ebbcdfb4652c7047d722c530b4560d6008cdd2b97"
 }

.sqlx/query-417cfaecb2cb45d16c9da2dc2f8e6d1a37280842a5fc9ffb85b5d1955a54670d.json

@@ -13,14 +13,7 @@
           "Custom": {
             "name": "game_mode",
             "kind": {
-              "Enum": [
+              "Enum": ["ultiduo", "4v4", "6v6", "7v7", "9v9", "other"]
-                "ultiduo",
-                "4v4",
-                "6v6",
-                "7v7",
-                "9v9",
-                "other"
-              ]
             }
           }
         },

.sqlx/query-425af9e4b088335acabe4bf74c3b11c0cab5f033b57197c992533889a4d1300d.json

@@ -4,14 +4,7 @@
   "describe": {
     "columns": [],
     "parameters": {
-      "Left": [
+      "Left": ["Int8", "Text", "Int4", "Int4", "Int4", "Int4"]
-        "Int8",
-        "Text",
-        "Int4",
-        "Int4",
-        "Int4",
-        "Int4"
-      ]
     },
     "nullable": []
   },

.sqlx/query-4dcd86f5ef23f46b5c6cd391522791a609e04e068009678ba95b81cb385b9e89.json

@@ -11,11 +11,7 @@
           "Custom": {
             "name": "team",
             "kind": {
-              "Enum": [
+              "Enum": ["blue", "red", "other"]
-                "blue",
-                "red",
-                "other"
-              ]
             }
           }
         },
@@ -23,12 +19,7 @@
           "Custom": {
             "name": "medigun",
             "kind": {
-              "Enum": [
+              "Enum": ["medigun", "kritzkrieg", "quickfix", "vaccinator"]
-                "medigun",
-                "kritzkrieg",
-                "quickfix",
-                "vaccinator"
-              ]
             }
           }
         },

.sqlx/query-581b192c18e54b711d0e3b6d38490984c48320fe4607c7eacc7b9002daaf7771.json

@@ -4,12 +4,7 @@
   "describe": {
     "columns": [],
     "parameters": {
-      "Left": [
+      "Left": ["Int4", "Int8", "Int4", "Int4"]
-        "Int4",
-        "Int8",
-        "Int4",
-        "Int4"
-      ]
     },
     "nullable": []
   },

.sqlx/query-7669da21c453d1d4e5d5e7aead5a0fbc4307aba66debd679159374c5647fd0fe.json

@@ -11,11 +11,7 @@
           "Custom": {
             "name": "team",
             "kind": {
-              "Enum": [
+              "Enum": ["blue", "red", "other"]
-                "blue",
-                "red",
-                "other"
-              ]
             }
           }
         },

.sqlx/query-982bc615a035019855317b3b47a3ac10159d81318db323c2d076c9b4c04a4e02.json

@@ -11,11 +11,7 @@
           "Custom": {
             "name": "team",
             "kind": {
-              "Enum": [
+              "Enum": ["blue", "red", "other"]
-                "blue",
-                "red",
-                "other"
-              ]
             }
           }
         },

.sqlx/query-c9f31bcb2cb8b76f7cd2e66284b70f79e462ac70f94cdab022bdce63929731b1.json

@@ -4,10 +4,7 @@
   "describe": {
     "columns": [],
     "parameters": {
-      "Left": [
+      "Left": ["Int2", "Int4"]
-        "Int2",
-        "Int4"
-      ]
     },
     "nullable": []
   },

.sqlx/query-d4d72675d0a0792d14472c6bfc00454791dea1eae933818d168171f818bb7dc9.json

@@ -38,9 +38,7 @@
         "Int4"
       ]
     },
-    "nullable": [
+    "nullable": [false]
-      false
-    ]
   },
   "hash": "d4d72675d0a0792d14472c6bfc00454791dea1eae933818d168171f818bb7dc9"
 }

.sqlx/query-eab40a01c0df317cdfb97eb4f88884f6776897ec2c2ecb8cae05748c8d087711.json

@@ -18,11 +18,7 @@
           "Custom": {
             "name": "team",
             "kind": {
-              "Enum": [
+              "Enum": ["blue", "red", "other"]
-                "blue",
-                "red",
-                "other"
-              ]
             }
           }
         },
@@ -30,11 +26,7 @@
           "Custom": {
             "name": "team",
             "kind": {
-              "Enum": [
+              "Enum": ["blue", "red", "other"]
-                "blue",
-                "red",
-                "other"
-              ]
             }
           }
         },
@@ -48,9 +40,7 @@
         "Int4"
       ]
     },
-    "nullable": [
+    "nullable": [false]
-      false
-    ]
   },
   "hash": "eab40a01c0df317cdfb97eb4f88884f6776897ec2c2ecb8cae05748c8d087711"
 }

.sqlx/query-f4daaeeaaf227491627c0bb54319a5f356028a591fdac2f41ba2dce1c5053d4a.json

@@ -12,9 +12,7 @@
     "parameters": {
       "Left": []
     },
-    "nullable": [
+    "nullable": [null]
-      null
-    ]
   },
   "hash": "f4daaeeaaf227491627c0bb54319a5f356028a591fdac2f41ba2dce1c5053d4a"
 }

.sqlx/query-f8be06a1f3b2b9755faf3ca32921528528240308ed036cd6cf320ca4d31438b9.json

@@ -11,11 +11,7 @@
           "Custom": {
             "name": "team",
             "kind": {
-              "Enum": [
+              "Enum": ["blue", "red", "other"]
-                "blue",
-                "red",
-                "other"
-              ]
             }
           }
         },

Cargo.toml

@@ -9,7 +9,7 @@ name = "log-normalizer"
 path = "src/main.rs"
 
 [dependencies]
-sqlx = { version = "0.7.3", default_features = false, features = ["macros", "postgres", "json", "chrono", "runtime-tokio-rustls"] }
+sqlx = { version = "0.7.3", default-features = false, features = ["macros", "postgres", "json", "chrono", "runtime-tokio-rustls"] }
 dotenvy = "0.15.7"
 main_error = "0.1.2"
 tokio = { version = "1.36.0", features = ["macros", "time", "rt-multi-thread"] }

flake.lock

@@ -1,56 +1,103 @@
 {
   "nodes": {
-    "flake-utils": {
+    "crane": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1742394900,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
-        "owner": "numtide",
+        "owner": "ipetkov",
-        "repo": "flake-utils",
+        "repo": "crane",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "ipetkov",
-        "repo": "flake-utils",
+        "repo": "crane",
         "type": "github"
       }
     },
+    "flakelight": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748263617,
+        "narHash": "sha256-O1xypYFWzYlfiyO3fUZuzRhYac5DGptP+ZhocY9L5tQ=",
+        "owner": "nix-community",
+        "repo": "flakelight",
+        "rev": "65c783ba2b85910df5a053cb1451e9eb13794c12",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "flakelight",
+        "type": "github"
+      }
+    },
+    "mill-scale": {
+      "inputs": {
+        "crane": "crane",
+        "flakelight": [
+          "flakelight"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1748205441,
+        "narHash": "sha256-W+UUBT/l1DSTZo5G43494mRNNspJ2i9jW2QELC9JuMQ=",
+        "ref": "refs/heads/main",
+        "rev": "dac3b74a89cebbeb21cc6602e4a346604adbee8b",
+        "revCount": 49,
+        "type": "git",
+        "url": "https://codeberg.org/icewind/mill-scale.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://codeberg.org/icewind/mill-scale.git"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707568734,
+        "lastModified": 1748638332,
-        "narHash": "sha256-PWVdZzc9ZQ6RPfgLCc5pZAV6vhr/UI79u/GBAo/Z2+I=",
+        "narHash": "sha256-s2U9GJgLUohD4sK0w+H/NT+B+m50jxURZNkGXwEbZ4M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5cd1bc5c4d702f3ccc26fa93f86d05d5684fe5a3",
+        "rev": "a627748de5a6aa694e9a143df95655b7b52f242c",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "release-23.11",
+        "ref": "release-25.05",
         "type": "indirect"
       }
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flakelight": "flakelight",
+        "mill-scale": "mill-scale",
         "nixpkgs": "nixpkgs"
       }
     },
-    "systems": {
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "mill-scale",
+          "flakelight",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1742697269,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=",
-        "owner": "nix-systems",
+        "owner": "oxalica",
-        "repo": "default",
+        "repo": "rust-overlay",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316",
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
+        "owner": "oxalica",
-        "repo": "default",
+        "repo": "rust-overlay",
         "type": "github"
       }
     }

flake.nix

@@ -1,55 +1,38 @@
 {
   inputs = {
-    nixpkgs.url = "nixpkgs/release-23.11";
+    nixpkgs.url = "nixpkgs/release-25.05";
-    flake-utils.url = "github:numtide/flake-utils";
+    flakelight = {
+      url = "github:nix-community/flakelight";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    mill-scale = {
+      url = "git+https://codeberg.org/icewind/mill-scale.git";
+      inputs.flakelight.follows = "flakelight";
+    };
   };
 
-  outputs = {
+  outputs = {mill-scale, ...}:
-    self,
+    mill-scale ./. {
-    nixpkgs,
+      withOverlays = [
-    flake-utils,
+        (import ./nix/overlay.nix)
-  }:
+      ];
-    flake-utils.lib.eachDefaultSystem (
+      extraPaths = [
-      system: let
+        ./.sqlx
-        overlays = [
-          (import ./overlay.nix)
       ];
-        pkgs = import nixpkgs {
-          inherit system overlays;
-        };
-      in rec {
-        packages = rec {
-          inherit (pkgs) log-normalizer;
-          default = log-normalizer;
-        };
 
-        devShells.default = pkgs.mkShell {
+      nixosModules = {outputs, ...}: {
-          nativeBuildInputs = with pkgs; [
+        default = {
-            rustc
-            cargo
-            bacon
-            clippy
-            cargo-edit
-            cargo-outdated
-            cargo-insta
-            sqlx-cli
-          ];
-        };
-      }
-    )
-    // {
-      overlays.default = import ./overlay.nix;
-      nixosModules.default = {
           pkgs,
           config,
           lib,
           ...
         }: {
-        imports = [./module.nix];
+          imports = [./nix/module.nix];
           config = lib.mkIf config.services.log-normalizer.enable {
-          nixpkgs.overlays = [self.overlays.default];
+            nixpkgs.overlays = [outputs.overlays.default];
             services.log-normalizer.package = lib.mkDefault pkgs.log-normalizer;
           };
         };
       };
+    };
 }

nix/package.nix

@@ -4,7 +4,7 @@
   lib,
 }: let
   inherit (lib.sources) sourceByRegex;
-  src = sourceByRegex ./. ["Cargo.*" "(src|tests|.sqlx)(/.*)?"];
+  src = sourceByRegex ../. ["Cargo.*" "(src|tests|.sqlx)(/.*)?"];
 in
   rustPlatform.buildRustPackage rec {
     pname = "log-normalizer";
@@ -15,6 +15,6 @@ in
     inherit src;
 
     cargoLock = {
-      lockFile = ./Cargo.lock;
+      lockFile = ../Cargo.lock;
     };
   }

src/data.rs

@@ -65,6 +65,7 @@ pub enum Medigun {
     Vaccinator,
     #[serde(other)]
     #[default]
+    #[allow(clippy::enum_variant_names)]
     Medigun,
 }
 

src/normalized.rs

@@ -2,7 +2,7 @@ pub use crate::data::TeamId;
 use crate::data::{GameMode, MapType};
 use crate::raw::RawLog;
 pub use crate::raw::{
-    ChatMessage, ClassNumbers, Event, KillStreak, Player, RoundPlayer, Team, Teams, Uploader,
+    ChatMessage, ClassNumbers, Event, KillStreak, Player, RoundPlayer, Teams, Uploader,
 };
 use chrono::{DateTime, NaiveDateTime, Utc};
 use serde::Deserialize;
@@ -12,6 +12,7 @@ use steamid_ng::SteamID;
 
 #[derive(Debug, Clone, Deserialize)]
 #[serde(from = "crate::raw::RawLog")]
+#[allow(dead_code)]
 pub struct NormalizedLog {
     pub version: u8,
     pub length: u32,
@@ -45,6 +46,7 @@ impl NormalizedLog {
 }
 
 #[derive(Debug, Clone)]
+#[allow(dead_code)]
 pub struct Info {
     pub map: String,
     pub total_length: u32,
@@ -96,6 +98,7 @@ impl Info {
 }
 
 #[derive(Debug, Clone)]
+#[allow(dead_code)]
 pub struct Round {
     pub start_time: u64,
     pub winner: Option<TeamId>,

tests/data/1.json

@@ -1110,11 +1110,7 @@
   "players": {
     "STEAM_0:1:741224": {
       "team": "Blue",
-      "classes": [
+      "classes": ["scout", "pyro", "heavyweapons"],
-        "scout",
-        "pyro",
-        "heavyweapons"
-      ],
       "kills": 24,
       "deaths": 17,
       "assists": 16,
@@ -1161,9 +1157,7 @@
     },
     "STEAM_0:1:1306478": {
       "team": "Red",
-      "classes": [
+      "classes": ["medic"],
-        "medic"
-      ],
       "kills": 0,
       "deaths": 8,
       "assists": 13,
@@ -1194,10 +1188,7 @@
     },
     "STEAM_0:0:13708020": {
       "team": "Blue",
-      "classes": [
+      "classes": ["soldier", "sniper"],
-        "soldier",
-        "sniper"
-      ],
       "kills": 18,
       "deaths": 18,
       "assists": 3,
@@ -1236,9 +1227,7 @@
     },
     "STEAM_0:1:17494569": {
       "team": "Blue",
-      "classes": [
+      "classes": ["demoman"],
-        "demoman"
-      ],
       "kills": 24,
       "deaths": 19,
       "assists": 8,
@@ -1269,9 +1258,7 @@
     },
     "STEAM_0:0:32905194": {
       "team": "Red",
-      "classes": [
+      "classes": ["soldier"],
-        "soldier"
-      ],
       "kills": 22,
       "deaths": 22,
       "assists": 8,
@@ -1302,9 +1289,7 @@
     },
     "STEAM_0:0:26605378": {
       "team": "Blue",
-      "classes": [
+      "classes": ["soldier"],
-        "soldier"
-      ],
       "kills": 21,
       "deaths": 19,
       "assists": 7,
@@ -1335,9 +1320,7 @@
     },
     "STEAM_0:0:17635608": {
       "team": "Red",
-      "classes": [
+      "classes": ["demoman"],
-        "demoman"
-      ],
       "kills": 29,
       "deaths": 18,
       "assists": 14,
@@ -1368,9 +1351,7 @@
     },
     "STEAM_0:0:24507746": {
       "team": "Blue",
-      "classes": [
+      "classes": ["medic"],
-        "medic"
-      ],
       "kills": 0,
       "deaths": 12,
       "assists": 19,
@@ -1401,9 +1382,7 @@
     },
     "STEAM_0:1:19008580": {
       "team": "Red",
-      "classes": [
+      "classes": ["soldier"],
-        "soldier"
-      ],
       "kills": 18,
       "deaths": 19,
       "assists": 9,
@@ -1434,10 +1413,7 @@
     },
     "STEAM_0:0:13159229": {
       "team": "Red",
-      "classes": [
+      "classes": ["scout", "pyro"],
-        "scout",
-        "pyro"
-      ],
       "kills": 20,
       "deaths": 23,
       "assists": 5,
@@ -1484,10 +1460,7 @@
     },
     "STEAM_0:1:3094211": {
       "team": "Red",
-      "classes": [
+      "classes": ["scout", "sniper"],
-        "scout",
-        "sniper"
-      ],
       "kills": 13,
       "deaths": 24,
       "assists": 6,
@@ -1526,11 +1499,7 @@
     },
     "STEAM_0:1:40009526": {
       "team": "Blue",
-      "classes": [
+      "classes": ["scout", "heavyweapons", "sniper"],
-        "scout",
-        "heavyweapons",
-        "sniper"
-      ],
       "kills": 27,
       "deaths": 17,
       "assists": 10,