From 4d9e8a788a5149948c47f9c0a9bd652b11bd4a52 Mon Sep 17 00:00:00 2001 From: j Date: Sun, 28 Aug 2016 15:53:20 +0200 Subject: [PATCH] add task for queued downloads --- pandora/archive/views.py | 2 ++ pandora/taskqueue/models.py | 2 ++ pandora/taskqueue/views.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora/archive/views.py b/pandora/archive/views.py index 93cfdb9a..ea2aa074 100644 --- a/pandora/archive/views.py +++ b/pandora/archive/views.py @@ -780,6 +780,8 @@ def addMediaUrl(request, data): response = json_response(status=403, text='permission denied') else: response = json_response() + i = Item.objects.get(public_id=data['item']) + Tasks.start(i, request.user) t = tasks.download_media.delay(data['item'], data['url']) response['data']['taskId'] = t.task_id add_changelog(request, data, data['item']) diff --git a/pandora/taskqueue/models.py b/pandora/taskqueue/models.py index 3f1810a8..546ccf5f 100644 --- a/pandora/taskqueue/models.py +++ b/pandora/taskqueue/models.py @@ -91,6 +91,8 @@ class Task(models.Model): status = 'failed' elif self.item.rendered: status = 'finished' + elif not self.item.files.count(): + status = 'queued' else: status = 'unknown' if status != self.status: diff --git a/pandora/taskqueue/views.py b/pandora/taskqueue/views.py index bc55d3dd..c765f35b 100644 --- a/pandora/taskqueue/views.py +++ b/pandora/taskqueue/views.py @@ -21,7 +21,7 @@ def getTasks(request, data): [{ started: 0, finished: 0, - status: 'queued|uploading|processing|finished|failed|cancelled', + status: 'pending|uploading|queued|processing|finished|failed|cancelled', title: '', item: 'itemID', id: 'taskID'