Skip to content
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

Jump to bottom

Fix autodiscovery for models containing a slash #664

Merged
merged 2 commits into from
Apr 7, 2022
Merged

Fix autodiscovery for models containing a slash #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7bcf5c
Fix autodiscovery for models containing a slash
bramstroker Apr 7, 2022
62c45be
Remove debugging code
bramstroker Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions custom_components/powercalc/light_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def __init__(
self._model = model_parts[0]
self._lut_subdirectory = model_parts[1]

self._model = self._model.replace("#slash#", "/")
self._custom_model_directory = custom_model_directory
self._hass = hass
self._directory: str = None
Expand Down
4 changes: 4 additions & 0 deletions custom_components/powercalc/model_discovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ async def autodiscover_model(
manufacturer = device_entry.manufacturer
if MANUFACTURER_ALIASES.get(manufacturer):
manufacturer = MANUFACTURER_ALIASES.get(manufacturer)

# Make sure we don't have a literal / in model_id, so we don't get issues with sublut directory matching down the road
# See github #658
model_id = model_id.replace("/", "#slash#")

model_info = ModelInfo(manufacturer, model_id)

Expand Down