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

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

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

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

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

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

@@ -5,7 +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.subfile import string_from_file_type, file_type_from_file_contents, FILE_TYPE
+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
 
@@ -289,6 +289,8 @@ class DatFile:
         elif ext == ".fontbin":
             for_import = SubfileFONT.build_for_import(old_data, outer_data)
             return for_import
+        elif ext == ".subfile":
+            return outer_data.binary_data
         # Add other file types as needed
         else:
             # Default implementation for unknown types

{turbine_lib-0.1.3 → turbine_lib-0.1.5}/turbine_lib/font_convert.py

@@ -285,8 +285,8 @@ class DestFontInfo:
         #     self.Charset -= 65536
         self.CharsCount = info.CharsCount
         self.Padding = int(info.Padding.Left) & 0xFF  # byte
-        self.ScaleW = info.FontSize  # 新增：用于作为width
-        self.ScaleH = info.FontSize  # 新增：用于作为height
+        self.ScaleW = self.FontSize  # 新增：用于作为width
+        self.ScaleH = self.FontSize  # 新增：用于作为height
 
         self.Chars = []
         for i in range(self.CharsCount):
@@ -306,8 +306,8 @@ class DestFontInfo:
         with open(path, 'wb') as fs:
             # 写入头部数据 - 根据新格式调整
             fs.write(struct.pack('<I', 0))  # masterFileID
-            fs.write(struct.pack('<I', self.ScaleW))  # width
-            fs.write(struct.pack('<I', self.ScaleH))  # height
+            fs.write(struct.pack('<I', self.FontSize))  # width
+            fs.write(struct.pack('<I', self.FontSize))  # height
             fs.write(struct.pack('<I', self.CharsCount))  # CharsCount
 
             # 写入字符信息 - 根据新格式调整

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

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