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

Move file open() to executor job #123

Merged
merged 1 commit into from
Jun 11, 2024
Merged

Move file open() to executor job #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 19 additions & 16 deletions custom_components/openhasp/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,15 +344,15 @@ def __init__(self, hass, config, entry):

self._subscriptions = []

with open(
pathlib.Path(__file__).parent.joinpath("pages_schema.json"), "r"
) as schema_file:
self.json_schema = json.load(schema_file)

self._attr_unique_id = entry.data[CONF_HWID]
self._attr_name = entry.data[CONF_NAME]
self._attr_icon = "mdi:gesture-tap-box"

def _read_file(self, path):
"""Executor helper to read file."""
with open(path, "r") as src_file:
return src_file.read()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might this be the culprit for #136? Previously, the file handle returned by open was directly passed into send_lines. I presume, iterating over this handle yields lines, whereas read yields a string. And iterating over the string yields single characters. Maybe?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't think soo... it was and still is processed by json.load()


@property
def state(self):
"""Return the state of the component."""
Expand All @@ -377,6 +377,9 @@ async def async_added_to_hass(self):
"""Run when entity about to be added."""
await super().async_added_to_hass()

schema_file_contents = await self.hass.async_add_executor_job(self._read_file, pathlib.Path(__file__).parent.joinpath("pages_schema.json"))
self.json_schema = json.loads(schema_file_contents)

state = await self.async_get_last_state()
if state and state.state not in [STATE_UNAVAILABLE, STATE_UNKNOWN, None]:
self._page = int(state.state)
Expand Down Expand Up @@ -650,17 +653,17 @@ async def send_lines(lines):
)

try:
with open(path, "r") as pages_file:
if path.endswith(".json"):
json_data = json.load(pages_file)
jsonschema.validate(instance=json_data, schema=self.json_schema)
lines = []
for item in json_data:
if isinstance(item, dict):
lines.append(json.dumps(item) + "\n")
await send_lines(lines)
else:
await send_lines(pages_file)
pages_file = await self.hass.async_add_executor_job(self._read_file, path)
if path.endswith(".json"):
json_data = json.load(pages_file)
jsonschema.validate(instance=json_data, schema=self.json_schema)
lines = []
for item in json_data:
if isinstance(item, dict):
lines.append(json.dumps(item) + "\n")
await send_lines(lines)
else:
await send_lines(pages_file)
await self.refresh()

except (IndexError, FileNotFoundError, IsADirectoryError, UnboundLocalError):
Expand Down
Loading