Skip to content

Commit

Permalink
Fix version setter
Browse files Browse the repository at this point in the history
  • Loading branch information
kg583 committed Jan 7, 2025
1 parent f2de4ca commit 20ea804
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions tivars/types/group.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def group(entries: Sequence[TIEntry], *, name: str = "GROUP") -> 'TIGroup':
warn("Groups are expected to have at least two entries.",
UserWarning)

group = TIGroup(for_flash=entries[0].meta_length > TIEntry.base_meta_length, name=name)
group = TIGroup(for_flash=bool(entries[0].flash_bytes), name=name)

for index, entry in enumerate(entries):
name = entry.raw.name.rstrip(b'\x00')
Expand Down Expand Up @@ -139,7 +139,7 @@ def ungroup(self, data: bytes = None) -> list[TIEntry]:
*_, page = data.read(3)
name = data.read(3)

entry = TIEntry(for_flash=self.meta_length > TIEntry.base_meta_length, version=version, archived=page > 0)
entry = TIEntry(for_flash=bool(self.flash_bytes), version=version, archived=page > 0)
entry.type_id = type_id
entry.coerce()

Expand Down
2 changes: 1 addition & 1 deletion tivars/types/list.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def list(self) -> list[_E]:
"""

it = zip(*[iter(self.data)] * self._E.min_data_length)
return [self._E(for_flash=self.meta_length > TIEntry.base_meta_length, data=data) for data in it]
return [self._E(for_flash=bool(self.flash_bytes), data=data) for data in it]

@Loader[str]
def load_string(self, string: str):
Expand Down
2 changes: 1 addition & 1 deletion tivars/types/matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def matrix(self) -> list[list[RealEntry]]:
"""

it = zip(*[iter(self.data)] * RealEntry.min_data_length)
return [[RealEntry(for_flash=self.meta_length > TIEntry.base_meta_length, data=data)
return [[RealEntry(for_flash=bool(self.flash_bytes), data=data)
for data in row] for row in zip(*[it] * self.width)]

@Loader[str]
Expand Down
4 changes: 3 additions & 1 deletion tivars/var.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ def __init__(self, init=None, *,
self.type_id = self._type_id if self._type_id is not None else 0xFF
self.name = name
self.archived = archived or False
self.version = version or 0x00

if not for_flash:
if version is not None or archived is not None:
Expand All @@ -384,7 +385,8 @@ def __init__(self, init=None, *,
else:
self.load(init)

self.version = self.get_version()
if version is None:
self.version = self.get_version()

def __bool__(self) -> bool:
"""
Expand Down

0 comments on commit 20ea804

Please sign in to comment.