turbine-lib 0.1.5__tar.gz → 0.1.7__tar.gz

{turbine_lib-0.1.5 → turbine_lib-0.1.7}/PKG-INFO

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

{turbine_lib-0.1.5 → turbine_lib-0.1.7}/pyproject.toml

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

{turbine_lib-0.1.5 → turbine_lib-0.1.7}/turbine_lib/datexportapi.py

@@ -72,13 +72,13 @@ class DatExportApi:
             # GetSubfileData
             self.get_subfile_data_func = self.datexport_dll.GetSubfileData
             self.get_subfile_data_func.argtypes = [
-                wintypes.INT,  # handle
-                wintypes.INT,  # file_id
+                ctypes.c_int32,  # handle
+                ctypes.c_int32,  # file_id
                 ctypes.c_void_p,  # buffer for storing data
-                wintypes.INT,  # 0
-                ctypes.POINTER(wintypes.INT)  # version
+                ctypes.c_int32,  # 0
+                ctypes.POINTER(ctypes.c_int32)  # version
             ]
-            self.get_subfile_data_func.restype = wintypes.INT
+            self.get_subfile_data_func.restype = ctypes.c_int32
 
             # CloseDatFile
             self.close_dat_file_func = self.datexport_dll.CloseDatFile

{turbine_lib-0.1.5 → turbine_lib-0.1.7}/turbine_lib/datfile.py

@@ -5,6 +5,7 @@ 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.jpgsubfile import SubfileJPG
 from turbine_lib.subfile import string_from_file_type, file_type_from_file_contents, FILE_TYPE, Subfile
 from turbine_lib.subfiledata import SubfileData
 from turbine_lib.textsubfile import TextSubfile
@@ -243,7 +244,9 @@ class DatFile:
         version = 0
         size, version = self.api_.get_subfile_data(
             self.file_handle_, file_id, self.export_data_buf_.data(), version)
-
+        if size <= 0:
+            print(f"File size error: {file_id}")
+            return
         data = self.export_data_buf_.cut_data(0, size)
         file_result = self.build_for_export(file_id, data)
 
@@ -286,6 +289,9 @@ class DatFile:
         elif ext == ".dds":
             for_import = DDSSubfile.build_for_import(old_data, outer_data)
             return for_import
+        elif ext == ".jpg":
+            for_import = SubfileJPG.build_for_import(old_data, outer_data)
+            return for_import
         elif ext == ".fontbin":
             for_import = SubfileFONT.build_for_import(old_data, outer_data)
             return for_import
@@ -334,6 +340,8 @@ class DatFile:
             result = DDSSubfile.build_for_export(inner_data)
         elif file_type == FILE_TYPE.FONT:
             result = SubfileFONT.build_for_export(inner_data)
+        elif file_type == FILE_TYPE.JPG:
+            result = SubfileJPG.build_for_export(inner_data)
         # Add other file types as needed
         else:
             # Default implementation for unknown types

turbine_lib-0.1.7/turbine_lib/jpgsubfile.py

@@ -0,0 +1,35 @@
+from turbine_lib.binarydata import BinaryData
+from turbine_lib.subfile import Subfile
+from turbine_lib.subfiledata import SubfileData
+
+
+class JPG:
+    """Marker class for JPG file type"""
+    pass
+
+
+class SubfileJPG(Subfile):
+    """Python translation of the C++ Subfile<JPG> template specialization"""
+
+    @staticmethod
+    def build_for_export(file_data):
+        """
+        Build data for export from JPG file
+        :param file_data: BinaryData with file data
+        :return: SubfileData with processed data
+        """
+        result = SubfileData()
+        result.binary_data = file_data.cut_data(24)
+        result.options["ext"] = ".jpg"
+        return result
+
+    @staticmethod
+    def build_for_import(old_data, data):
+        """
+        Build data for import to JPG file
+        :param old_data: BinaryData with old data
+        :param data: SubfileData with new data
+        :return: BinaryData with processed data
+        """
+        file_size = BinaryData.from_number(4, data.binary_data.size())
+        return old_data.cut_data(0, 20) + file_size + data.binary_data

{turbine_lib-0.1.5 → turbine_lib-0.1.7}/turbine_lib/subfile.py

@@ -39,6 +39,7 @@ def file_type_from_file_contents(file_id, file_data):
     # jpeg / dds check
     if (file_id >> 24) == 0x41:
         soi = file_data.to_number(2, 24)
+
         # long long marker = file_data.ToNumber<2>(26)
 
         # auto markerSize = header.ToNumber<short>(28)

{turbine_lib-0.1.5 → turbine_lib-0.1.7}/turbine_lib.egg-info/PKG-INFO

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

{turbine_lib-0.1.5 → turbine_lib-0.1.7}/turbine_lib.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ turbine_lib/datfile.py
 turbine_lib/ddssubfile.py
 turbine_lib/font_convert.py
 turbine_lib/fontsubfile.py
+turbine_lib/jpgsubfile.py
 turbine_lib/subfile.py
 turbine_lib/subfiledata.py
 turbine_lib/textsubfile.py