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

fix(dtmm): Copy mod bundle

Browse source 
Hard linking doesn't work across devices/mount points, and I'm not keen
on reworking the data directory to be placed accordingly, right now.
This commit is contained in:
Lucas Schwiderski 2023-02-22 19:02:59 +01:00
parent f1375ae88d
commit 0c071b5b0a
Signed by: lucas
GPG key ID: AA12679AAA6DF4D8
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/dtmm/src/engine.rs
View file

@ -253,7 +253,7 @@ async fn build_bundles(state: Arc<State>) -> Result<()> {
.to_string()
.to_ascii_lowercase();
let src = mod_dir.join(&bundle_name);
let dest = bundle_dir.clone();
let dest = bundle_dir.join(&bundle_name);
let pkg_name = pkg_info.get_name().clone();
let mod_name = mod_info.get_name().clone();
@ -276,14 +276,18 @@ async fn build_bundles(state: Arc<State>) -> Result<()> {
dest.display()
);
// We attempt to remove any previous file, so that the hard link can be created.
// We can reasonably ignore errors here, as a 'NotFound' is actually fine, the link
// may be possible anyways, or the error will be reported by it anyways.
// We can reasonably ignore errors here, as a 'NotFound' is actually fine, the copy
// may be possible despite an error here, or the error will be reported by it anyways.
// TODO: There is a chance that we delete an actual game bundle, but with 64bit
// hashes, it's low enough for now, and the set up required to detect
// hashes, it's low enough for now, and the setup required to detect
// "game bundle vs mod bundle" is non-trivial.
let _ = fs::remove_file(dest.as_ref()).await;
fs::hard_link(&src, dest.as_ref()).await.wrap_err_with(|| {
format!("failed to hard link bundle {pkg_name} for mod {mod_name}. src: {}, dest: {}", src.display(), dest.display())
let _ = fs::remove_file(&dest).await;
fs::copy(&src, &dest).await.wrap_err_with(|| {
format!(
"failed to copy bundle {pkg_name} for mod {mod_name}. src: {}, dest: {}",
src.display(),
dest.display()
)
})
}
.instrument(span);