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

Fix retry button issues

Browse source 
The arguments passed to retryDownload by the retry button do not match what the function actually expects. This causes downloads to break if a custom folder is set and also causes some settings like format and custom name prefix to be ignored.
This commit is contained in:
James Lyne 2023-08-13 12:24:19 +01:00
parent 8950665f06
commit 262e296783
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ui/src/app/app.component.html
View file

@ -140,7 +140,7 @@
<ng-template #noDownloadLink>{{ download.value.title }}</ng-template> <ng-template #noDownloadLink>{{ download.value.title }}</ng-template>
</td> </td>
<td> <td>
<button *ngIf="download.value.status == 'error'" type="button" class="btn btn-link" (click)="retryDownload(download.key, download.value.url, download.value.quality, download.value.folder)"><fa-icon [icon]="faRedoAlt"></fa-icon></button> <button *ngIf="download.value.status == 'error'" type="button" class="btn btn-link" (click)="retryDownload(download.key, download.value)"><fa-icon [icon]="faRedoAlt"></fa-icon></button>
</td> </td>
<td> <td>
<a *ngIf="!!download.value.filename; else noDownloadLink" href="{{buildDownloadLink(download.value)}}" download><fa-icon [icon]="faDownload"></fa-icon></a> <a *ngIf="!!download.value.filename; else noDownloadLink" href="{{buildDownloadLink(download.value)}}" download><fa-icon [icon]="faDownload"></fa-icon></a>

8
ui/src/app/app.component.ts
View file

@ -37,8 +37,8 @@ export class AppComponent implements AfterViewInit {
faTimesCircle = faTimesCircle; faTimesCircle = faTimesCircle;
faRedoAlt = faRedoAlt; faRedoAlt = faRedoAlt;
faSun = faSun; faSun = faSun;
faMoon = faMoon; faMoon = faMoon;
faDownload = faDownload; faDownload = faDownload;
faExternalLinkAlt = faExternalLinkAlt; faExternalLinkAlt = faExternalLinkAlt;
constructor(public downloads: DownloadsService, private cookieService: CookieService) { constructor(public downloads: DownloadsService, private cookieService: CookieService) {
@ -174,8 +174,8 @@ export class AppComponent implements AfterViewInit {
}); });
} }
retryDownload(key: string, url: string, quality: string, format: string, folder: string, customNamePrefix: string) { retryDownload(key: string, download: Download) {
this.addDownload(url, quality, format, folder, customNamePrefix); this.addDownload(download.url, download.quality, download.format, download.folder, download.custom_name_prefix);
this.downloads.delById('done', [key]).subscribe(); this.downloads.delById('done', [key]).subscribe();
} }

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

@ -12,15 +12,17 @@ export interface Status {
export interface Download { export interface Download {
id: string; id: string;
title: string; title: string;
url: string, url: string;
quality: string;
format: string;
folder: string;
custom_name_prefix: string;
status: string; status: string;
msg: string; msg: string;
filename: string;
folder: string;
quality: string;
percent: number; percent: number;
speed: number; speed: number;
eta: number; eta: number;
filename: string;
checked?: boolean; checked?: boolean;
deleting?: boolean; deleting?: boolean;
} }