lib: store the commit information inside the enum

This semplify the code to report the upgrade status by
storing the commit information inside the enum itself.

Changelog-Added: lib: store the commit information inside the enum
Signed-off-by: Vincenzo Palazzo <[email protected]>

Author: vincenzopalazzo

coffee_cmd/src/main.rs

@@ -67,10 +67,10 @@ async fn main() -> Result<(), CoffeeError> {
                 Ok(res) => {
                     spinner.and_then(|splinner| Some(splinner.finish()));
                     match res.status {
-                        UpgradeStatus::UpToDate => {
+                        UpgradeStatus::UpToDate(_, _) => {
                             term::info!("Remote repository `{}` is already up to date!", res.repo)
                         }
-                        UpgradeStatus::Updated => {
+                        UpgradeStatus::Updated(_, _) => {
                             term::success!(
                                 "Remote repository `{}` was successfully upgraded!",
                                 res.repo

coffee_github/src/repository.rs

@@ -1,8 +1,8 @@
 use std::any::Any;
 
 use async_trait::async_trait;
-use chrono::{TimeZone, Utc};
 use coffee_lib::types::response::CoffeeUpgrade;
+use coffee_lib::types::response::UpgradeStatus;
 use git2;
 use log::debug;
 use tokio::fs::File;
@@ -254,13 +254,12 @@ impl Repository for Github {
         }
         // pull the changes from the repository
         let status = git_upgrade(&self.url.path_string, &self.branch).await?;
-        // update the git information
-        // (git HEAD and date of the last commit)
-        let repo = git2::Repository::open(&self.url.path_string)
-            .map_err(|err| error!("{}", err.message()))?;
-        let (commit, date) = get_repo_info!(repo);
-        self.git_head = Some(commit.clone());
-        self.last_activity = Some(date.clone());
+        // FIXME: add this code inside a method of the enum, to be able to call this as `status.date()`
+        let (_, date) = match status {
+            UpgradeStatus::UpToDate(ref commit, ref date) => (commit, date.clone()),
+            UpgradeStatus::Updated(ref commit, ref date) => (commit, date.clone()),
+        };
+        self.last_activity = Some(date);
         Ok(CoffeeUpgrade {
             repo: self.name(),
             status,

coffee_github/src/utils.rs

@@ -35,11 +35,11 @@ pub async fn git_upgrade(path: &str, branch: &str) -> Result<UpgradeStatus, Coff
     let cmd = format!("git pull origin/{branch}");
     sh!(path, cmd);
 
-    let (upstream_commit, _) = get_repo_info!(repo);
+    let (upstream_commit, date) = get_repo_info!(repo);
 
     if local_commit == upstream_commit {
-        Ok(UpgradeStatus::UpToDate)
+        Ok(UpgradeStatus::UpToDate(upstream_commit, date))
     } else {
-        Ok(UpgradeStatus::Updated)
+        Ok(UpgradeStatus::Updated(upstream_commit, date))
     }
 }

coffee_lib/src/types/mod.rs

@@ -89,8 +89,8 @@ pub mod response {
 
     #[derive(Debug, Serialize, Deserialize)]
     pub enum UpgradeStatus {
-        UpToDate,
-        Updated,
+        UpToDate(String, String),
+        Updated(String, String),
     }
 
     #[derive(Debug, Serialize, Deserialize)]