Skip to content

Don't store plus-device in nodetypes cache #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bouwew merged 7 commits into from
Sep 17, 2025
Merged

Don't store plus-device in nodetypes cache #344

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df02262
Don't store Circle_Plus in nodetypes cache
bouwew Sep 16, 2025
0ce3abe
Adapt testing
bouwew Sep 16, 2025
4692c6a
Break long line
bouwew Sep 16, 2025
ab945ec
Update CHANGELOG
bouwew Sep 16, 2025
af6cd0e
Revert "Adapt testing"
bouwew Sep 16, 2025
aad2fb9
Better test adaptation
bouwew Sep 16, 2025
f86812c
Also block plus-device when reading from cache
bouwew Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion plugwise_usb/network/cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ def nodetypes(self) -> dict[str, NodeType]:
async def save_cache(self) -> None:
"""Save the node information to file."""
cache_data_to_save: dict[str, str] = {
mac: node_type.name for mac, node_type in self._nodetypes.items()
mac: node_type.name
for mac, node_type in self._nodetypes.items()
if node_type.value > 1
}
_LOGGER.debug("Save NodeTypes for %s Nodes", len(cache_data_to_save))
await self.write_cache(
Expand Down
14 changes: 7 additions & 7 deletions tests/test_usb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1704,29 +1704,29 @@ async def makedirs(cache_dir: str, exist_ok: bool) -> None:
await pw_nw_cache.initialize_cache()
# test with invalid data
mock_read_data = [
"0123456789ABCDEF;NodeType.CIRCLE_PLUS",
"0123456789ABCDEF;NodeType.CIRCLE",
"FEDCBA9876543210;None",
]
file_chunks_iter = iter(mock_read_data)
mock_file_stream = MagicMock(readlines=lambda *args, **kwargs: file_chunks_iter)
with patch("aiofiles.threadpool.sync_open", return_value=mock_file_stream):
await pw_nw_cache.restore_cache()
assert pw_nw_cache.nodetypes == {
"0123456789ABCDEF": pw_api.NodeType.CIRCLE_PLUS,
"0123456789ABCDEF": pw_api.NodeType.CIRCLE,
}

# test with valid data
mock_read_data = [
"0123456789ABCDEF;CIRCLE_PLUS",
"FEDCBA9876543210;NodeType.CIRCLE",
"0123456789ABCDEF;NodeType.CIRCLE",
"FEDCBA9876543210;CIRCLE",
"1298347650AFBECD;6",
]
file_chunks_iter = iter(mock_read_data)
mock_file_stream = MagicMock(readlines=lambda *args, **kwargs: file_chunks_iter)
with patch("aiofiles.threadpool.sync_open", return_value=mock_file_stream):
await pw_nw_cache.restore_cache()
assert pw_nw_cache.nodetypes == {
"0123456789ABCDEF": pw_api.NodeType.CIRCLE_PLUS,
"0123456789ABCDEF": pw_api.NodeType.CIRCLE,
"FEDCBA9876543210": pw_api.NodeType.CIRCLE,
"1298347650AFBECD": pw_api.NodeType.SCAN,
}
Expand All @@ -1738,14 +1738,14 @@ async def makedirs(cache_dir: str, exist_ok: bool) -> None:
)
mock_file_stream.writelines.assert_called_with(
[
"0123456789ABCDEF;CIRCLE_PLUS\n",
"0123456789ABCDEF;CIRCLE\n",
"FEDCBA9876543210;CIRCLE\n",
"1298347650AFBECD;SCAN\n",
"1234ABCD4321FEDC;STEALTH\n",
]
)
assert pw_nw_cache.nodetypes == {
"0123456789ABCDEF": pw_api.NodeType.CIRCLE_PLUS,
"0123456789ABCDEF": pw_api.NodeType.CIRCLE,
"FEDCBA9876543210": pw_api.NodeType.CIRCLE,
"1298347650AFBECD": pw_api.NodeType.SCAN,
"1234ABCD4321FEDC": pw_api.NodeType.STEALTH,
Expand Down