turbine-lib 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

turbine_lib/database.py

@@ -3,6 +3,9 @@ import os
 
 import yaml
 
+from turbine_lib.binarydata import BinaryData
+from turbine_lib.subfiledata import SubfileData
+
 
 class Database:
 
@@ -102,9 +105,7 @@ class Database:
             return False
 
     def get_next_file(self):
-        from subfiledata import SubfileData
-        from binarydata import BinaryData
-        
+
         if self.db_ is None:
             print("Trying to get next file from db, which hasn't been opened yet.")
             return SubfileData()

turbine_lib/datfile.py

@@ -90,7 +90,7 @@ class DatFile:
     def get_files_num_in_dat_file(self):
         return self.api_.get_num_subfiles(self.file_handle_)
 
-    def patch_all_files_from_database(self, db):
+    def patch_all_files_from_database(self, db,callback=None):
         patched_files_num = 0
 
         file = db.get_next_file()
@@ -101,7 +101,8 @@ class DatFile:
         while not file.empty():
             if i > 0 and total_files > 0 and i * 100 // total_files != (i - 1) * 100 // total_files:
                 logging.info(f"Completed {i * 100 // total_files}%")
-                print(f"Completed {i * 100 // total_files}%")
+                if callback:
+                    callback(i * 100 // total_files)
                 # gl.progress_wnd.UpdateStageText(f"正在安装第{i}条翻译到dat文件...")
                 # gl.progress_wnd.UpdatePercent(int(i * 100 / total_files))
             i += 1
@@ -191,7 +192,7 @@ class DatFile:
             self.file_handle_, file_id, self.export_data_buf_.data(), version)
         return file_type_from_file_contents(file_id, self.export_data_buf_)
 
-    def perform_operation_on_all_subfiles(self, operation):
+    def perform_operation_on_all_subfiles(self, operation, callback=None):
         if not self.files_info_:
             self.load_all_files_info()
 
@@ -200,11 +201,13 @@ class DatFile:
         for file_id, info in self.files_info_.items():
             if i > 0 and len(self.files_info_) > 0 and i * 100 // len(self.files_info_) != (i - 1) * 100 // len(
                     self.files_info_):
