Skip to content

feat: add check for broken watchers every 5 minutes #111

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: add check for broken watchers every 5 minutes #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c849c9
build(deps): Update python version to 3.9 and update pyqt6
RTnhN Mar 3, 2025
4c44b86
feat: add check for broken watchers every 5 min
RTnhN Mar 3, 2025
a2b8368
fix: change oneshot timers to interval timers
RTnhN Mar 5, 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
24 changes: 15 additions & 9 deletions aw_qt/trayicon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,22 +154,28 @@ def rebuild_modules_menu() -> None:
action.setChecked(alive)
# print(module.text(), alive)

# TODO: Do it in a better way, singleShot isn't pretty...
QtCore.QTimer.singleShot(2000, rebuild_modules_menu)

QtCore.QTimer.singleShot(2000, rebuild_modules_menu)

def check_module_status() -> None:
unexpected_exits = self.manager.get_unexpected_stops()
if unexpected_exits:
for module in unexpected_exits:
show_module_failed_dialog(module)
module.stop()

# TODO: Do it in a better way, singleShot isn't pretty...
QtCore.QTimer.singleShot(2000, rebuild_modules_menu)

QtCore.QTimer.singleShot(2000, check_module_status)
# Initial check since interval check will be much later
INITIAL_MODULE_CHECK_INTERVAL = 2000 # 2 seconds
QtCore.QTimer.singleShot(INITIAL_MODULE_CHECK_INTERVAL, check_module_status)

REBUILD_INTERVAL = 2000 # 2 seconds
self.rebuild_timer = QtCore.QTimer(self)
self.rebuild_timer.setInterval(REBUILD_INTERVAL)
self.rebuild_timer.timeout.connect(rebuild_modules_menu)
self.rebuild_timer.start()

DEAD_MODULE_CHECK_INTERVAL = 1000 * 60 * 5 # 5 minutes
self.status_timer = QtCore.QTimer(self)
self.status_timer.setInterval(DEAD_MODULE_CHECK_INTERVAL)
self.status_timer.timeout.connect(check_module_status)
self.status_timer.start()

def _build_modulemenu(self, moduleMenu: QMenu) -> None:
moduleMenu.clear()
Expand Down
134 changes: 54 additions & 80 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages = [
aw-qt = "aw_qt:main"

[tool.poetry.dependencies]
python = "^3.8,<3.14" # PyInstaller needs <3.14
python = "^3.9,<3.14" # PyInstaller needs <3.14
aw-core = "^0.5"

pyobjc-framework-Cocoa = { version = "*", platform = "darwin" }
Expand All @@ -28,8 +28,8 @@ setuptools = "*"

[tool.poetry.group.pyqt.dependencies]
# keep these in sync
PyQt6 = "6.5.3"
PyQt6-Qt6 = "6.5.3"
PyQt6 = "6.8.1"
PyQt6-Qt6 = "6.8.1"

[tool.poetry.dev-dependencies]
mypy = "*"
Expand All @@ -39,7 +39,7 @@ pyinstaller = ">=6.6"
types-click = "*"

[tool.mypy]
python_version = 3.8
python_version = 3.9
ignore_missing_imports = true

[[tool.mypy.overrides]]
Expand Down