turbine-lib 0.1.0__tar.gz → 0.1.2__tar.gz

{turbine_lib-0.1.0 → turbine_lib-0.1.2}/PKG-INFO

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

{turbine_lib-0.1.0 → turbine_lib-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "turbine_lib"
-version = "0.1.0"
+version = "0.1.2"
 description = "仅支持Windows 32位Python的库"
 classifiers = [
     "Programming Language :: Python :: 3",

{turbine_lib-0.1.0 → turbine_lib-0.1.2}/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-0.1.0 → turbine_lib-0.1.2}/turbine_lib/datfile.py

@@ -1,13 +1,13 @@
 import logging
 
-from binarydata import BinaryData
-from database import Database
-from datexportapi import DatExportApi
-from ddssubfile import DDSSubfile
-from fontsubfile import SubfileFONT
-from subfile import FILE_TYPE, file_type_from_file_contents, string_from_file_type
-from subfiledata import SubfileData
-from textsubfile import TextSubfile
+from turbine_lib.binarydata import BinaryData
+from turbine_lib.database import Database
+from turbine_lib.datexportapi import DatExportApi
+from turbine_lib.ddssubfile import DDSSubfile
+from turbine_lib.fontsubfile import SubfileFONT
+from turbine_lib.subfile import string_from_file_type, file_type_from_file_contents, FILE_TYPE
+from turbine_lib.subfiledata import SubfileData
+from turbine_lib.textsubfile import TextSubfile
 
 
 class SubfileInfo:
@@ -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-0.1.0 → turbine_lib-0.1.2}/turbine_lib/ddssubfile.py

@@ -1,6 +1,6 @@
-from subfile import Subfile, FILE_TYPE
-from binarydata import BinaryData
-from subfiledata import SubfileData
+from turbine_lib.subfile import Subfile, FILE_TYPE
+from turbine_lib.binarydata import BinaryData
+from turbine_lib.subfiledata import SubfileData
 
 
 class DDSSubfile(Subfile):

{turbine_lib-0.1.0 → turbine_lib-0.1.2}/turbine_lib/fontsubfile.py

@@ -1,6 +1,5 @@
-from subfile import Subfile
-from binarydata import BinaryData
-from subfiledata import SubfileData
+from turbine_lib.subfile import Subfile
+from turbine_lib.subfiledata import SubfileData
 
 
 class FONT:

{turbine_lib-0.1.0 → turbine_lib-0.1.2}/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-0.1.0 → turbine_lib-0.1.2}/turbine_lib/textsubfile.py

@@ -1,7 +1,8 @@
-from subfile import Subfile, FILE_TYPE
-from binarydata import BinaryData
-from subfiledata import SubfileData
-import textutils
+from turbine_lib import textutils
+
+from turbine_lib.binarydata import BinaryData
+from turbine_lib.subfile import Subfile
+from turbine_lib.subfiledata import SubfileData
 
 
 class TextFragment:

{turbine_lib-0.1.0 → turbine_lib-0.1.2}/turbine_lib.egg-info/PKG-INFO

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