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

Introducing UI update lock. #186

Merged
merged 11 commits into from
Aug 26, 2023
Merged

Introducing UI update lock. #186

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3f773b7
Introducing UI update lock.
RobinTail Aug 16, 2023
502f986
Merge branch 'develop' into ui-update-lock
RobinTail Aug 26, 2023
088a241
Using actual threading Lock.
RobinTail Aug 26, 2023
d820ec8
Fix import order.
RobinTail Aug 26, 2023
952c144
Using lock as a context manager (with).
RobinTail Aug 26, 2023
c9c9c27
Add logging for the lock.
RobinTail Aug 26, 2023
0584f2b
Avoid calling UI update fn from the polling thread when it's already …
RobinTail Aug 26, 2023
1eff7da
Minor: comments.
RobinTail Aug 26, 2023
6474ba1
Update octoprint_octorelay/__init__.py
RobinTail Aug 26, 2023
b17724d
test_input_polling__locked.
RobinTail Aug 26, 2023
4629855
Asserting the released lock in test_update_ui.
RobinTail Aug 26, 2023
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
5 changes: 5 additions & 0 deletions octoprint_octorelay/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def __init__(self):
self.polling_timer = None
self.tasks = [] # of Task
self.model = { index: {} for index in RELAY_INDEXES }
self.ui_update_lock = None

def get_settings_version(self):
return SETTINGS_VERSION
Expand Down Expand Up @@ -262,6 +263,9 @@ def reducer(agg, task):
)

def update_ui(self):
if self.ui_update_lock:
return
RobinTail marked this conversation as resolved.
Show resolved Hide resolved
self.ui_update_lock = True
self._logger.debug("Updating the UI")
settings = self._settings.get([], merged=True) # expensive
upcoming = self.get_upcoming_tasks(filter(
Expand Down Expand Up @@ -291,6 +295,7 @@ def update_ui(self):
}
self._logger.debug(f"The UI feed: {self.model}")
self._plugin_manager.send_plugin_message(self._identifier, self.model)
self.ui_update_lock = None

# pylint: disable=useless-return
def process_at_command(self, _comm, _phase, command, parameters, *args, **kwargs):
Expand Down