Small concurrency and logging fix

ayta/blueprints/admin.py

@@ -209,6 +209,10 @@ def queue():
             get_nosql().queue_emptyQueue()
             flash(f'Queue has been emptied')
             
+        elif task == 'queue-run-once':
+            task =  video_queue.delay()
+            flash(f'Task has been started on the oldest queued item: {task.id}')
+        
         return redirect(url_for('admin.queue'))
         
     endpoints = get_nosql().queue_getEndpoints()
@@ -251,8 +255,6 @@ def workers():
         task = request.form.get('task', None)
         if task == 'test-sleep':
             test_sleep.delay()
-        elif task == 'queue-single':
-            video_queue.delay()
 
     celery = current_app.extensions.get('celery')
     

ayta/nosql.py

@@ -411,14 +411,18 @@ class Mango:
     ##########################################
         
     def queue_insertQueue(self, videoId, endpointId=None):
-        # if no document exists
+        # if already queued
-        if not self.download_queue.count_documents({'id': videoId}) >= 1:
+        if self.download_queue.count_documents({'id': videoId}) >= 1:
+            return False
+        
+        # if already in archive
+        if self.check_exists(videoId):
+            return False
+        
+        # add to queue
         self.download_queue.insert_one({'id': videoId, 'endpoint': endpointId, 'created_time': current_time(object=True), 'status': 'queued'}).inserted_id
         return True
         
-        # key already in queue
-        return False
-        
     def queue_deleteQueue(self, videoId):
         if self.download_queue.delete_one({'id': videoId}):
             return True
@@ -430,13 +434,19 @@ class Mango:
     def queue_emptyQueue(self):
         return self.download_queue.delete_many({})
         
-    def queue_getNext(self, newest=False):
+    def queue_setFailed(self, videoId):
-        sort = []
+        return self.download_queue.update_one({'id': videoId}, {'$set': {'status': 'failed'}})
         
-        if newest:
+    def queue_getNext(self):
-            sort = [( 'created_time', pymongo.DESCENDING )]
+        """ Returns a LIST of queue parameters. Function first checks if ID exists, if so deletes and then checks the next queued until queue is empty (None) or queued id does not exist yet."""
-            
+        while True:
-        return self.download_queue.find_one({}, sort=sort)
+            queueItem = self.download_queue.find_one({'status': 'queued'})
+            if not queueItem:
+                return None
+            elif self.check_exists(queueItem['id']):
+                self.queue_deleteQueue(queueItem['id'])
+            self.download_queue.update_one({'id': queueItem['id']}, {'$set': {'status': 'working'}})
+            return queueItem
         
 ##########################################
 #           HELPER FUNCTIONS             #

ayta/tasks.py

@@ -42,6 +42,7 @@ def video_queue():
         get_nosql().queue_deleteQueue(videoId)
         return True
     else:
+        get_nosql().queue_setFailed(videoId)
         return False
 
 @shared_task()

ayta/templates/admin/queue.html

@@ -29,7 +29,11 @@
           <br>
           <span class="supporting-text">Prunes all deactivated endpoints, but keeps last 3 days</span>
         </form>
-		
+        <form class="mt-4" method="post" onsubmit="return confirm('Are you sure?');">
+          <button class="btn mb-2 green" type="submit" name="task" value="queue-run-once">Download oldest queued</button>
+          <br>
+          <span class="supporting-text">Will download the oldest queued video ID</span>
+        </form>
       </div>
     </div>
   </div>
@@ -149,6 +153,11 @@
               <input type="text" value="{{ id.get('id') }}" name="value" hidden>
               <button class="btn-small waves-effect waves-light" type="submit" name="task" value="delete-queue" title="Delete from queue" {% if id.get('status') != 'queued' %}disabled{% endif %}>🗑️</button>
             </form>
+            <form method="post">
+              <input type="text" value="{{ id.get('id') }}" name="value" hidden>
+              <button class="btn-small waves-effect waves-light" type="submit" name="task" value="run-download" title="Run download task" disabled>⏩</button>
+			  <!-- This function fill not work until the download queue and video download process is rewritten -->
+            </form>
           </td>
           <td>{{ id.get('id') }}</td>
           <td>{{ id.get('endpoint') }}</td>

ayta/templates/admin/workers.html

@@ -16,7 +16,6 @@
 </div>
 <form method="POST">
       <input title="test-sleep" type="submit" value="test-sleep" name="task">
-	  <input title="test-sleep" type="submit" value="queue-single" name="task">
 </form>
 <div class="divider"></div>
 <div class="row">