refactor(bundler): remove unused fs utils, add http utils (#11716)

Author: FabianLars

Cargo.lock

@@ -4,12 +4,10 @@
 // SPDX-License-Identifier: MIT
 
 mod category;
-mod common;
 #[cfg(target_os = "linux")]
 mod linux;
 #[cfg(target_os = "macos")]
 mod macos;
-mod path_utils;
 mod platform;
 mod settings;
 mod updater_bundle;

crates/tauri-bundler/src/bundle.rs

@@ -3,14 +3,12 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use super::{
-  super::{
-    common::{self, CommandExt},
-    path_utils,
-  },
-  debian,
+use super::debian;
+use crate::{
+  bundle::settings::Arch,
+  utils::{fs_utils, CommandExt},
+  Settings,
 };
-use crate::{bundle::settings::Arch, Settings};
 use anyhow::Context;
 use handlebars::Handlebars;
 use std::{
@@ -56,7 +54,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
   // generate deb_folder structure
   let (data_dir, icons) = debian::generate_data(&settings, &package_dir)
     .with_context(|| "Failed to build data folders and files")?;
-  common::copy_custom_files(&settings.appimage().files, &data_dir)
+  fs_utils::copy_custom_files(&settings.appimage().files, &data_dir)
     .with_context(|| "Failed to copy custom files")?;
 
   let output_path = settings.project_out_directory().join("bundle/appimage");
@@ -72,7 +70,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
     arch
   );
   let appimage_path = output_path.join(&appimage_filename);
-  path_utils::create(app_dir_path, true)?;
+  fs_utils::create_dir(&app_dir_path, true)?;
 
   // setup data to insert into shell script
   let mut sh_map = BTreeMap::new();

crates/tauri-bundler/src/bundle/linux/appimage/mod.rs

@@ -23,8 +23,8 @@
 // metadata, as well as generating the md5sums file.  Currently we do not
 // generate postinst or prerm files.
 
-use super::{super::common, freedesktop};
-use crate::{bundle::settings::Arch, Settings};
+use super::freedesktop;
+use crate::{bundle::settings::Arch, utils::fs_utils, Settings};
 use anyhow::Context;
 use flate2::{write::GzEncoder, Compression};
 use tar::HeaderMode;
@@ -73,7 +73,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
 
   let (data_dir, _) = generate_data(settings, &package_dir)
     .with_context(|| "Failed to build data folders and files")?;
-  common::copy_custom_files(&settings.deb().files, &data_dir)
+  fs_utils::copy_custom_files(&settings.deb().files, &data_dir)
     .with_context(|| "Failed to copy custom files")?;
 
   // Generate control files.
@@ -113,7 +113,7 @@ pub fn generate_data(
 
   for bin in settings.binaries() {
     let bin_path = settings.binary_path(bin);
-    common::copy_file(&bin_path, bin_dir.join(bin.name()))
+    fs_utils::copy_file(&bin_path, &bin_dir.join(bin.name()))
       .with_context(|| format!("Failed to copy binary from {bin_path:?}"))?;
   }
 
@@ -141,7 +141,7 @@ fn generate_changelog_file(settings: &Settings, data_dir: &Path) -> crate::Resul
     let product_name = settings.product_name();
     let dest_path = data_dir.join(format!("usr/share/doc/{product_name}/changelog.gz"));
 
-    let changelog_file = common::create_file(&dest_path)?;
+    let changelog_file = fs_utils::create_file(&dest_path)?;
     let mut gzip_encoder = GzEncoder::new(changelog_file, Compression::new(9));
     io::copy(&mut src_file, &mut gzip_encoder)?;
 
@@ -161,7 +161,7 @@ fn generate_control_file(
   // For more information about the format of this file, see
   // https://www.debian.org/doc/debian-policy/ch-controlfields.html
   let dest_path = control_dir.join("control");
-  let mut file = common::create_file(&dest_path)?;
+  let mut file = fs_utils::create_file(&dest_path)?;
   let package = heck::AsKebabCase(settings.product_name());
   writeln!(file, "Package: {}", package)?;
   writeln!(file, "Version: {}", settings.version_string())?;
@@ -294,7 +294,7 @@ fn create_script_file_from_path(from: &PathBuf, to: &PathBuf) -> crate::Result<(
 /// for each file within the `data_dir`.
 fn generate_md5sums(control_dir: &Path, data_dir: &Path) -> crate::Result<()> {
   let md5sums_path = control_dir.join("md5sums");
-  let mut md5sums_file = common::create_file(&md5sums_path)?;
+  let mut md5sums_file = fs_utils::create_file(&md5sums_path)?;
   for entry in WalkDir::new(data_dir) {
     let entry = entry?;
     let path = entry.path();
@@ -327,7 +327,7 @@ fn copy_resource_files(settings: &Settings, data_dir: &Path) -> crate::Result<()
 /// Create an empty file at the given path, creating any parent directories as
 /// needed, then write `data` into the file.
 fn create_file_with_data<P: AsRef<Path>>(path: P, data: &str) -> crate::Result<()> {
-  let mut file = common::create_file(path.as_ref())?;
+  let mut file = fs_utils::create_file(path.as_ref())?;
   file.write_all(data.as_bytes())?;
   file.flush()?;
   Ok(())
@@ -376,7 +376,7 @@ fn create_tar_from_dir<P: AsRef<Path>, W: Write>(src_dir: P, dest_file: W) -> cr
 fn tar_and_gzip_dir<P: AsRef<Path>>(src_dir: P) -> crate::Result<PathBuf> {
   let src_dir = src_dir.as_ref();
   let dest_path = src_dir.with_extension("tar.gz");
-  let dest_file = common::create_file(&dest_path)?;
+  let dest_file = fs_utils::create_file(&dest_path)?;
   let gzip_encoder = GzEncoder::new(dest_file, Compression::default());
   let gzip_encoder = create_tar_from_dir(src_dir, gzip_encoder)?;
   let mut dest_file = gzip_encoder.finish()?;
@@ -387,7 +387,7 @@ fn tar_and_gzip_dir<P: AsRef<Path>>(src_dir: P) -> crate::Result<PathBuf> {
 /// Creates an `ar` archive from the given source files and writes it to the
 /// given destination path.
 fn create_archive(srcs: Vec<PathBuf>, dest: &Path) -> crate::Result<()> {
-  let mut builder = ar::Builder::new(common::create_file(dest)?);
+  let mut builder = ar::Builder::new(fs_utils::create_file(dest)?);
   for path in &srcs {
     builder.append_path(path)?;
   }

crates/tauri-bundler/src/bundle/linux/debian.rs

@@ -26,8 +26,10 @@ use handlebars::Handlebars;
 use image::{self, codecs::png::PngDecoder, ImageDecoder};
 use serde::Serialize;
 
-use crate::bundle::common;
-use crate::Settings;
+use crate::{
+  utils::{self, fs_utils},
+  Settings,
+};
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 pub struct Icon {
@@ -65,7 +67,7 @@ pub fn list_icon_files(
       let decoder = PngDecoder::new(BufReader::new(File::open(&icon_path)?))?;
       let width = decoder.dimensions().0;
       let height = decoder.dimensions().1;
-      let is_high_density = common::is_retina(&icon_path);
+      let is_high_density = utils::is_retina(&icon_path);
       let dest_path = get_dest_path(width, height, is_high_density);
       Icon {
         width,
@@ -84,7 +86,7 @@ pub fn list_icon_files(
 pub fn copy_icon_files(settings: &Settings, data_dir: &Path) -> crate::Result<Vec<Icon>> {
   let icons = list_icon_files(settings, data_dir)?;
   for (icon, src) in &icons {
-    common::copy_file(src, &icon.path)?;
+    fs_utils::copy_file(src, &icon.path)?;
   }
 
   Ok(icons.into_keys().collect())
@@ -105,7 +107,7 @@ pub fn generate_desktop_file(
   let path = PathBuf::from("usr/share/applications").join(desktop_file_name);
   let dest_path = PathBuf::from("/").join(&path);
   let file_path = data_dir.join(&path);
-  let file = &mut common::create_file(&file_path)?;
+  let file = &mut fs_utils::create_file(&file_path)?;
 
   let mut handlebars = Handlebars::new();
   handlebars.register_escape_fn(handlebars::no_escape);

crates/tauri-bundler/src/bundle/linux/freedesktop/mod.rs

@@ -23,11 +23,13 @@
 // files into the `Contents` directory of the bundle.
 
 use super::{
-  super::common::{self, CommandExt},
   icon::create_icns_file,
   sign::{notarize, notarize_auth, sign, NotarizeAuthError, SignTarget},
 };
-use crate::Settings;
+use crate::{
+  utils::{fs_utils, CommandExt},
+  Settings,
+};
 
 use anyhow::Context;
 
@@ -157,7 +159,7 @@ fn copy_binaries_to_bundle(
   for bin in settings.binaries() {
     let bin_path = settings.binary_path(bin);
     let dest_path = dest_dir.join(bin.name());
-    common::copy_file(&bin_path, &dest_path)
+    fs_utils::copy_file(&bin_path, &dest_path)
       .with_context(|| format!("Failed to copy binary from {:?}", bin_path))?;
     paths.push(dest_path);
   }
@@ -173,10 +175,10 @@ fn copy_custom_files_to_bundle(bundle_directory: &Path, settings: &Settings) ->
       contents_path
     };
     if path.is_file() {
-      common::copy_file(path, bundle_directory.join(contents_path))
+      fs_utils::copy_file(path, &bundle_directory.join(contents_path))
         .with_context(|| format!("Failed to copy file {:?} to {:?}", path, contents_path))?;
     } else {
-      common::copy_dir(path, &bundle_directory.join(contents_path))
+      fs_utils::copy_dir(path, &bundle_directory.join(contents_path))
         .with_context(|| format!("Failed to copy directory {:?} to {:?}", path, contents_path))?;
     }
   }
@@ -349,7 +351,7 @@ fn copy_framework_from(dest_dir: &Path, framework: &str, src_dir: &Path) -> crat
   let src_name = format!("{}.framework", framework);
   let src_path = src_dir.join(&src_name);
   if src_path.exists() {
-    common::copy_dir(&src_path, &dest_dir.join(&src_name))?;
+    fs_utils::copy_dir(&src_path, &dest_dir.join(&src_name))?;
     Ok(true)
   } else {
     Ok(false)
@@ -382,7 +384,7 @@ fn copy_frameworks_to_bundle(
         .file_name()
         .expect("Couldn't get framework filename");
       let dest_path = dest_dir.join(src_name);
-      common::copy_dir(&src_path, &dest_path)?;
+      fs_utils::copy_dir(&src_path, &dest_path)?;
       add_framework_sign_path(&src_path, &dest_path, &mut paths);
       continue;
     } else if framework.ends_with(".dylib") {
@@ -395,7 +397,7 @@ fn copy_frameworks_to_bundle(
       }
       let src_name = src_path.file_name().expect("Couldn't get library filename");
       let dest_path = dest_dir.join(src_name);
-      common::copy_file(&src_path, &dest_path)?;
+      fs_utils::copy_file(&src_path, &dest_path)?;
       paths.push(SignTarget {
         path: dest_path,
         is_an_executable: false,

crates/tauri-bundler/src/bundle/macos/app.rs

@@ -5,7 +5,8 @@
 
 use super::{app, icon::create_icns_file};
 use crate::{
-  bundle::{common::CommandExt, settings::Arch, Bundle},
+  bundle::{settings::Arch, Bundle},
+  utils::CommandExt,
   PackageType, Settings,
 };
 

crates/tauri-bundler/src/bundle/macos/dmg/mod.rs

@@ -3,7 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use crate::bundle::{common, Settings};
+use crate::bundle::Settings;
+use crate::utils::{self, fs_utils};
 use std::{
   cmp::min,
   ffi::OsStr,
@@ -28,7 +29,7 @@ pub fn create_icns_file(out_dir: &Path, settings: &Settings) -> crate::Result<Op
     if icon_path.extension() == Some(OsStr::new("icns")) {
       let mut dest_path = out_dir.to_path_buf();
       dest_path.push(icon_path.file_name().expect("Could not get icon filename"));
-      common::copy_file(&icon_path, &dest_path)?;
+      fs_utils::copy_file(&icon_path, &dest_path)?;
       return Ok(Some(dest_path));
     }
   }
@@ -63,7 +64,7 @@ pub fn create_icns_file(out_dir: &Path, settings: &Settings) -> crate::Result<Op
   for icon_path in settings.icon_files() {
     let icon_path = icon_path?;
     let icon = image::open(&icon_path)?;
-    let density = if common::is_retina(&icon_path) { 2 } else { 1 };
+    let density = if utils::is_retina(&icon_path) { 2 } else { 1 };
     let (w, h) = icon.dimensions();
     let orig_size = min(w, h);
     let next_size_down = 2f32.powf((orig_size as f32).log2().floor()) as u32;