From 1342a06df885d352d0255bb0cae96647cd494620 Mon Sep 17 00:00:00 2001
From: chenzx <chenzx@lamda.nju.edu.cn>
Date: Sun, 9 Apr 2023 12:35:46 +0800
Subject: [PATCH] [MNT] Update database and file operations

---
 learnware/market/database_ops.py | 5 +----
 learnware/market/easy.py         | 8 +++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/learnware/market/database_ops.py b/learnware/market/database_ops.py
index 00367fc..dcf47b0 100644
--- a/learnware/market/database_ops.py
+++ b/learnware/market/database_ops.py
@@ -75,10 +75,7 @@ def load_market_from_db(cur):
     for item in cursor:
         id, semantic_spec, zip_path, folder_path = item
         semantic_spec_dict = json.loads(semantic_spec)
-        config_file_path = os.path.join(folder_path, "learnware.yaml")
-        new_learnware = get_learnware_from_dirpath(
-            id=id, semantic_spec=semantic_spec_dict, file_config=config_file_path
-        )
+        new_learnware = get_learnware_from_dirpath(id=id, semantic_spec=semantic_spec_dict, file_config=folder_path)
         learnware_list[id] = new_learnware
         zip_list[id] = zip_path
         max_count = max(max_count, int(id))
diff --git a/learnware/market/easy.py b/learnware/market/easy.py
index b82ff2f..47c4161 100644
--- a/learnware/market/easy.py
+++ b/learnware/market/easy.py
@@ -98,7 +98,7 @@ class EasyMarket(BaseMarket):
         target_folder_dir = os.path.join(C.learnware_folder_pool_path, id)
         copyfile(zip_path, target_zip_dir)
         with zipfile.ZipFile(target_zip_dir, "r") as z_file:
-            z_file.extractall(target_folder_dir)
+            z_file.extractall(C.learnware_folder_pool_path)
         # config_file_dir = os.path.join(target_folder_dir, "learnware.yaml")
 
         new_learnware = get_learnware_from_dirpath(
@@ -114,7 +114,6 @@ class EasyMarket(BaseMarket):
             self.count += 1
             add_learnware_to_db(
                 id,
-                name=learnware_name,
                 semantic_spec=semantic_spec,
                 zip_path=target_folder_dir,
                 folder_path=target_folder_dir,
@@ -388,7 +387,10 @@ class EasyMarket(BaseMarket):
         pass
 
     def get_learnware_path_by_ids(self, id: str) -> str:
-        pass
+        if not id in self.learnware_zip_list:
+            raise Exception("Target id not found in market")
+        else:
+            return self.learnware_zip_list[id]
 
     def __len__(self):
         return len(self.learnware_list.keys())