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: fix async request refresh #2353

Merged
merged 6 commits into from
Jul 23, 2024
Merged

fix: fix async request refresh #2353

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e26c338
Add files via upload
danielbrunt57 Jul 22, 2024
99b873e
fix: coordinator "options": incorrect
danielbrunt57 Jul 22, 2024
84e02f9
style: auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 22, 2024
841ac21
Update __init__.py
danielbrunt57 Jul 23, 2024
e33e800
style: auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 23, 2024
92b7b18
Update __init__.py
danielbrunt57 Jul 23, 2024
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
47 changes: 30 additions & 17 deletions custom_components/alexa_media/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
DEFAULT_EXTENDED_ENTITY_DISCOVERY,
DEFAULT_PUBLIC_URL,
DEFAULT_QUEUE_DELAY,
DEFAULT_SCAN_INTERVAL,
DEPENDENT_ALEXA_COMPONENTS,
DOMAIN,
ISSUE_URL,
Expand Down Expand Up @@ -254,8 +255,8 @@ async def login_success(event=None) -> None:
await setup_alexa(hass, config_entry, login_obj)

if not hass.data.get(DATA_ALEXAMEDIA):
_LOGGER.info(STARTUP)
_LOGGER.info("Loaded alexapy==%s", alexapy_version)
_LOGGER.debug(STARTUP)
_LOGGER.debug("Loaded alexapy==%s", alexapy_version)
hass.data.setdefault(
DATA_ALEXAMEDIA, {"accounts": {}, "config_flows": {}, "notify_service": None}
)
Expand Down Expand Up @@ -303,16 +304,21 @@ async def login_success(event=None) -> None:
"second_account_index": 0,
"should_get_network": True,
"options": {
CONF_QUEUE_DELAY: config_entry.options.get(
CONF_INCLUDE_DEVICES: config_entry.data.get(CONF_INCLUDE_DEVICES, ""),
CONF_EXCLUDE_DEVICES: config_entry.data.get(CONF_EXCLUDE_DEVICES, ""),
CONF_QUEUE_DELAY: config_entry.data.get(
CONF_QUEUE_DELAY, DEFAULT_QUEUE_DELAY
),
CONF_PUBLIC_URL: config_entry.options.get(
CONF_SCAN_INTERVAL: config_entry.data.get(
CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
),
CONF_PUBLIC_URL: config_entry.data.get(
CONF_PUBLIC_URL, DEFAULT_PUBLIC_URL
),
CONF_EXTENDED_ENTITY_DISCOVERY: config_entry.options.get(
CONF_EXTENDED_ENTITY_DISCOVERY: config_entry.data.get(
CONF_EXTENDED_ENTITY_DISCOVERY, DEFAULT_EXTENDED_ENTITY_DISCOVERY
),
CONF_DEBUG: config_entry.options.get(CONF_DEBUG, False),
CONF_DEBUG: config_entry.data.get(CONF_DEBUG, False),
},
DATA_LISTENER: [config_entry.add_update_listener(update_listener)],
},
Expand Down Expand Up @@ -813,10 +819,12 @@ async def update_bluetooth_state(login_obj, device_serial):
if bluetooth is not None and "bluetoothStates" in bluetooth:
for b_state in bluetooth["bluetoothStates"]:
if device_serial == b_state["deviceSerialNumber"]:
# _LOGGER.debug("%s: setting value for: %s to %s",
# hide_email(email),
# hide_serial(device_serial),
# hide_serial(b_state))
_LOGGER.debug(
"%s: setting value for: %s to %s",
hide_email(email),
hide_serial(device_serial),
hide_serial(b_state),
)
device["bluetooth_state"] = b_state
return device["bluetooth_state"]
_LOGGER.debug(
Expand Down Expand Up @@ -954,6 +962,7 @@ async def http2_handler(message_obj):
await coord.async_request_refresh()
if serial and serial in existing_serials:
await update_last_called(login_obj, last_called)
_LOGGER.debug("Updating last_called: %s", last_called)
async_dispatcher_send(
hass,
f"{DOMAIN}_{hide_email(email)}"[0:32],
Expand Down Expand Up @@ -1024,8 +1033,9 @@ async def http2_handler(message_obj):
bluetooth_state = await update_bluetooth_state(
login_obj, serial
)
# _LOGGER.debug("bluetooth_state %s",
# hide_serial(bluetooth_state))
_LOGGER.debug(
"bluetooth_state %s", hide_serial(bluetooth_state)
)
if bluetooth_state:
async_dispatcher_send(
hass,
Expand Down Expand Up @@ -1066,7 +1076,7 @@ async def http2_handler(message_obj):
]:
pass
else:
_LOGGER.warning(
_LOGGER.debug(
"Unhandled command: %s with data %s. Please report at %s",
command,
hide_serial(json_payload),
Expand Down Expand Up @@ -1345,19 +1355,22 @@ async def update_listener(hass, config_entry):
for key, old_value in hass.data[DATA_ALEXAMEDIA]["accounts"][email][
"options"
].items():
new_value = config_entry.options.get(key)
new_value = config_entry.data.get(key)
if new_value is not None and new_value != old_value:
hass.data[DATA_ALEXAMEDIA]["accounts"][email]["options"][key] = new_value
_LOGGER.debug(
"Changing option %s from %s to %s",
"Option %s changed from %s to %s",
key,
old_value,
hass.data[DATA_ALEXAMEDIA]["accounts"][email]["options"][key],
)
if key == CONF_EXTENDED_ENTITY_DISCOVERY:
reload_needed = True
reload_needed = True
if reload_needed:
await hass.config_entries.async_reload(config_entry.entry_id)
_LOGGER.debug(
"%s options reloaded",
hass.data[DATA_ALEXAMEDIA]["accounts"][email],
)


async def test_login_status(hass, config_entry, login) -> bool:
Expand Down
Loading