secstate/vrobbler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[tasks] Remove in-progress tag to stop

Browse Source
This commit is contained in:
Colin Powell
2024-10-15 15:11:03 -04:00
parent b1eac1454b
commit 8fb2fac47f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vrobbler/apps/scrobbles/scrobblers.py
View File

@ -348,11 +348,16 @@ def todoist_scrobble_task(todoist_task: dict, user_id: int) -> Scrobble:
task = Task.find_or_create(title) task = Task.find_or_create(title)
in_progress_scrobble = Scrobble.objects.filter( in_progress_scrobble = Scrobble.objects.filter(
in_progress=True, log__todoist_id=todoist_task.get("todoist_id") in_progress=True,
log__todoist_id=todoist_task.get("todoist_id"),
task=task,
).first() ).first()
if in_progress_scrobble: if in_progress_scrobble:
return in_progress_scrobble return in_progress_scrobble
if "inprogress" not in todoist_task["todoist_label_list"]:
return todoist_scrobble_task_finish(todoist_task, user_id)
# TODO Should use updated_at from TOdoist, but parsing isn't working # TODO Should use updated_at from TOdoist, but parsing isn't working
scrobble_dict = { scrobble_dict = {
"user_id": user_id, "user_id": user_id,

3
vrobbler/apps/tasks/webhooks.py
View File

@ -60,10 +60,9 @@ def todoist_webhook(request):
if not user_id: if not user_id:
user_id = 1 user_id = 1
scrobble = None
if "completed" in todoist_task["todoist_event"]: if "completed" in todoist_task["todoist_event"]:
scrobble = todoist_scrobble_task_finish(todoist_task, user_id) scrobble = todoist_scrobble_task_finish(todoist_task, user_id)
elif "inprogress" in todoist_task["todoist_label_list"]: else:
scrobble = todoist_scrobble_task(todoist_task, user_id) scrobble = todoist_scrobble_task(todoist_task, user_id)
if not scrobble: if not scrobble: