warren/MCModpackManager
1
0
Fork 0
mirror of https://github.com/WarrenHood/MCModpackManager.git synced 2025-04-30 00:04:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added pinned file cache to speed up checking for existing files

Browse source
This commit is contained in:
Warren Hood 2024-08-20 01:32:32 +02:00
parent 257d24e2e7
commit 08eff7ea2a
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/resolver.rs
View file

@ -3,7 +3,7 @@ use sha2::{Digest, Sha512};
use std::{ use std::{
collections::{HashMap, HashSet}, collections::{HashMap, HashSet},
error::Error, error::Error,
ffi::OsStr, ffi::{OsStr, OsString},
path::PathBuf, path::PathBuf,
}; };
@ -37,11 +37,12 @@ impl PinnedPackMeta {
download_side: DownloadSide, download_side: DownloadSide,
) -> Result<(), Box<dyn Error>> { ) -> Result<(), Box<dyn Error>> {
let files = std::fs::read_dir(mods_dir)?; let files = std::fs::read_dir(mods_dir)?;
let mut pinned_files_cache = HashSet::new();
for file in files.into_iter() { for file in files.into_iter() {
let file = file?; let file = file?;
if file.file_type()?.is_file() { if file.file_type()?.is_file() {
let filename = file.file_name(); let filename = file.file_name();
if !self.file_is_pinned(&filename, download_side) { if !self.file_is_pinned(&filename, download_side, &mut pinned_files_cache) {
println!( println!(
"Deleting file {:#?} as it is not in the pinned mods", "Deleting file {:#?} as it is not in the pinned mods",
filename filename
@ -101,7 +102,10 @@ impl PinnedPackMeta {
Ok(()) Ok(())
} }
pub fn file_is_pinned(&self, file_name: &OsStr, mod_side: DownloadSide) -> bool { pub fn file_is_pinned(&self, file_name: &OsStr, mod_side: DownloadSide, cache: &mut HashSet<OsString>) -> bool {
if cache.contains(file_name) {
return true;
}
for (_, pinned_mod) in self.mods.iter().filter(|m| { for (_, pinned_mod) in self.mods.iter().filter(|m| {
mod_side == DownloadSide::Both mod_side == DownloadSide::Both
|| mod_side == DownloadSide::Client && m.1.client_side || mod_side == DownloadSide::Client && m.1.client_side
@ -115,7 +119,9 @@ impl PinnedPackMeta {
sha512, sha512,
filename, filename,
} => { } => {
if OsStr::new(filename) == file_name { let pinned_filename = OsStr::new(filename);
cache.insert(pinned_filename.into());
if pinned_filename == file_name {
return true; return true;
} }
} }
@ -125,7 +131,9 @@ impl PinnedPackMeta {
sha512, sha512,
filename, filename,
} => { } => {
if OsStr::new(filename) == file_name { let pinned_filename = OsStr::new(filename);
cache.insert(pinned_filename.into());
if pinned_filename == file_name {
return true; return true;
} }
} }