Cleanup

Author: Raytwo

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "arcropolis"
-version = "4.0.6"
+version = "4.0.7"
 authors = ["Raytwo <raytwo@arcropolis.com>, blujay <the.blu.dev@gmail.com>, jam1garner <jam@jam1.re>, CoolSonicKirby <alihussain2001@gmail.com>"]
 edition = "2018"
 
@@ -38,7 +38,7 @@ owo-colors = "3.5.0"
 strip-ansi-escapes = "0.1.1"
 bincode = "1.3.3"
 # To manage mods
-orbits = { git = "https://github.com/blu-dev/orbits" }
+orbits = { git = "https://github.com/Raytwo/orbits" }
 smash-arc = { git = "https://github.com/jam1garner/smash-arc", features = ["smash-runtime", "rust-zstd", "serialize"] }
 hash40 = "1.3"
 arcropolis-api = { git = "https://github.com/Raytwo/arcropolis_api" }

src/fs.rs

@@ -7,7 +7,6 @@ use camino::Utf8Path;
 use orbits::{ConflictHandler, ConflictKind, FileLoader, LaunchPad, StandardLoader, Tree};
 use skyline::nn::{self, ro::*};
 use smash_arc::Hash40;
-
 use crate::{chainloader::*, utils};
 
 pub fn perform_discovery() -> LaunchPad<StandardLoader> {

src/fs/discover.rs

@@ -11,87 +11,73 @@ use smash_arc::Hash40;
 use super::{ApiCallback, ApiLoader};
 use crate::{hashes, PathExtension};
 
-pub fn make_hash_maps<L: FileLoader>(tree: &Tree<L>) -> (HashMap<Hash40, usize>, HashMap<Hash40, PathBuf>)
+/// Single tree walk that builds hash maps (size + path) and collects nus3bank dependencies.
+///
+/// Regional variant priority: if a regional file (containing '+') is found, it takes priority
+/// over the non-regional variant. See original comment by blujay for details.
+pub fn make_hash_maps_and_nus3bank_deps<L: FileLoader>(
+    tree: &Tree<L>,
+    unshare_blacklist: &[hash40::Hash40],
+) -> (HashMap<Hash40, usize>, HashMap<Hash40, PathBuf>, HashSet<PathBuf>)
 where
     <L as FileLoader>::ErrorType: Debug,
 {
-    // This defines the previously undefined behavior of what happens when you have two files that overlap each other due to
-    // regional things
-    // I.E.: ui/message/msg_menu.msbt and ui/message/msg_menu+us_en.msbt
-    // The regional variant should take priority. Since there can only be one regional file, there are only two situations which need to be handled:
-    // 1.) ui/message/msg_menu.msbt is found and then ui/message/msg_menu+us_en.msbt is found. ui/message/msg_menu+us_en.msbt should overwrite the previous file
-    // 2.) ui/message/msg_menu+us_en.msbt is found first, and when ui/message/msg_menu.msbt is found it should be discarded
-    // To solve this I store the hash of every file which has a regional variant which has been found, and then if a non-regional variant is found
-    // it is ignored
-    // - blujay
     let mut regional_overrides = HashSet::new();
     let mut size_map = HashMap::new();
     let mut path_map = HashMap::new();
+    let mut nus3audio_deps = HashSet::new();
+    let mut nus3banks_found = HashSet::new();
+
     tree.walk_paths(|node, ty| {
         if !ty.is_file() {
             return;
         }
 
-        if let Some(size) = tree.query_filesize(node.get_local()) {
-            match node.get_local().smash_hash() {
+        let local = node.get_local();
+
+        // Collect nus3bank dependency info for non-stream files
+        if !local.is_stream() {
+            if local.has_extension("nus3audio") {
+                if let Ok(hash) = local.smash_hash() {
+                    if !unshare_blacklist.contains(&hash.to_external()) {
+                        nus3audio_deps.insert(local.with_extension("nus3bank"));
+                    }
+                }
+            } else if local.has_extension("nus3bank") {
+                nus3banks_found.insert(local.to_path_buf());
+            }
+        }
+
+        // Use cached size from discovery (falls back to loader if not cached)
+        if let Some(size) = tree.query_filesize(local) {
+            match local.smash_hash() {
                 Ok(hash) => {
                     if regional_overrides.contains(&hash) {
                         return;
                     }
 
-                    let is_regional_variant = if let Some(node) = node.get_local().to_str() { node.contains('+') } else { false };
+                    let is_regional_variant = if let Some(node) = local.to_str() { node.contains('+') } else { false };
 
                     size_map.insert(hash, size);
-                    path_map.insert(hash, node.get_local().to_path_buf());
+                    path_map.insert(hash, local.to_path_buf());
 
                     if is_regional_variant {
                         regional_overrides.insert(hash);
                     }
                 },
-                Err(e) => error!("Failed to get hash for {}. Reason: {:?}", node.get_local().display(), e),
+                Err(e) => error!("Failed to get hash for {}. Reason: {:?}", local.display(), e),
             }
         } else {
             error!("Failed to stat file {}. This file may have issues.", node.full_path().display());
         }
     });
 
-    (size_map, path_map)
-}
-
-pub fn get_required_nus3banks<L: FileLoader>(tree: &Tree<L>, unshare_blacklist: &[hash40::Hash40]) -> HashSet<PathBuf>
-where
-    <L as FileLoader>::ErrorType: Debug,
-{
-    let mut nus3audio_deps = HashSet::new();
-    let mut nus3banks_found = HashSet::new();
-    tree.walk_paths(|node, ty| {
-        if !ty.is_file() {
-            return;
-        }
-
-        let local = node.get_local();
-        if local.is_stream() {
-            return;
-        }
-
-        if local.has_extension("nus3audio") {
-            match local.smash_hash() {
-                Ok(hash) if !unshare_blacklist.contains(&hash.to_external()) => {
-                    nus3audio_deps.insert(local.with_extension("nus3bank"));
-                },
-                Err(e) => error!("Failed to get hash for path {}. Reason: {:?}", local.display(), e),
-                _ => {},
-            }
-        } else if local.has_extension("nus3bank") {
-            nus3banks_found.insert(local.to_path_buf());
-        }
-    });
-
+    // Remove nus3bank deps that have actual nus3bank files present
     for bank in nus3banks_found.into_iter() {
         nus3audio_deps.remove(&bank);
     }
 
-    nus3audio_deps
+    (size_map, path_map, nus3audio_deps)
 }
 
 pub fn add_file_to_api_tree<P: AsRef<Path>, Q: AsRef<Path>>(

src/fs/utils.rs

@@ -46,6 +46,18 @@ pub fn add<S: AsRef<str>>(new_hash: S) {
     let _ = hashes.try_insert(Hash40::from(new_hash), string_to_static_str(new_hash.to_string()));
 }
 
+pub fn add_all<I, S>(items: I)
+where
+    I: IntoIterator<Item = S>,
+    S: AsRef<str>,
+{
+    let mut hashes = HASHES.write().unwrap();
+    for item in items {
+        let s = item.as_ref();
+        let _ = hashes.try_insert(Hash40::from(s), string_to_static_str(s.to_string()));
+    }
+}
+
 pub fn init() {
     LazyLock::force(&HASHES);
 }

src/hashes.rs

@@ -6,7 +6,7 @@ use arc_config::{
 };
 use smash_arc::*;
 
-use super::{lookup, AdditionContext, FromPathExt, FromSearchableFile, FromSearchableFolder, InterDir, SearchContext};
+use super::{lookup, AdditionContext, FromPathExt, FromSearchableFile, FromSearchableFolder, InterDir, SearchContext, NO_CHILD};
 use crate::{
     hashes,
     replacement::FileInfoFlagsExt,
@@ -43,7 +43,7 @@ pub fn add_file(ctx: &mut AdditionContext, path: &Path) {
 
     // Create a new FileInfoIndex with the created file_info_idx above and a dir offset index of
     let new_info_indice_idx = FileInfoIndex {
-        dir_offset_index: 0xFF_FFFF,
+        dir_offset_index: NO_CHILD,
         file_info_index: file_info_idx,
     };
 
@@ -99,7 +99,7 @@ pub fn add_file(ctx: &mut AdditionContext, path: &Path) {
     info!("Added file '{}' ({:#x})", path.display(), file_path.path.hash40().0);
 }
 
-pub fn add_shared_file(ctx: &mut AdditionContext, new_file: &File, shared_to: Hash40) {
+pub fn add_shared_file(ctx: &mut AdditionContext, new_file: &File, shared_to: Hash40, share_lut: &mut lookup::ShareLookup) {
     // Get the target shared FileInfoIndice index
     let info_indice_idx = if let Ok(info) = ctx.get_file_info_from_hash(shared_to) {
         info.file_info_indice_index.0
@@ -138,7 +138,7 @@ pub fn add_shared_file(ctx: &mut AdditionContext, new_file: &File, shared_to: Ha
     .hash40();
 
     // Add the shared file to the lookup
-    lookup::add_shared_file(
+    share_lut.add_shared_file(
         new_file.full_path.to_smash_arc(), // we can unwrap because of FilePath::from_path being successful
         shared_to.to_smash_arc(),
     );
@@ -149,7 +149,7 @@ pub fn add_searchable_folder_recursive(ctx: &mut SearchContext, path: &Path) {
         Some(parent) if parent == Path::new("") => {
             if let Some(mut new_folder_path) = FolderPathListEntry::from_path(path) {
                 let new_path = new_folder_path.as_path_entry();
-                new_folder_path.set_first_child_index(0xFF_FFFF);
+                new_folder_path.set_first_child_index(NO_CHILD);
                 ctx.new_folder_paths.insert(new_folder_path.path.hash40(), ctx.folder_paths.len());
                 ctx.new_paths.insert(new_path.path.hash40(), ctx.path_list_indices.len());
                 ctx.path_list_indices.push(ctx.paths.len() as u32);
@@ -192,7 +192,7 @@ pub fn add_searchable_folder_recursive(ctx: &mut SearchContext, path: &Path) {
 
     if let Some(mut new_folder) = FolderPathListEntry::from_path(path) {
         // Create a new directory that does not have child directories
-        new_folder.set_first_child_index(0xFF_FFFF);
+        new_folder.set_first_child_index(NO_CHILD);
         // Create a new search path
         let mut new_path = new_folder.as_path_entry();
         // Set the previous head of the linked list as the child of the new path
@@ -242,7 +242,7 @@ fn add_searchable_folder_by_folder(ctx: &mut SearchContext, folder: &Folder) ->
 
     let mut new_folder = FolderPathListEntry::from_folder(folder);
     // Create a new directory that does not have child directories
-    new_folder.set_first_child_index(0xFF_FFFF);
+    new_folder.set_first_child_index(NO_CHILD);
     // Create a new search path
     let mut new_path = new_folder.as_path_entry();
     // Set the previous head of the linked list as the child of the new path
@@ -599,15 +599,17 @@ pub fn add_dir_info(ctx: &mut AdditionContext, path: &Path) {
         size: 0,
         file_start_index: dir_info.file_info_start_index,
         file_count: dir_info.file_count,
-        directory_index: 0xFF_FFFF,
+        directory_index: NO_CHILD,
     };
 
     dir_info.path.set_index(ctx.folder_offsets_vec.len() as u32);
     // --------------------- END FOLDER OFFSETS --------------------- //
 
     // --------------------- PUSH TO CONTEXT DONE HERE --------------------- //
+    let dir_hash = dir_hash_to_info_idx.hash40();
     ctx.dir_infos_vec.push(dir_info);
     ctx.dir_hash_to_info_idx.push(dir_hash_to_info_idx);
+    ctx.cache_dir_info(dir_hash);
     ctx.folder_offsets_vec.push(new_dir_offset);
     ctx.loaded_directories.push(LoadedDirectory::default());
     // --------------------- END PUSH TO CONTEXT --------------------- //