From bfb19ab7c10beedf86be8856b021748157af3feb Mon Sep 17 00:00:00 2001
From: Katboi01 <katboiofficial@gmail.com>
Date: Mon, 8 Jul 2024 12:54:10 +0200
Subject: [PATCH] checkpoint

---
 modules/KF3/database.py          |  3 ++-
 modules/KF3/downloader.py        | 25 +++++++++++++++++++++++--
 modules/KF3/endpoints/friend.py  |  4 ++--
 modules/KF3/endpoints/friends.py |  4 ++--
 modules/KF3/endpoints/item.py    |  2 +-
 modules/KF3/endpoints/items.py   |  4 ++--
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/modules/KF3/database.py b/modules/KF3/database.py
index f3ce042..4411895 100644
--- a/modules/KF3/database.py
+++ b/modules/KF3/database.py
@@ -136,7 +136,8 @@ class Database:
             else:
                 promoIds.append([promo["promoteId00"], promo["promoteId01"], promo["promoteId02"], promo["promoteId03"], promo["promoteId04"], promo["promoteId05"]])
 
-        promoteDatas = [[self.promoteData[id] for id in promo] for promo in promoIds]
+        emptyPromote = {"promoteAtk": 0, "promoteDef": 0, "promoteHp": 0, "promoteAvoid": 0, "promoteActionDamageRatio": 0, "promoteBeatDamageRatio": 0, "promoteTryDamageRatio": 0}
+        promoteDatas = [[(self.promoteData[id] if id in self.promoteData else emptyPromote) for id in promo] for promo in promoIds]
         promote_bonus = {"atk" : 0, "def" : 0, "hp" : 0, "evd" : 0, "beat" : 0, "act" : 0, "try" : 0}
         for promoTier in promoteDatas:
             for promoteStep in promoTier:
diff --git a/modules/KF3/downloader.py b/modules/KF3/downloader.py
index f0dd8d9..dff781a 100644
--- a/modules/KF3/downloader.py
+++ b/modules/KF3/downloader.py
@@ -112,7 +112,7 @@ async def download_files(server_name, asset_bundle_url, srv_platform : str):
                 convert_path = f"/var/www/html/Katworks/KF/assets/KF3/WebGL/assets/" + file_name
                 extract_path = f"/var/www/html/Katworks/KF/assets/KF3/extracted/"
                 try:
-                    convert(data, convert_path, enums.BuildTarget.WebGL, True)
+                    convert(data, convert_path, enums.BuildTarget.WebGL)
                 except:
                     with open(convert_path, "wb") as file:
                         file.write(data)
@@ -173,6 +173,26 @@ async def download_files(server_name, asset_bundle_url, srv_platform : str):
     await session.close()
     return files_to_download
 
+async def convert_files():
+    directory = f"/var/www/html/Katworks/KF/assets/KF3/develop01/assets/Windows/"
+    with open("/var/www/html/Katworks/KF/assets/KF3/lastUpdate_dev_files.json", "rt", encoding="utf-8") as file:
+        files_to_convert = json.load(file)
+    for file_name in os.listdir(directory):
+        if file_name not in files_to_convert:
+            continue
+        
+        f = os.path.join(directory, file_name)
+
+        if not os.path.isfile(f):
+            return
+        
+        convert_path = f"/var/www/html/Katworks/KF/assets/KF3/WebGL/assets/" + file_name
+        try:
+            print(f)
+            convert(f, convert_path, enums.BuildTarget.WebGL)
+        except:
+            print("Conversion failed", f)
+
 async def manual():
     downloaded_cache = {}
     downloaded_files = {}
@@ -210,4 +230,5 @@ async def manual():
             json.dump(downloaded_files, file, ensure_ascii=False, indent=1)
 
 if __name__ == "__main__":
-    asyncio.run(manual())
\ No newline at end of file
+    asyncio.run(manual())
+    #asyncio.run(convert_files())
\ No newline at end of file
diff --git a/modules/KF3/endpoints/friend.py b/modules/KF3/endpoints/friend.py
index 5d00903..dc28d97 100644
--- a/modules/KF3/endpoints/friend.py
+++ b/modules/KF3/endpoints/friend.py
@@ -5,9 +5,9 @@ import json
 
 class KF3_Friend(Resource):
     def get(self, id:int):
-        from KF3.database import Database
+        from ..database import Database
         db : Database = app.databases["KF3"]
-        
+
         if "wiki" in request.args:
             result = db.get_chara_wiki(id)
 
diff --git a/modules/KF3/endpoints/friends.py b/modules/KF3/endpoints/friends.py
index 99d0469..84b1356 100644
--- a/modules/KF3/endpoints/friends.py
+++ b/modules/KF3/endpoints/friends.py
@@ -5,9 +5,9 @@ from flask import request
 
 class KF3_Friends(Resource):
     def get(self):
-        from KF3.database import Database
+        from ..database import Database
         db : Database = app.databases["KF3"]
-        
+
         result = []
         for value in db.processed_friends.values():
             result.append({"id": value["id"], "name": value["nameEn"], "startTime" : value["startTime"], "startTimeRaw" : value["startTimeRaw"]})
diff --git a/modules/KF3/endpoints/item.py b/modules/KF3/endpoints/item.py
index 01b5bb6..5b40fe6 100644
--- a/modules/KF3/endpoints/item.py
+++ b/modules/KF3/endpoints/item.py
@@ -5,7 +5,7 @@ import json
 
 class KF3_Item(Resource):
     def get(self, id:int):
-        from KF3.database import Database
+        from ..database import Database
         db : Database = app.databases["KF3"]
         
         result = db.get_item(id)
diff --git a/modules/KF3/endpoints/items.py b/modules/KF3/endpoints/items.py
index 0d318cc..a264bc1 100644
--- a/modules/KF3/endpoints/items.py
+++ b/modules/KF3/endpoints/items.py
@@ -4,12 +4,12 @@ from flask import current_app as app
 
 class KF3_Items(Resource):
     def get(self):
-        from KF3.database import Database
+        from ..database import Database
         db : Database = app.databases["KF3"]
 
         result = []
         for value in db.itemCommon.values():
-            result.append({"id": value["id"], "name": value["name"]})
+            result.append({"id": value["id"], "name": value["name"], "iconName" : value["iconName"], "flavorText" : value["flavorText"]})
 
         response = app.response_class(
             response=json.dumps(result, ensure_ascii=False, indent=1),