From 314d358d1bfbd52cdcd66c7775fe2d44b2903577 Mon Sep 17 00:00:00 2001
From: weiqiushi <weiqiushi@buckyos.com>
Date: Thu, 13 Apr 2023 19:48:03 +0800
Subject: [PATCH] Issue #170: set version to status when appmanager recv
 install command from user, Compatibility with previous incorrect state
 settings when uninstall App

---
 src/service/app-manager/src/app_cmd_executor.rs | 3 ++-
 src/service/app-manager/src/app_manager_ex.rs   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/service/app-manager/src/app_cmd_executor.rs b/src/service/app-manager/src/app_cmd_executor.rs
index 8a366225..9f242bd3 100644
--- a/src/service/app-manager/src/app_cmd_executor.rs
+++ b/src/service/app-manager/src/app_cmd_executor.rs
@@ -307,6 +307,7 @@ impl AppCmdExecutor {
             error!("{}", err);
             return Err(BuckyError::from((BuckyErrorCode::InvalidParam, err)));
         }
+
         status.lock().unwrap().set_version(&ver);
 
         self.pre_change_status(
@@ -437,7 +438,7 @@ impl AppCmdExecutor {
         {
             let status = status.lock().unwrap();
             web_id = status.web_dir().cloned();
-            ver = status.version().unwrap().to_owned();
+            ver = status.version().unwrap_or("noversion").to_owned();
         }
 
         let mut target_status_code = AppLocalStatusCode::Uninstalled;
diff --git a/src/service/app-manager/src/app_manager_ex.rs b/src/service/app-manager/src/app_manager_ex.rs
index 7d47d4cb..27957ce8 100644
--- a/src/service/app-manager/src/app_manager_ex.rs
+++ b/src/service/app-manager/src/app_manager_ex.rs
@@ -847,6 +847,9 @@ impl AppManager {
                 cmd_code, status_code, next_status_code, app_id, cmd_group_code
             );
             status.set_status(next_status_code);
+            if let CmdCode::Install(install) = cmd_code {
+                status.set_version(&install.ver);
+            }
             status_clone = status.clone();
         }