-                print(f"Completed {i * 100 // len(self.files_info_)}%")
+                logging.info(f"Completed {i * 100 // len(self.files_info_)}%")
+                if (callback):
+                    callback(i * 100 // len(self.files_info_))
             operation(info)
             i += 1
 
-    def export_files_by_type(self, file_type, db_or_path):
+    def export_files_by_type(self, file_type, db_or_path, callback):
         num_files = 0
 
         if isinstance(db_or_path, Database):
@@ -216,7 +219,7 @@ class DatFile:
                     self.export_file_by_id(info.file_id, db_or_path)
                     num_files += 1
 
-            self.perform_operation_on_all_subfiles(operation)
+            self.perform_operation_on_all_subfiles(operation, callback)
             return num_files
         else:
             # Export to directory

turbine_lib/font_convert.py

@@ -1,7 +1,6 @@
 import datetime
 import os
 import struct
-from utils import compare_files_byte_by_byte, compare_files_detailed, compare_files
 
 
 # bmfont

turbine_lib/subfiledata.py

@@ -1,11 +1,13 @@
 import yaml
 
+from turbine_lib.binarydata import BinaryData
+
+
 class SubfileData:
 
     def __init__(self, binary_data=None, text_data="", options=None):
         if binary_data is None:
             # Default constructor
-            from binarydata import BinaryData
             self.binary_data = BinaryData()
             self.text_data = ""
             self.options = yaml.safe_load("{}") if options is None else options

turbine_lib/textsubfile.py

@@ -1,3 +1,5 @@
+from turbine_lib import textutils
+
 from turbine_lib.binarydata import BinaryData
 from turbine_lib.subfile import Subfile
 from turbine_lib.subfiledata import SubfileData

{turbine_lib-0.1.1.dist-info → turbine_lib-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: turbine_lib
-Version: 0.1.1
+Version: 0.1.3
 Summary: 仅支持Windows 32位Python的库
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{turbine_lib-0.1.1.dist-info → turbine_lib-0.1.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
 turbine_lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 turbine_lib/binarydata.py,sha256=lu1XSkqGIyLASJPbbf0UJuZ-E2rrLw0EC6Oq7P8DeBs,4505
-turbine_lib/database.py,sha256=4a_Zzcdr_O5-GZK8M2FcmyA06TqYkGiaLZafQv7jRRU,5112
+turbine_lib/database.py,sha256=iFcTJq-HwEQAIpnVSeGrAWU751J7DlbWsE44XdTQyM0,5114
 turbine_lib/datexportapi.py,sha256=680sjmTDXq8WIEIEuIs48wm6BfhF4JaOgXnT_ep_h6Q,12745
-turbine_lib/datfile.py,sha256=tRAB17tPuJ-75tdS_5BVdVLdMfZOwA73vDVsQWfC6eo,13314
+turbine_lib/datfile.py,sha256=PPnhN5tA3FmQwCsONfVq7SKkRhhsWH6oVnuw_MA7Xa8,13487
 turbine_lib/ddssubfile.py,sha256=8P8PSFwMUa9QtWZVNdh_XG6MVjk80W-5SwPrcaF3zIY,10435
-turbine_lib/font_convert.py,sha256=tuIkq84h6BOSUDMDLRVBK6PV_OulSrbziII9o2hWYzA,12954
+turbine_lib/font_convert.py,sha256=mx69NIpWtPKEVWDBaX_cr1SM2Bp_nUbxXVDRCiWLng0,12869
 turbine_lib/fontsubfile.py,sha256=VYghH26_6dhCHaNVPEhwQXpt1m7S-VZ53kPRGro1KIY,920
 turbine_lib/subfile.py,sha256=AYJaJR9FYUcLKaUpHgHu4HXU6m81S4BVb9naugws4ko,2767
-turbine_lib/subfiledata.py,sha256=JJJedNBOOtSa_UoztXwqDrnykXDi79BwLuXg0b95VmE,1068
-turbine_lib/textsubfile.py,sha256=LPhShTaP7wEAKOHgT5oApgl0ZfYsjsl1MIJghSPy_uU,13317
+turbine_lib/subfiledata.py,sha256=jwMci9SPW6kycayfz_6K6hhNphNiZWcEMF--ECTJBZ8,1070
+turbine_lib/textsubfile.py,sha256=XloEtHUx4nf_TrJkZGBgkJdG_A8Bxb6tQN7yGmS91uk,13354
 turbine_lib/textutils.py,sha256=JcJKd4gjdvR023wTMSCOhyTWs5_kHp3W1sAY0uMPe1Q,759
 turbine_lib/utils.py,sha256=DlQWk15XqDsQYASL7pD6TB5JO8gXyyyu_AJ16ombKn8,3856
 turbine_lib/libs/datexport.dll,sha256=ycZSi4e7juJSVU49Ap23IQ49jXY1uzU2MvX7uRdJha8,238896
@@ -16,7 +16,7 @@ turbine_lib/libs/msvcp71.dll,sha256=35YVb2pUj9b-VnKRjeWuRQnTyBCle__SqR3kWj7Vsjs,
 turbine_lib/libs/msvcp90.dll,sha256=BpGM-ZrSbNbPEGiBwNW9shLcC6xFSYBcn1kG49A9FSw,569680
 turbine_lib/libs/msvcr71.dll,sha256=gJSvXuMQcUyuvMru53af-wgEhQO6R4uHnt_vXxok_v4,348160
 turbine_lib/libs/zlib1T.dll,sha256=fiPxt97AbyHE_GVYpIDVldSFPUFjV8xVQRRkhxwenBQ,63000
-turbine_lib-0.1.1.dist-info/METADATA,sha256=4b2KAySNXDZVIXGZWc7-FLwvJ4ex2OithCMq3M9_gTQ,417
-turbine_lib-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-turbine_lib-0.1.1.dist-info/top_level.txt,sha256=LVLiMIuAzr6r6OUWftVdJcXucgUlW6Y6XWw4gUoUWQI,12
-turbine_lib-0.1.1.dist-info/RECORD,,
+turbine_lib-0.1.3.dist-info/METADATA,sha256=LOe6cV4gRUmOoLTkkyxsEiKkI-x761BhYJwUp1yVfPg,417
+turbine_lib-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+turbine_lib-0.1.3.dist-info/top_level.txt,sha256=LVLiMIuAzr6r6OUWftVdJcXucgUlW6Y6XWw4gUoUWQI,12
+turbine_lib-0.1.3.dist-info/RECORD,,