hoelee/tubesync
1
0
Fork 0
mirror of https://github.com/meeb/tubesync.git synced 2025-06-22 21:16:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reduce logic and adjust queries

Browse Source
This commit is contained in:
tcely 2025-03-02 00:51:35 -05:00 committed by GitHub
parent 3abb29e9db
commit e604a5e242
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tubesync/sync/views.py
View File

@ -796,11 +796,11 @@ class TasksView(ListView):
data['source'] = self.filter_source data['source'] = self.filter_source
data['running'] = [] data['running'] = []
data['errors'] = [] data['errors'] = []
data['total_errors'] = qs.exclude(last_error='').count() data['total_errors'] = qs.filter(attempts__gt=0, locked_by__isnull=True).count()
data['scheduled'] = [] data['scheduled'] = []
data['total_scheduled'] = qs.filter(locked_at__isnull=True).count() data['total_scheduled'] = qs.filter(locked_by__isnull=True).count()
for task in qs.filter(locked_at__isnull=False): for task in qs.filter(locked_by__isnull=False):
# There was broken logic in `Task.objects.locked()`, work around it. # There was broken logic in `Task.objects.locked()`, work around it.
# With that broken logic, the tasks never resume properly. # With that broken logic, the tasks never resume properly.
# This check unlocks the tasks without a running process. # This check unlocks the tasks without a running process.
@ -808,11 +808,15 @@ class TasksView(ListView):
# - `True`: locked and PID exists # - `True`: locked and PID exists
# - `False`: locked and PID does not exist # - `False`: locked and PID does not exist
# - `None`: not `locked_by`, so there was no PID to check # - `None`: not `locked_by`, so there was no PID to check
if task.locked_by_pid_running() is False: locked_by_pid_running = task.locked_by_pid_running()
if locked_by_pid_running is False:
task.locked_by = None task.locked_by = None
# do not wait for the task to expire # do not wait for the task to expire
task.locked_at = None task.locked_at = None
task.save() task.save()
continue
elif not locked_by_pid_running:
continue
obj, url = map_task_to_instance(task) obj, url = map_task_to_instance(task)
if not obj: if not obj:
# Orphaned task, ignore it (it will be deleted when it fires) # Orphaned task, ignore it (it will be deleted when it fires)
@ -820,26 +824,14 @@ class TasksView(ListView):
setattr(task, 'instance', obj) setattr(task, 'instance', obj)
setattr(task, 'url', url) setattr(task, 'url', url)
setattr(task, 'run_now', task.run_at < now) setattr(task, 'run_now', task.run_at < now)
if task.locked_by_pid_running():
data['running'].append(task) data['running'].append(task)
elif task.has_error():
error_message = get_error_message(task)
setattr(task, 'error_message', error_message)
data['errors'].append(task)
else:
data['scheduled'].append(task)
for task in data['tasks']: for task in data['tasks']:
if task in data['running']:
continue
obj, url = map_task_to_instance(task) obj, url = map_task_to_instance(task)
if not obj: if not obj:
continue continue
already_added = (
task in data['running'] or
task in data['errors'] or
task in data['scheduled']
)
if already_added:
continue
setattr(task, 'instance', obj) setattr(task, 'instance', obj)
setattr(task, 'url', url) setattr(task, 'url', url)
setattr(task, 'run_now', task.run_at < now) setattr(task, 'run_now', task.run_at < now)