mirror of
https://github.com/Tzahi12345/YoutubeDL-Material.git
synced 2026-03-29 16:10:56 +03:00
Backend can kick off downloads without using deprecated node-youtube-dl library
Downloads can now be cancelled and better "paused"
This commit is contained in:
@@ -8,6 +8,7 @@ export type Download = {
|
||||
running: boolean;
|
||||
finished: boolean;
|
||||
paused: boolean;
|
||||
cancelled?: boolean;
|
||||
finished_step: boolean;
|
||||
url: string;
|
||||
type: string;
|
||||
|
||||
@@ -69,8 +69,7 @@ export class DownloadsComponent implements OnInit, OnDestroy {
|
||||
tooltip: $localize`Pause`,
|
||||
action: (download: Download) => this.pauseDownload(download),
|
||||
show: (download: Download) => !download.finished && (!download.paused || !download.finished_step),
|
||||
icon: 'pause',
|
||||
loading: (download: Download) => download.paused && !download.finished_step
|
||||
icon: 'pause'
|
||||
},
|
||||
{
|
||||
tooltip: $localize`Resume`,
|
||||
@@ -81,7 +80,7 @@ export class DownloadsComponent implements OnInit, OnDestroy {
|
||||
{
|
||||
tooltip: $localize`Cancel`,
|
||||
action: (download: Download) => this.cancelDownload(download),
|
||||
show: (download: Download) => false && !download.finished && !download.paused, // TODO: add possibility to cancel download
|
||||
show: (download: Download) => !download.finished && !download.paused && !download.cancelled,
|
||||
icon: 'cancel'
|
||||
},
|
||||
{
|
||||
|
||||
@@ -169,6 +169,8 @@ export class MainComponent implements OnInit {
|
||||
argsChangedSubject: Subject<boolean> = new Subject<boolean>();
|
||||
simulatedOutput = '';
|
||||
|
||||
interval_id = null;
|
||||
|
||||
constructor(public postsService: PostsService, private youtubeSearch: YoutubeSearchService, public snackBar: MatSnackBar,
|
||||
private router: Router, public dialog: MatDialog, private platform: Platform, private route: ActivatedRoute) {
|
||||
this.audioOnly = false;
|
||||
@@ -232,11 +234,12 @@ export class MainComponent implements OnInit {
|
||||
}
|
||||
|
||||
// get downloads routine
|
||||
setInterval(() => {
|
||||
if (this.interval_id) { clearInterval(this.interval_id) }
|
||||
this.interval_id = setInterval(() => {
|
||||
if (this.current_download) {
|
||||
this.getCurrentDownload();
|
||||
}
|
||||
}, 500);
|
||||
}, 1000);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -294,6 +297,10 @@ export class MainComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
if (this.interval_id) { clearInterval(this.interval_id) }
|
||||
}
|
||||
|
||||
// download helpers
|
||||
downloadHelper(container: DatabaseFile | Playlist, type: string, is_playlist = false, force_view = false, navigate_mode = false): void {
|
||||
this.downloadingfile = false;
|
||||
|
||||
Reference in New Issue
Block a user