mirrors/metube
1
0
Fork 0
mirror of https://github.com/alexta69/metube.git synced 2025-04-03 20:27:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #216 from kaytwo/master

Browse source 
unique downloads of identically named videos
This commit is contained in:
Alex 2023-02-04 10:25:18 +02:00 • committed by GitHub
commit 3e6c63646c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/ytdl.py
View file

@ -170,7 +170,7 @@ class PersistentQueue:
return sorted(shelf.items(), key=lambda item: item[1].timestamp) return sorted(shelf.items(), key=lambda item: item[1].timestamp)
def put(self, value): def put(self, value):
key = value.info.id key = value.info.url
self.dict[key] = value self.dict[key] = value
with shelve.open(self.path, 'w') as shelf: with shelve.open(self.path, 'w') as shelf:
shelf[key] = value.info shelf[key] = value.info

12
ui/src/app/downloads.service.ts
View file

@ -52,20 +52,20 @@ export class DownloadsService {
}); });
socket.fromEvent('added').subscribe((strdata: string) => { socket.fromEvent('added').subscribe((strdata: string) => {
let data: Download = JSON.parse(strdata); let data: Download = JSON.parse(strdata);
this.queue.set(data.id, data); this.queue.set(data.url, data);
this.queueChanged.next(null); this.queueChanged.next(null);
}); });
socket.fromEvent('updated').subscribe((strdata: string) => { socket.fromEvent('updated').subscribe((strdata: string) => {
let data: Download = JSON.parse(strdata); let data: Download = JSON.parse(strdata);
let dl: Download = this.queue.get(data.id); let dl: Download = this.queue.get(data.url);
data.checked = dl.checked; data.checked = dl.checked;
data.deleting = dl.deleting; data.deleting = dl.deleting;
this.queue.set(data.id, data); this.queue.set(data.url, data);
}); });
socket.fromEvent('completed').subscribe((strdata: string) => { socket.fromEvent('completed').subscribe((strdata: string) => {
let data: Download = JSON.parse(strdata); let data: Download = JSON.parse(strdata);
this.queue.delete(data.id); this.queue.delete(data.url);
this.done.set(data.id, data); this.done.set(data.url, data);
this.queueChanged.next(null); this.queueChanged.next(null);
this.doneChanged.next(null); this.doneChanged.next(null);
}); });
@ -110,7 +110,7 @@ export class DownloadsService {
public delByFilter(where: string, filter: (dl: Download) => boolean) { public delByFilter(where: string, filter: (dl: Download) => boolean) {
let ids: string[] = []; let ids: string[] = [];
this[where].forEach((dl: Download) => { if (filter(dl)) ids.push(dl.id) }); this[where].forEach((dl: Download) => { if (filter(dl)) ids.push(dl.url) });
return this.delById(where, ids); return this.delById(where, ids);
} }
} }