cache: Separate caches by platform

v4nguard · Jul 22, 2024 · e56dbcb · e56dbcb
1 parent 9fbfefe
commit e56dbcb
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,7 +39,7 @@ rayon = "1.8.0"
 base64 = "0.22.0"
 bincode = "2.0.0-rc.3"
 binrw = "0.13.3"
-destiny-pkg = { version = "0.11", features = ["bincode"] }
+destiny-pkg = { version = "0.12", features = ["bincode"] }
 serde = { version = "1.0.188", features = ["derive"] }
 serde_json = "1.0.108"
 vgmstream = { git = "https://github.com/cohaereo/vgmstream-rs/", version = "0.1.3" }

diff --git a/src/gui/mod.rs b/src/gui/mod.rs
@@ -93,7 +93,7 @@ pub struct QuickTagApp {
 
 impl QuickTagApp {
     /// Called once before the first frame.
-    pub fn new(cc: &eframe::CreationContext<'_>, version: GameVersion) -> Self {
+    pub fn new(cc: &eframe::CreationContext<'_>) -> Self {
         let mut fonts = egui::FontDefinitions::default();
         fonts.font_data.insert(
             "Destiny_Keys".into(),
@@ -115,7 +115,7 @@ impl QuickTagApp {
             scanner_context: scanner::create_scanner_context(&package_manager())
                 .expect("Failed to create scanner context"),
             cache_load: Some(Promise::spawn_thread("load_cache", move || {
-                load_tag_cache(version)
+                load_tag_cache()
             })),
             tag_history: Rc::new(RefCell::new(TagHistory::default())),
             cache: Default::default(),

diff --git a/src/gui/tag.rs b/src/gui/tag.rs
@@ -652,7 +652,7 @@ impl TagView {
                         .package_paths
                         .get(&tag.pkg_id())
                         .map(|p| {
-                            p.name
+                            p.filename
                                 .to_lowercase()
                                 .contains(&self.search_package_name_filter.to_lowercase())
                         })

diff --git a/src/gui/texture.rs b/src/gui/texture.rs
@@ -294,7 +294,7 @@ impl Texture {
         if package_manager().version.is_d1()
             && !matches!(
                 package_manager().platform,
-                PackagePlatform::PS4 | PackagePlatform::XOne
+                PackagePlatform::PS4 | PackagePlatform::XboxOne
             )
         {
             anyhow::bail!("Textures are not supported for D1");
@@ -313,7 +313,7 @@ impl Texture {
                         premultiply_alpha: false,
                     })
                 }
-                PackagePlatform::XOne => {
+                PackagePlatform::XboxOne => {
                     let texture: TextureHeaderRoiXbox = package_manager().read_tag_binrw(hash)?;
                     Ok(TextureDesc {
                         format: texture.format.to_wgpu()?,
@@ -364,7 +364,7 @@ impl Texture {
         if package_manager().version.is_d1()
             && !matches!(
                 package_manager().platform,
-                PackagePlatform::PS4 | PackagePlatform::XOne
+                PackagePlatform::PS4 | PackagePlatform::XboxOne
             )
         {
             anyhow::bail!("Textures are not supported for D1");
@@ -389,7 +389,7 @@ impl Texture {
                         Some(comment),
                     )
                 }
-                PackagePlatform::XOne => {
+                PackagePlatform::XboxOne => {
                     anyhow::bail!("Xbox One textures are not supported yet");
                     let (texture, texture_data, comment) = Self::load_data_roi_xone(hash, true)?;
                     Self::create_texture(

diff --git a/src/main.rs b/src/main.rs
@@ -66,6 +66,7 @@ fn main() -> eframe::Result<()> {
     let pm = PackageManager::new(
         packages_path,
         args.version.unwrap_or(GameVersion::Destiny2TheFinalShape),
+        None
     )
     .unwrap();
 
@@ -98,7 +99,7 @@ fn main() -> eframe::Result<()> {
     eframe::run_native(
         "Quicktag",
         native_options,
-        Box::new(|cc| Ok(Box::new(QuickTagApp::new(cc, package_manager().version)))),
+        Box::new(|cc| Ok(Box::new(QuickTagApp::new(cc)))),
     )
 }
 

diff --git a/src/scanner.rs b/src/scanner.rs
@@ -292,8 +292,8 @@ pub fn scanner_progress() -> ScanStatus {
     *SCANNER_PROGRESS.read()
 }
 
-pub fn load_tag_cache(version: GameVersion) -> TagCache {
-    let cache_name = format!("tags_{}.cache", version.id());
+pub fn load_tag_cache() -> TagCache {
+    let cache_name = format!("tags_{}.cache", package_manager().cache_key());
     let cache_file_path = exe_relative_path(&cache_name);
 
     if let Ok(cache_file) = File::open(&cache_file_path) {
@@ -388,6 +388,7 @@ pub fn load_tag_cache(version: GameVersion) -> TagCache {
         .cloned()
         .collect_vec();
 
+    let version = package_manager().version;
     let package_count = all_pkgs.len();
     let cache: FxHashMap<TagHash, ScanResult> = all_pkgs
         .par_iter()