diff --git a/flake.lock b/flake.lock index 28764fd..1a4c1fd 100644 --- a/flake.lock +++ b/flake.lock @@ -1067,6 +1067,22 @@ "type": "github" } }, + "hpcstat": { + "flake": false, + "locked": { + "lastModified": 1714874258, + "narHash": "sha256-rEyWxfnScWDYW2w3r+aFRGyzC5M/OfNrEKmV9suXyA8=", + "owner": "CHN-beta", + "repo": "hpcstat", + "rev": "3a4ba7a94f6a5c21a6725b9f91c991a2831c6736", + "type": "github" + }, + "original": { + "owner": "CHN-beta", + "repo": "hpcstat", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1708968331, @@ -1612,6 +1628,7 @@ "fluent-kde": "fluent-kde", "gricad": "gricad", "home-manager": "home-manager", + "hpcstat": "hpcstat", "impermanence": "impermanence", "kylin-virtual-keyboard": "kylin-virtual-keyboard", "lepton": "lepton", @@ -1641,6 +1658,7 @@ "nur": "nur", "nur-linyinfeng": "nur-linyinfeng", "nur-xddxdd": "nur-xddxdd", + "openxlsx": "openxlsx", "plasma-manager": "plasma-manager", "pnpm2nix-nzbr": "pnpm2nix-nzbr", "qchem": "qchem", @@ -1651,15 +1669,16 @@ "tgbot-cpp": "tgbot-cpp", "v-sim": "v-sim", "win11os-kde": "win11os-kde", + "xmuhpc-dotfiles": "xmuhpc-dotfiles", "zpp-bits": "zpp-bits", "zxorm": "zxorm" }, "locked": { - "lastModified": 1714468512, - "narHash": "sha256-7UOlepLVQXlPEqSiTmpDbYgSsgaaXtzhrXMwxv44r4o=", + "lastModified": 1714877025, + "narHash": "sha256-nWFkYfaTZUzWscxpG7T6QFi4u6bdAbpJOA2KfAtdD+s=", "owner": "CHN-beta", "repo": "nixos", - "rev": "405dc14ce7c3bc04eaafae9b4d0e1cc4102c317b", + "rev": "1fe31395f686e440dfa48c9e5e2e55c7f0aac1eb", "type": "github" }, "original": { @@ -2083,6 +2102,22 @@ "type": "github" } }, + "openxlsx": { + "flake": false, + "locked": { + "lastModified": 1656848604, + "narHash": "sha256-Bdik5tY6DsNKMMXvfVOHngLHud3OJ8q9OTwv4eaDMvY=", + "owner": "troldal", + "repo": "OpenXLSX", + "rev": "b80da42d1454f361c29117095ebe1989437db390", + "type": "github" + }, + "original": { + "owner": "troldal", + "repo": "OpenXLSX", + "type": "github" + } + }, "org": { "flake": false, "locked": { @@ -2824,6 +2859,22 @@ "type": "github" } }, + "xmuhpc-dotfiles": { + "flake": false, + "locked": { + "lastModified": 1714814038, + "narHash": "sha256-jiCdHJ4Sv3NnvW7jf1jLRMD0r4wnmc7LsTAFYszTEeo=", + "ref": "refs/heads/main", + "rev": "cf24e4352810bd39896e6d4038dd8193539f9862", + "revCount": 8, + "type": "git", + "url": "https://git.chn.moe/chn/xmuhpc-dotfiles.git" + }, + "original": { + "type": "git", + "url": "https://git.chn.moe/chn/xmuhpc-dotfiles.git" + } + }, "yafas": { "inputs": { "flake-schemas": [ @@ -2869,15 +2920,15 @@ "zxorm": { "flake": false, "locked": { - "lastModified": 1689774784, - "narHash": "sha256-QO0jrZqYcYxIdL1EWnEjaODr+q9inlbBgKaDSlu+ot0=", - "owner": "crabmandable", + "lastModified": 1714876963, + "narHash": "sha256-PYUs76SpsbCUHSV8n1+u10U4aEpA0u3L+IEXkRKzMXM=", + "owner": "CHN-beta", "repo": "zxorm", - "rev": "92cd52ec0530fb3e66061058548916fb879879e7", + "rev": "c72543439eac41dae7aa44065fee657cad336bab", "type": "github" }, "original": { - "owner": "crabmandable", + "owner": "CHN-beta", "repo": "zxorm", "type": "github" } diff --git a/src/sql.cpp b/src/sql.cpp index 7929d82..e8af0e7 100644 --- a/src/sql.cpp +++ b/src/sql.cpp @@ -74,7 +74,7 @@ namespace hpcstat::sql if (*old_data_it != *new_data_it) { std::cerr << fmt::format - ("Data mismatch: {} {} != {}.\n", nameof::nameof_type(), (*old_data_it).Id, (*new_data_it).Id); + ("Data mismatch: {} {} != {}.\n", nameof::nameof_type(), old_data_it->Id, new_data_it->Id); return std::nullopt; } if (old_data_it != old_query.end() && new_data_it == new_query.end()) @@ -90,7 +90,7 @@ namespace hpcstat::sql auto data = *old_data_it; data.Signature = ""; data.Id = 0; - diff.push_back({ serialize(data), (*old_data_it).Signature, (*old_data_it).Key }); + diff.push_back({ serialize(data), old_data_it->Signature, old_data_it->Key }); } return diff; }