bitsquid_dt/dtmt
bitsquid_dt/dtmt
2
Fork 0
Code Issues 34 Pull requests 11 Projects 1 Releases 3 Packages 1 Wiki Activity
Var Dump: 
dumpVar: only available in dev mode
Mailing List

Merge pull request 'Fix deployment deleting too many bundles' (#102) from issue/101 into master

Browse source 
Reviewed-on: #102
This commit is contained in:
Lucas Schwiderski 2023-04-05 16:28:15 +02:00
commit c08b3e4903
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/dtmm/src/controller/game.rs
View file

@ -242,9 +242,7 @@ async fn build_bundles(state: Arc<ActionState>) -> Result<Vec<Bundle>> {
mod_bundle.add_file(file); mod_bundle.add_file(file);
let bundle_name = Murmur64::hash(&pkg_info.name) let bundle_name = format!("{:016x}", Murmur64::hash(&pkg_info.name));
.to_string()
.to_ascii_lowercase();
let src = mod_dir.join(&bundle_name); let src = mod_dir.join(&bundle_name);
let dest = bundle_dir.join(&bundle_name); let dest = bundle_dir.join(&bundle_name);
let pkg_name = pkg_info.name.clone(); let pkg_name = pkg_info.name.clone();
@ -377,9 +375,7 @@ async fn patch_boot_bundle(state: Arc<ActionState>) -> Result<Vec<Bundle>> {
.get(0) .get(0)
.ok_or_else(|| eyre::eyre!("invalid mod package for DML")) .ok_or_else(|| eyre::eyre!("invalid mod package for DML"))
.with_suggestion(|| "Re-download and import the newest version.".to_string())?; .with_suggestion(|| "Re-download and import the newest version.".to_string())?;
let bundle_name = Murmur64::hash(&pkg_info.name) let bundle_name = format!("{:016x}", Murmur64::hash(&pkg_info.name));
.to_string()
.to_ascii_lowercase();
let src = state.mod_dir.join(&mod_info.id).join(&bundle_name); let src = state.mod_dir.join(&mod_info.id).join(&bundle_name);
{ {
@ -639,7 +635,7 @@ pub(crate) async fn deploy_mods(state: ActionState) -> Result<()> {
let bundle_dir = Arc::new(bundle_dir); let bundle_dir = Arc::new(bundle_dir);
let tasks = info.bundles.iter().cloned().filter_map(|file_name| { let tasks = info.bundles.iter().cloned().filter_map(|file_name| {
let contains = bundles.iter().any(|b2| { let contains = bundles.iter().any(|b2| {
let name = b2.name().to_murmur64().to_string(); let name = format!("{:016x}", b2.name());
file_name == name file_name == name
}); });