fix: remove over uninstalls (#69)

Author: NickKhalow

.github/workflows/release.yml

@@ -211,6 +211,14 @@ jobs:
           SIGN_SCRIPT_PATH="${GITHUB_WORKSPACE}/src-tauri/scripts/sign.ps1"
           sed -i.bak "s|\"sign.ps1\"|\"${SIGN_SCRIPT_PATH//\\/\/}\"|g" src-tauri/tauri.conf.json
 
+      - name: Code Analysis Core
+        working-directory: ${{ github.workspace }}/core
+        run: cargo clippy --all-targets --all-features -- -D warnings
+
+      - name: Code Analysis Tauri
+        working-directory: ${{ github.workspace }}/src-tauri
+        run: cargo clippy --all-targets --all-features -- -D warnings
+
       - name: Build Release
         if: ${{ inputs.dry-run == false }}
         uses: tauri-apps/tauri-action@v0

core/.cargo/config.toml

@@ -0,0 +1,5 @@
+[build]
+rustflags = [
+  "-Dwarnings",         # treat all warnings as errors
+  "-Dunsafe_code",      # deny unsafe blocks globally
+]

core/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dcl-launcher-core"
-version = "1.1.0"
+version = "1.1.1"
 edition = "2024"
 
 [lib]
@@ -12,9 +12,11 @@ name = "dcl_launcher_core"
 path = "src/main.rs"
 
 [profile.dev]
+overflow-checks = true
 incremental = true # Compile your binary in smaller steps.
 
 [profile.release]
+overflow-checks = true
 codegen-units = 1 # Allows LLVM to perform better optimization.
 lto = true # Enables link-time-optimizations.
 opt-level = "s" # Prioritizes small binary size. Use `3` if you prefer speed.

core/Cargo.toml

@@ -86,9 +86,9 @@ impl Display for Event {
                 Event::LAUNCH_CLIENT_START { .. } => "Launch Client Start",
                 Event::LAUNCH_CLIENT_SUCCESS { .. } => "Launch Client Success",
                 Event::LAUNCH_CLIENT_ERROR { .. } => "Launch Client Error",
-                Event::LAUNCHER_UPDATE_CHECKING { .. } => "Launcher Update Checking",
+                Event::LAUNCHER_UPDATE_CHECKING => "Launcher Update Checking",
                 Event::LAUNCHER_UPDATE_AVAILABLE { .. } => "Launcher Update Available",
-                Event::LAUNCHER_UPDATE_NOT_AVAILABLE { .. } => "Launcher Update Not Available",
+                Event::LAUNCHER_UPDATE_NOT_AVAILABLE => "Launcher Update Not Available",
                 Event::LAUNCHER_UPDATE_CANCELLED { .. } => "Launcher Update Cancelled",
                 Event::LAUNCHER_UPDATE_ERROR { .. } => "Launcher Update Error",
                 Event::LAUNCHER_UPDATE_DOWNLOADED { .. } => "Launcher Update Downloaded",

core/src/analytics/event.rs

@@ -15,3 +15,9 @@ impl NullClient {
         &self.session_id
     }
 }
+
+impl Default for NullClient {
+    fn default() -> Self {
+        Self::new()
+    }
+}

core/src/analytics/null_client.rs

@@ -211,7 +211,7 @@ impl From<zip::result::ZipError> for StepError {
 
 impl From<reqwest::Error> for StepError {
     fn from(value: reqwest::Error) -> Self {
-        let url: Option<String> = value.url().map_or(None, |e| Some(e.as_str().to_owned()));
+        let url: Option<String> = value.url().map(|e| e.as_str().to_owned());
         StepError::E2001_DOWNLOAD_FAILED { url, error: value }
     }
 }

core/src/errors.rs

@@ -14,7 +14,7 @@ use regex::Regex;
 use std::{path::PathBuf, sync::Arc};
 use tokio::sync::Mutex;
 
-pub trait LaunchStep {
+trait LaunchStep {
     async fn is_complete(&self, state: Arc<Mutex<LaunchFlowState>>) -> Result<bool>;
 
     fn start_label(&self) -> Result<Status>;
@@ -321,12 +321,9 @@ impl InstallStep {
         state: Arc<Mutex<LaunchFlowState>>,
     ) -> Option<RecentDownload> {
         let mut guard = state.lock().await;
-        let recent_download = guard.recent_download.clone();
-        if recent_download.is_none() {
-            return None;
-        }
+        let recent_download = guard.recent_download.clone()?;
         guard.recent_download = None;
-        recent_download
+        Some(recent_download)
     }
 }
 

core/src/flow.rs

@@ -135,6 +135,7 @@ fn get_explorer_bin_path(version: Option<&str>) -> Result<PathBuf> {
     Ok(base_path.join(EXPLORER_WIN_BIN_PATH))
 }
 
+#[cfg(target_os = "macos")]
 fn move_recursive(src: &PathBuf, dst: &PathBuf) -> Result<()> {
     if !src.exists() {
         return Err(anyhow!("Source path does not exist"));
@@ -206,7 +207,7 @@ impl Eq for EntryVersion {}
 
 impl PartialOrd for EntryVersion {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.version.partial_cmp(&other.version)
+        Some(self.cmp(other))
     }
 }
 
@@ -248,10 +249,20 @@ async fn cleanup_versions() -> Result<()> {
     }
 
     // Sort versions
-    installations.sort_by(|a, b| a.cmp(b));
+    installations.sort();
+
+    const KEEP_VERSIONS_AMOUNT: usize = 2;
+
+    if installations.len() <= KEEP_VERSIONS_AMOUNT {
+        // Don't need to uninstall anything
+        return Ok(());
+    }
 
     // Keep the latest 2 versions and delete the rest
-    for version in installations.iter().take(installations.len() - 2) {
+    for version in installations
+        .iter()
+        .take(installations.len() - KEEP_VERSIONS_AMOUNT)
+    {
         let folder_path = explorer_path().join(version.to_restored());
         if folder_path.exists() {
             match fs::remove_dir_all(&folder_path) {
@@ -471,22 +482,22 @@ impl InstallsHub {
         const CHECK_INTERVAL: Duration = Duration::from_millis(100);
 
         #[cfg(windows)]
-        let GRACEFUL_EXIT_CODE: ExitStatus = std::process::ExitStatus::from_raw(0);
+        let graceful_exit_code: ExitStatus = std::process::ExitStatus::from_raw(0);
 
         #[cfg(unix)]
-        let GRACEFUL_EXIT_CODE: ExitStatus = ExitStatus::from_raw(0 << 8); // exit code 0
+        let graceful_exit_code: ExitStatus = ExitStatus::from_raw(0 << 8); // exit code 0
 
         #[cfg(windows)]
-        let STILL_ACTIVE_EXIT_CODE: ExitStatus = std::process::ExitStatus::from_raw(259);
+        let still_active_exit_code: ExitStatus = std::process::ExitStatus::from_raw(259);
 
         for _ in 0..(WAIT_TIMEOUT.as_millis() / CHECK_INTERVAL.as_millis()) {
             if let Some(exit_status) = child.try_wait()? {
-                if exit_status == GRACEFUL_EXIT_CODE {
+                if exit_status == graceful_exit_code {
                     return Ok(());
                 }
 
                 #[cfg(windows)]
-                if exit_status == STILL_ACTIVE_EXIT_CODE {
+                if exit_status == still_active_exit_code {
                     break;
                 }
 

core/src/installs.rs

@@ -1,3 +1,14 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+#![deny(
+    clippy::unwrap_used,
+    clippy::expect_used,
+    clippy::panic,
+    clippy::indexing_slicing,
+    clippy::arithmetic_side_effects,
+    clippy::todo,
+    clippy::dbg_macro
+)]
+
 use anyhow::{Context, Ok, Result};
 use dcl_launcher_core::{app::AppState, channel::EventChannel};
 use log::info;
@@ -7,7 +18,7 @@ struct ConsoleChannel();
 impl EventChannel for ConsoleChannel {
     fn send(&self, status: dcl_launcher_core::types::Status) -> Result<()> {
         let s = serde_json::to_string_pretty(&status)?;
-        info!("{}", s);
+        info!("{s}");
         Ok(())
     }
 }