Rename some staffs

Author: Legend-Master

plugins/updater/src/updater.rs

@@ -296,13 +296,13 @@ impl UpdaterBuilder {
             return Err(Error::EmptyEndpoints);
         };
 
-        let arch = get_updater_arch().ok_or(Error::UnsupportedArch)?;
+        let arch = updater_arch().ok_or(Error::UnsupportedArch)?;
         let (target, json_target) = if let Some(target) = self.target {
             (target.clone(), target)
         } else {
-            let target = get_updater_target().ok_or(Error::UnsupportedOs)?;
-            let json_target = format!("{target}-{arch}");
-            (target.to_owned(), json_target)
+            let os = updater_os().ok_or(Error::UnsupportedOs)?;
+            let json_target = format!("{os}-{arch}");
+            (os.to_owned(), json_target)
         };
 
         let executable_path = self.executable_path.clone().unwrap_or(current_exe()?);
@@ -359,7 +359,8 @@ pub struct Updater {
     proxy: Option<Url>,
     endpoints: Vec<Url>,
     arch: &'static str,
-    // The `{{target}}` variable we replace in the endpoint and serach for in the JSON
+    // The `{{target}}` variable we replace in the endpoint and serach for in the JSON,
+    // this is either the user provided target or the current operating system by default
     target: String,
     // The value we search if the updater server returns a JSON with the `platforms` object
     json_target: String,
@@ -375,15 +376,15 @@ pub struct Updater {
 
 impl Updater {
     fn get_updater_installer(&self) -> Option<Installer> {
-        bundle_type().and_then(|t| match t {
+        match bundle_type()? {
             BundleType::Deb => Some(Installer::Deb),
             BundleType::Rpm => Some(Installer::Rpm),
             BundleType::AppImage => Some(Installer::AppImage),
             BundleType::Msi => Some(Installer::Msi),
             BundleType::Nsis => Some(Installer::Nsis),
             BundleType::App => Some(Installer::App),
             BundleType::Dmg => None,
-        })
+        }
     }
 
     pub async fn check(&self) -> Result<Option<Update>> {
@@ -518,7 +519,7 @@ impl Updater {
         if let Some(installer) = installer {
             let target = &format!("{}-{}", &self.json_target, installer.suffix());
             log::debug!(
-                "Bundle type is {}. Checking for plattform {target} in response",
+                "Bundle type is {}. Checking for platform {target} in response",
                 installer.suffix()
             );
             let bundle_url = release.download_url(target);
@@ -530,9 +531,9 @@ impl Updater {
                         target.clone(),
                     ));
                 }
-                log::debug!("Plattform {target} not found in response. Using fallback URL");
+                log::debug!("Platform {target} not found in response. Using fallback URL");
             } else {
-                log::debug!("Plattform {target} found in response");
+                log::debug!("Platform {target} found in response");
                 download_url = bundle_url;
                 signature = bundle_signature;
             }
@@ -1275,14 +1276,14 @@ impl Update {
 
 /// Gets the target string used on the updater.
 pub fn target() -> Option<String> {
-    if let (Some(target), Some(arch)) = (get_updater_target(), get_updater_arch()) {
+    if let (Some(target), Some(arch)) = (updater_os(), updater_arch()) {
         Some(format!("{target}-{arch}"))
     } else {
         None
     }
 }
 
-pub(crate) fn get_updater_target() -> Option<&'static str> {
+fn updater_os() -> Option<&'static str> {
     if cfg!(target_os = "linux") {
         Some("linux")
     } else if cfg!(target_os = "macos") {
@@ -1295,7 +1296,7 @@ pub(crate) fn get_updater_target() -> Option<&'static str> {
     }
 }
 
-pub(crate) fn get_updater_arch() -> Option<&'static str> {
+fn updater_arch() -> Option<&'static str> {
     if cfg!(target_arch = "x86") {
         Some("i686")
     } else if cfg!(target_arch = "x86_64") {