From 43ff982ce9c0f535ff0296bb6995261d4afe91d8 Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 18 Jun 2024 22:43:12 +0800 Subject: [PATCH 1/2] Fix nsis esitmated size unit --- tooling/bundler/src/bundle/windows/nsis.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tooling/bundler/src/bundle/windows/nsis.rs b/tooling/bundler/src/bundle/windows/nsis.rs index e3480d6f7383..4c2de1010cbe 100644 --- a/tooling/bundler/src/bundle/windows/nsis.rs +++ b/tooling/bundler/src/bundle/windows/nsis.rs @@ -645,21 +645,20 @@ fn generate_binaries_data(settings: &Settings) -> crate::Result { } fn generate_estimated_size( - main: &Path, + main: &PathBuf, binaries: &BinariesMap, resources: &ResourcesMap, ) -> crate::Result { - use std::fs::metadata; - - let mut size = metadata(main)?.len(); - - for k in binaries.keys().chain(resources.keys()) { - size += metadata(k)?.len(); + let mut size = 0; + for k in std::iter::once(main) + .chain(binaries.keys()) + .chain(resources.keys()) + { + size += std::fs::metadata(k) + .with_context(|| format!("when getting size of {}", main.display()))? + .len(); } - - size /= 1000; - - Ok(format!("{size:#08x}")) + Ok(format!("{:#08x}", size / 1024)) } fn get_lang_data( From 8ad5fc4f0bda8d3f8fbcdb3c74ecc673dbff6893 Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 18 Jun 2024 22:48:27 +0800 Subject: [PATCH 2/2] Add change file --- .changes/nsis-esitimated-size-unit.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changes/nsis-esitimated-size-unit.md diff --git a/.changes/nsis-esitimated-size-unit.md b/.changes/nsis-esitimated-size-unit.md new file mode 100644 index 000000000000..411bed04857d --- /dev/null +++ b/.changes/nsis-esitimated-size-unit.md @@ -0,0 +1,5 @@ +--- +"tauri-bundler": "patch:bug" +--- + +Fix NSIS esitmated size unit being in kB (1000 bytes) not KB (1024 bytes)