Use ModIdentifier newtype for gameplay affecting status cache key

Author: jieyouxu

Cargo.lock

@@ -79,7 +79,6 @@ uasset_utils = { git = "https://github.com/trumank/uasset_utils" }
 unreal_asset = { git = "https://github.com/trumank/unrealmodding", branch = "patches" }
 url = "2.5.0"
 zip = { version = "0.6.6", default-features = false, features = ["aes-crypto", "deflate", "time"] }
-serde_json_any_key = "2.0.0"
 repak = { workspace = true, features = ["oodle", "oodle_loader"] }
 
 [target.'cfg(target_env = "msvc")'.dependencies]

Cargo.toml

@@ -103,6 +103,16 @@ impl ModResolution {
     }
 }
 
+/// Mod identifier used for tracking gameplay affecting status.
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct ModIdentifier(String);
+
+impl ModIdentifier {
+    pub fn new(s: &str) -> Self {
+        Self(s.to_string())
+    }
+}
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum GameplayAffecting {
     /// Sandbox, approved and unknown mods

mint_lib/src/mod_info.rs

@@ -24,6 +24,8 @@ use crate::{
     state::ModConfig,
 };
 
+use mint_lib::mod_info::ModIdentifier;
+
 use super::SelfUpdateProgress;
 use super::{
     request_counter::{RequestCounter, RequestID},
@@ -218,7 +220,7 @@ impl Integrate {
                     for (res, stat) in resolution_gameplay_affecting_map {
                         app.state
                             .store
-                            .update_gameplay_affecting_status(&res, *stat);
+                            .update_gameplay_affecting_status(ModIdentifier::new(&res.url), *stat);
                     }
 
                     info!("integration complete");

src/gui/message.rs

@@ -560,7 +560,7 @@ impl App {
                     }
 
                     ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                        if let Some(status) = self.state.store.get_gameplay_affecting_status(&info.resolution) {
+                        if let Some(status) = self.state.store.get_gameplay_affecting_status(&ModIdentifier::new(&info.resolution.url)) {
                             match status {
                                 GameplayAffecting::Yes => {
                                     mk_searchable_tag(

src/gui/mod.rs

@@ -8,7 +8,6 @@ use crate::write_file;
 
 use anyhow::{Context, Result};
 use serde::{Deserialize, Serialize};
-use serde_json_any_key::*;
 use tokio::sync::mpsc::Sender;
 use tracing::{debug, info};
 
@@ -32,8 +31,7 @@ pub struct Cache {
     #[obake(cfg(">=0.0.0"))]
     cache: HashMap<String, Box<dyn ModProviderCache>>,
     #[obake(cfg(">=0.1.0"))]
-    #[serde(with = "any_key_map")]
-    gameplay_affecting_cache: HashMap<ModResolution, GameplayAffecting>,
+    gameplay_affecting_cache: HashMap<ModIdentifier, GameplayAffecting>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -315,20 +313,20 @@ impl ModStore {
             .get_version_name(spec, self.cache.clone())
     }
 
-    pub fn update_gameplay_affecting_status(&self, res: &ModResolution, stat: GameplayAffecting) {
+    pub fn update_gameplay_affecting_status(&self, id: ModIdentifier, stat: GameplayAffecting) {
         self.cache
             .write()
             .unwrap()
             .gameplay_affecting_cache
-            .insert(res.clone(), stat);
+            .insert(id, stat);
     }
 
-    pub fn get_gameplay_affecting_status(&self, res: &ModResolution) -> Option<GameplayAffecting> {
+    pub fn get_gameplay_affecting_status(&self, id: &ModIdentifier) -> Option<GameplayAffecting> {
         self.cache
             .read()
             .unwrap()
             .gameplay_affecting_cache
-            .get(res)
+            .get(id)
             .copied()
     }
 }