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

Use version number from Nexus import
All checks were successful
lint/clippy Checking for common mistakes and opportunities for code improvement
build/msvc Build for the target platform: msvc
build/linux Build for the target platform: linux

Browse source 
Non-bundled mods come without a `dtmt.cfg`, and therefore without a
version number. But we need a version number at import to compare to
for the Nexus update check.
This commit is contained in:
Lucas Schwiderski 2023-11-14 16:19:07 +01:00
parent dcf7faf45d
commit 5ac66779c2
Signed by: lucas
GPG key ID: AA12679AAA6DF4D8
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/dtmm/src/controller/import.rs
View file

@ -372,7 +372,7 @@ pub(crate) async fn import_mod(state: ActionState, info: FileInfo) -> Result<Mod
.wrap_err_with(|| format!("Failed to read file {}", info.path.display()))?; .wrap_err_with(|| format!("Failed to read file {}", info.path.display()))?;
let data = Cursor::new(data); let data = Cursor::new(data);
let nexus = if let Some((_, id, _, _)) = info let nexus = if let Some((_, id, version, _)) = info
.path .path
.file_name() .file_name()
.and_then(|s| s.to_str()) .and_then(|s| s.to_str())
@ -387,7 +387,7 @@ pub(crate) async fn import_mod(state: ActionState, info: FileInfo) -> Result<Mod
let info = NexusInfo::from(mod_info); let info = NexusInfo::from(mod_info);
tracing::debug!("{:?}", info); tracing::debug!("{:?}", info);
Some(info) Some((info, version))
} else { } else {
None None
} }
@ -406,7 +406,7 @@ pub(crate) async fn import_mod(state: ActionState, info: FileInfo) -> Result<Mod
tracing::debug!("Archive contents:{}", names); tracing::debug!("Archive contents:{}", names);
} }
let (mod_cfg, root) = let (mut mod_cfg, root) =
extract_mod_config(&mut archive).wrap_err("Failed to extract mod configuration")?; extract_mod_config(&mut archive).wrap_err("Failed to extract mod configuration")?;
tracing::info!("Importing mod {} ({})", mod_cfg.name, mod_cfg.id); tracing::info!("Importing mod {} ({})", mod_cfg.name, mod_cfg.id);
tracing::debug!(root, ?mod_cfg); tracing::debug!(root, ?mod_cfg);
@ -457,6 +457,13 @@ pub(crate) async fn import_mod(state: ActionState, info: FileInfo) -> Result<Mod
} else { } else {
extract_legacy_mod(&mut archive, root, &dest).wrap_err("Failed to extract legacy mod")?; extract_legacy_mod(&mut archive, root, &dest).wrap_err("Failed to extract legacy mod")?;
if let Some((_, version)) = &nexus {
// We use the version number stored in the `ModInfo` to compare against the `NexusInfo`
// for version checks. So for this one, we can't actually rely on merely shadowing,
// like with the other fields.
mod_cfg.version = version.clone();
}
let data = serde_sjson::to_string(&mod_cfg).wrap_err("Failed to serialize mod config")?; let data = serde_sjson::to_string(&mod_cfg).wrap_err("Failed to serialize mod config")?;
fs::write(dest.join("dtmt.cfg"), &data) fs::write(dest.join("dtmt.cfg"), &data)
.await .await
@ -465,7 +472,7 @@ pub(crate) async fn import_mod(state: ActionState, info: FileInfo) -> Result<Mod
Default::default() Default::default()
}; };
if let Some(nexus) = &nexus { if let Some((nexus, _)) = &nexus {
let data = serde_sjson::to_string(nexus).wrap_err("Failed to serialize Nexus info")?; let data = serde_sjson::to_string(nexus).wrap_err("Failed to serialize Nexus info")?;
let path = dest.join("nexus.sjson"); let path = dest.join("nexus.sjson");
fs::write(&path, data.as_bytes()) fs::write(&path, data.as_bytes())
@ -473,6 +480,6 @@ pub(crate) async fn import_mod(state: ActionState, info: FileInfo) -> Result<Mod
.wrap_err_with(|| format!("Failed to write Nexus info to '{}'", path.display()))?; .wrap_err_with(|| format!("Failed to write Nexus info to '{}'", path.display()))?;
} }
let info = ModInfo::new(mod_cfg, packages, image, nexus); let info = ModInfo::new(mod_cfg, packages, image, nexus.map(|(info, _)| info));
Ok(info) Ok(info)
} }

2
lib/nexusmods/src/lib.rs
View file

@ -112,7 +112,7 @@ impl Api {
RE.captures(name.as_ref()).and_then(|cap| { RE.captures(name.as_ref()).and_then(|cap| {
let name = cap.name("name").map(|s| s.as_str().to_string())?; let name = cap.name("name").map(|s| s.as_str().to_string())?;
let mod_id = cap.name("mod_id").and_then(|s| s.as_str().parse().ok())?; let mod_id = cap.name("mod_id").and_then(|s| s.as_str().parse().ok())?;
let version = cap.name("version").map(|s| s.as_str().to_string())?; let version = cap.name("version").map(|s| s.as_str().replace('-', "."))?;
let updated = cap let updated = cap
.name("updated") .name("updated")
.and_then(|s| s.as_str().parse().ok()) .and_then(|s| s.as_str().parse().ok())