fixes.

app/src/DataStore.py

@@ -38,12 +38,34 @@ class DataStore:
                 default_ytdl_opts=self.config.ytdl_options,
             )
 
-    def exists(self, key: str) -> bool:
+    def exists(self, key: str = None, url: str = None) -> bool:
-        return key in self.dict
+        if not key and not url:
+            raise KeyError('key or url must be provided')
 
-    def get(self, key: str) -> Download:
+        if key and key in self.dict:
+            return True
+
+        if url:
+            for key in self.dict:
+                if self.dict[key].info.url == url:
+                    return True
+
+        return False
+
+    def get(self, key: str, url: str = None) -> Download:
+        if not key and not url:
+            raise KeyError('key or url must be provided')
+
+        if key and key in self.dict:
             return self.dict[key]
 
+        if url:
+            for key in self.dict:
+                if self.dict[key].info.url == url:
+                    return self.dict[key]
+
+        raise KeyError('key or url not found')
+
     def items(self) -> list[tuple[str, Download]]:
         return self.dict.items()
 

app/src/DownloadQueue.py

@@ -93,8 +93,16 @@ class DownloadQueue:
                 return {'status': 'error', 'msg': ', '.join(res['msg'] for res in results if res['status'] == 'error' and 'msg' in res)}
 
             return {'status': 'ok'}
-        elif etype == 'video' or etype.startswith('url') and 'id' in entry and 'title' in entry:
+        elif (etype == 'video' or etype.startswith('url')) and 'id' in entry and 'title' in entry:
-            if not self.queue.exists(entry['id']):
+
+            if self.done.exists(key=entry['id'], url=entry.get('webpage_url') or entry['url']):
+                item = self.done.get(key=entry['id'], url=entry.get(
+                    'webpage_url') or entry['url'])
+                self.done.clear([item.info._id])
+
+            if self.queue.exists(key=entry['id'], url=entry.get('webpage_url') or entry['url']):
+                return {'status': 'error', 'msg': 'Link already queued for downloading.'}
+
             dl = ItemDTO(
                 id=entry['id'],
                 title=entry['title'],