Merge pull request #10 from AdastralGroup/develop

v1.4.2 - Bug Fixes

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "beans-rs"
-version = "1.4.1"
+version = "1.4.2"
 edition = "2021"
 authors = [
     "Adastral Group (https://adastral.net)",

src/helper/mod.rs

@@ -16,8 +16,8 @@ use std::path::PathBuf;
 use indicatif::{ProgressBar, ProgressStyle};
 use futures::StreamExt;
 use futures_util::SinkExt;
-use log::{debug, trace};
-use crate::{BeansError, DownloadFailureReason};
+use log::{debug, error, trace};
+use crate::{BeansError, DownloadFailureReason, RunnerContext};
 use rand::{distributions::Alphanumeric, Rng};
 use reqwest::header::USER_AGENT;
 use crate::version::RemoteVersionResponse;
@@ -400,6 +400,23 @@ pub async fn beans_has_update() -> Result<Option<GithubReleaseItem>, BeansError>
     }
     return Ok(None);
 }
+pub fn restore_gameinfo(ctx: &mut RunnerContext, data: Vec<u8>) -> Result<(), BeansError> {
+    let loc = ctx.gameinfo_location();
+    trace!("gameinfo location: {}", &loc);
+    if let Ok(m) = std::fs::metadata(&loc) {
+        trace!("gameinfo metadata: {:#?}", m);
+    }
+    if let Err(e) = std::fs::write(&loc, data) {
+        trace!("error: {:#?}", e);
+        error!("[UpdateWorkflow::wizard] Failed to write gameinfo.txt backup {:}", e);
+    }
+    if let Err(e) = ctx.gameinfo_perms() {
+        error!("[UpdateWorkflow::wizard] Failed to update permissions on gameinfo.txt {:}", e);
+        sentry::capture_error(&e);
+        return Err(e);
+    }
+    return Ok(());
+}
 const GITHUB_RELEASES_URL: &str = "https://api.github.com/repos/adastralgroup/beans-rs/releases/latest";
 #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
 pub struct GithubReleaseItem

src/workflows/update.rs

@@ -71,21 +71,9 @@ impl UpdateWorkflow
             return Err(e);
         }
 
+        ctx.gameinfo_perms()?;
         if let Some(gi) = gameinfo_backup {
-            let loc = ctx.gameinfo_location();
-            trace!("gameinfo location: {}", &loc);
-            if let Ok(m) = std::fs::metadata(&loc) {
-                trace!("gameinfo metadata: {:#?}", m);
-            }
-            if let Err(e) = std::fs::write(&loc, gi) {
-                trace!("error: {:#?}", e);
-                error!("[UpdateWorkflow::wizard] Failed to write gameinfo.txt backup {:}", e);
-            }
-            if let Err(e) = ctx.gameinfo_perms() {
-                error!("[UpdateWorkflow::wizard] Failed to update permissions on gameinfo.txt {:}", e);
-                sentry::capture_error(&e);
-                return Err(e);
-            }
+            helper::restore_gameinfo(ctx, gi)?;
         }
 
         println!("Game has been updated!");

src/workflows/verify.rs

@@ -1,4 +1,4 @@
-use crate::{BeansError, butler, RunnerContext};
+use crate::{BeansError, butler, helper, RunnerContext};
 use crate::version::RemoteVersion;
 
 pub struct VerifyWorkflow {
@@ -29,11 +29,17 @@ impl VerifyWorkflow {
             return Ok(());
         }
 
+        ctx.gameinfo_perms()?;
+        let gameinfo_backup = ctx.read_gameinfo_file()?;
         let mod_dir_location = ctx.get_mod_location();
         butler::verify(
             format!("{}{}", &av.remote_info.base_url, remote.signature_url.unwrap()),
             mod_dir_location.clone(),
             format!("{}{}", &av.remote_info.base_url, remote.heal_url.unwrap()))?;
+        ctx.gameinfo_perms()?;
+        if let Some(gi) = gameinfo_backup {
+            helper::restore_gameinfo(ctx, gi)?;
+        }
         println!("[VerifyWorkflow::wizard] The verification process has completed, and any corruption has been repaired.");
         Ok(())
     }