upgrade key alias 11

Signed-off-by: Cai Xincheng <caixincheng@huawei.com>
Change-Id: I9a50f4b0234ebb6bb6876631bc2f7c1cbddad1f3

services/core_service/src/common_event/listener.rs

@@ -239,7 +239,7 @@ pub(crate) extern "C" fn on_user_unlocked(user_id: i32) {
     logi!("[INFO]On user -{}- unlocked.", user_id);
 
     // Trigger upgrading db version and key alias
-    match get_all_new_db() {
+    match get_all_new_db(user_id) {
         Ok(_) => logi!("Upgrade db version and key alias succeeded."),
         Err(e) => loge!("Upgrade db version and key alias failed, err is: {}", e),
     }

services/db_operator/src/database_file_upgrade.rs

@@ -103,18 +103,16 @@ fn get_new_db(user_id: i32, info_map: &DbMap) -> Result<Database> {
 }
 
 /// Get all new db
-pub fn get_all_new_db() -> Result<Vec<Database>> {
+pub fn get_all_new_db(user_id: i32) -> Result<Vec<Database>> {
     let mut db_vec = Vec::new();
-    for entry in fs::read_dir(DE_ROOT_PATH)? {
+    for entry in fs::read_dir(format!("{}/{}", DE_ROOT_PATH, user_id))? {
         let entry = entry?;
-        if let Ok(user_id) = entry.file_name().to_string_lossy().parse::<i32>() {
-            // 1.1 extract db name stem from new db name
-            if let Some(new_db_name_stem) = entry.file_name().to_string_lossy().split('.').next() {
-                // 1.2 construct new db
-                let db = get_db(user_id, new_db_name_stem, false)?;
-                // 1.3 push new db into vec
-                db_vec.push(db);
-            }
+        // 1.1 extract db name before extension from new db name
+        if let Some(position) = entry.file_name().to_string_lossy().find(".db") {
+            // 1.2 construct new db
+            let db = get_db(user_id, &entry.file_name().to_string_lossy()[..position], false)?;
+            // 1.3 push new db into vec
+            db_vec.push(db);
         }
     }
 
@@ -197,4 +195,4 @@ pub fn check_and_split_db(user_id: i32) -> Result<()> {
         }
     }
     Ok(())
-}
+}