mariano/deskmeter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more solid task updating, no need to stop the main loop to avoid race conditions

Browse Source
This commit is contained in:
buenosairesam
2026-01-22 01:38:47 -03:00
parent 88caa3dc96
commit bf7bcbc37a
5 changed files with 277 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
dmapp/dmcore/main.py
View File

@@ -4,11 +4,11 @@ import os
import subprocess
import time
from pprint import pprint
from zoneinfo import ZoneInfo
import state
import task
from config import logger, switches
from zoneinfo import ZoneInfo
desktops = ("Plan", "Think", "Work", "Other", "Away", "Work", "Work", "Work")
unlabeled = "Away"
@@ -39,22 +39,18 @@ def now():
return datetime.datetime.now(ZoneInfo(cfg["timezone"]))
def handle_task_file_changes(current_task):
"""Check if task file changed and update task if needed. Returns (new_task, file_changed)"""
def handle_task_file_changes():
"""Check if task file changed and sync definitions to DB. Does not change current task."""
current_mtime = state.retrieve("current").get("filetime")
file_mtime = task.get_file_mtime(None)
if current_mtime != file_mtime:
task_id = task.read_and_extract(None)
logger.debug(f"task_id:{task_id}")
task.file_to_db(None)
if task_id != current_task:
state.save("current", task=task_id)
current_task = task_id
state.save("current", filetime=file_mtime)
logger.info("Task file changed, definitions synced to DB")
return True # File changed
return current_task, True # File changed
return current_task, False # No change
return False # No change
def update_workspace_state():
@@ -65,14 +61,19 @@ def update_workspace_state():
def enforce_desktop_task(current_workspace, work_desktop_tasks, current_task):
"""Enforce assigned task for work desktops"""
if current_workspace in work_desktop_tasks and work_desktop_tasks[current_workspace]:
"""Enforce assigned task for work desktops. Updates MongoDB state only, never writes to file."""
if (
current_workspace in work_desktop_tasks
and work_desktop_tasks[current_workspace]
):
assigned_task = work_desktop_tasks[current_workspace]
if current_task != assigned_task:
current_task = assigned_task
state.save("current", task=current_task)
task.db_to_file_as_is(None)
logger.debug(
f"Enforced task {assigned_task} for workspace {current_workspace}"
)
return current_task
@@ -121,8 +122,9 @@ def desktop(workspace_index):
return unlabeled
task.read_and_extract(None)
# Sync task definitions from file to DB on startup
task.file_to_db(None)
state.save("current", filetime=task.get_file_mtime(None))
current_workspace = active_workspace()
current_task = state.retrieve("current").get("task")
@@ -144,18 +146,21 @@ while True:
# Load work_desktop_tasks from state
work_desktop_tasks = state.retrieve_desktop_state()
# Handle task file changes
current_task, file_changed = handle_task_file_changes(current_task)
# Sync task definitions if file changed (does not change current task)
handle_task_file_changes()
# Update current task and workspace
# Get current state
current_task = state.retrieve("current").get("task")
current_workspace = update_workspace_state()
# Enforce desktop task assignments (but skip if file just changed - user's manual change takes priority)
if not file_changed:
current_task = enforce_desktop_task(current_workspace, work_desktop_tasks, current_task)
# Enforce work desktop task assignments
current_task = enforce_desktop_task(
current_workspace, work_desktop_tasks, current_task
)
# Track workspace switches
last_switch_time = track_workspace_switch(current_workspace, current_task, last_switch_time)
last_switch_time = track_workspace_switch(
current_workspace, current_task, last_switch_time
)
time.sleep(2)