koro 2.0.1__tar.gz → 2.0.3rc1__tar.gz

{koro-2.0.1/src/koro.egg-info → koro-2.0.3rc1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: koro
-Version: 2.0.1
+Version: 2.0.3rc1
 Summary: Tools for manipulating levels made in Marble Saga: Kororinpa
 Home-page: https://github.com/DigitalDetective47/koro
 Author: DigitalDetective47
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: File Formats
 Classifier: Topic :: Games/Entertainment
 Classifier: Typing :: Typed

{koro-2.0.1 → koro-2.0.3rc1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = koro
-version = 2.0.1
+version = 2.0.3rc1
 author = DigitalDetective47
 author_email = ninji2701@gmail.com
 description = Tools for manipulating levels made in Marble Saga: Kororinpa
@@ -18,6 +18,7 @@ classifiers =
 	Programming Language :: Python :: 3 :: Only
 	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: 3.12
+	Programming Language :: Python :: 3.13
 	Topic :: File Formats
 	Topic :: Games/Entertainment
 	Typing :: Typed
@@ -31,6 +32,10 @@ python_requires = >=3.11
 [options.packages.find]
 where = src
 
+[options.package_data]
+koro = 
+	py.typed
+
 [egg_info]
 tag_build = 
 tag_date = 0

{koro-2.0.1 → koro-2.0.3rc1}/src/koro/slot/bin.py

@@ -5,7 +5,6 @@ from ..stage import Stage
 from .file import FileSlot
 from .xml import XmlSlot
 
-
 __all__ = ["BinSlot"]
 
 

{koro-2.0.1 → koro-2.0.3rc1}/src/koro/slot/save.py

@@ -1,12 +1,11 @@
+from collections.abc import Mapping, Sequence
 from enum import Enum, unique
 from io import BytesIO
 from operator import index as ix
 from os.path import basename, dirname, join
-from typing import TYPE_CHECKING, Annotated, Any, Literal, SupportsIndex
-from collections.abc import Mapping, Sequence
+from typing import TYPE_CHECKING, Annotated, Any, Final, Literal, SupportsIndex
 
 from ..stage import Stage
-
 from . import Slot
 from .xml import XmlSlot
 
@@ -18,6 +17,8 @@ else:
 
 __all__ = ["EditorPage", "get_slots", "SaveSlot"]
 
+_SIZE_LIMIT: Final[int] = 156864
+
 
 @unique
 class EditorPage(Enum):
@@ -30,7 +31,7 @@ class SaveSlot(Slot):
     __match_args__ = ("path", "page", "index")
     __slots__ = ("_offset", "_path")
 
-    _offset: Literal[8, 156392, 312776, 469160]
+    _offset: Literal[8, 156872, 313736, 470600]
     _path: str | bytes
 
     def __init__(
@@ -45,8 +46,8 @@ class SaveSlot(Slot):
         ],
     ) -> None:
         index = ix(index) - 1
-        if index in range(0, 20):
-            self._offset = 8 + 156864 * (index & 3)  # type: ignore[assignment]
+        if index in range(20):
+            self._offset = 8 + _SIZE_LIMIT * (index & 3)  # type: ignore[assignment]
             self._path = join(path, f"ed{(index >> 2) + 5 * page.value:02}.dat")  # type: ignore[arg-type]
         else:
             raise ValueError("index must be between 1 and 20")
@@ -72,7 +73,7 @@ class SaveSlot(Slot):
     def index(
         self,
     ) -> Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]:
-        return (int(basename(self._path)[2:4]) % 5 >> 2 | self._offset // 156864) + 1  # type: ignore[return-value]
+        return (int(basename(self._path)[2:4]) % 5 >> 2 | self._offset // _SIZE_LIMIT) + 1  # type: ignore[return-value]
 
     def load(self) -> Stage | None:
         try:
@@ -82,11 +83,8 @@ class SaveSlot(Slot):
                     block: bytearray = bytearray()
                     while True:
                         block.clear()
-                        block.extend(f.read1())
-                        print(block)
-                        if len(b.getbuffer()) + len(block) > 156864:
-                            del block[156864 - len(b.getbuffer()) :]
-                        if block[-1]:
+                        block.extend(f.read1(_SIZE_LIMIT - len(b.getbuffer())))
+                        if block and block[-1]:
                             b.write(block)
                         else:
                             while block:
@@ -116,11 +114,13 @@ class SaveSlot(Slot):
 
     def save(self, data: Stage | None) -> None:
         binary: bytes = b"" if data is None else XmlSlot.serialize(data)
-        if len(binary) > 156864:
+        if len(binary) > _SIZE_LIMIT:
             raise ValueError("serialized stage data is too large to save")
         try:
             with open(self._path, "xb") as f:
-                f.write(bytes(638976))
+                f.write(
+                    bytes(638976)
+                )  # Weird. Would expect this to be 627464 (8 + 4 * (_SIZE_LIMIT))
             if data is None:
                 return
         except FileExistsError:
@@ -128,7 +128,7 @@ class SaveSlot(Slot):
         with open(self._path, "r+b") as f:
             f.seek(self._offset)
             f.write(binary)
-            f.write(bytes(156864 - len(binary)))
+            f.write(bytes(_SIZE_LIMIT - len(binary)))
 
 
 def get_slots(save: StrOrBytesPath, /) -> Mapping[EditorPage, Sequence[SaveSlot]]:

{koro-2.0.1 → koro-2.0.3rc1}/src/koro/stage/model.py

@@ -1,7 +1,6 @@
 from enum import Enum, unique
 from typing import TypeAlias
 
-
 __all__ = ["DecorationModel", "DeviceModel", "Model", "PartModel"]
 
 

{koro-2.0.1 → koro-2.0.3rc1}/src/koro/stage/part.py

@@ -2,14 +2,13 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from collections.abc import Iterable, MutableSequence
-from enum import Enum, unique, Flag
+from enum import Enum, Flag, unique
 from operator import index
 from sys import maxsize
 from typing import Any, Final, Iterator, Literal, Self, SupportsIndex, overload
 
 from .model import DecorationModel, DeviceModel, PartModel
 
-
 __all__ = [
     "Ant",
     "BasePart",

{koro-2.0.1 → koro-2.0.3rc1/src/koro.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: koro
-Version: 2.0.1
+Version: 2.0.3rc1
 Summary: Tools for manipulating levels made in Marble Saga: Kororinpa
 Home-page: https://github.com/DigitalDetective47/koro
 Author: DigitalDetective47
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: File Formats
 Classifier: Topic :: Games/Entertainment
 Classifier: Typing :: Typed

{koro-2.0.1 → koro-2.0.3rc1}/src/koro.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 setup.cfg
 src/koro/__init__.py
+src/koro/py.typed
 src/koro.egg-info/PKG-INFO
 src/koro.egg-info/SOURCES.txt
 src/koro.egg-info/dependency_links.txt

{koro-2.0.1 → koro-2.0.3rc1}/src/koro/slot/xml.py

@@ -12,7 +12,6 @@ from ..stage.part import (
     BasePart,
     BlinkingTile,
     Bumper,
-    TextBox,
     Cannon,
     ConveyorBelt,
     DashTunnel,
@@ -41,6 +40,7 @@ from ..stage.part import (
     Speed,
     Spring,
     Start,
+    TextBox,
     Thorn,
     TimedDevice,
     ToyTrain,