xorbitlab
/
metube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #99 from Erazor2/RealRetry 

Fixed Retry Button
This commit is contained in:
Alex 2022-01-05 20:59:45 +02:00 committed by GitHub
parent f8ece495a8 57bf8a3f3b
commit 62570a0a40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/app/app.component.html
View File

@ -75,6 +75,7 @@
<th scope="col" style="width: 8rem;">Speed</th> <th scope="col" style="width: 8rem;">Speed</th>
<th scope="col" style="width: 7rem;">ETA</th> <th scope="col" style="width: 7rem;">ETA</th>
<th scope="col" style="width: 2rem;"></th> <th scope="col" style="width: 2rem;"></th>
<th scope="col" style="width: 2rem;"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -87,6 +88,7 @@
<td>{{ download.value.speed | speed }}</td> <td>{{ download.value.speed | speed }}</td>
<td>{{ download.value.eta | eta }}</td> <td>{{ download.value.eta | eta }}</td>
<td><button type="button" class="btn btn-link" (click)="delDownload('queue', download.key)"><fa-icon [icon]="faTrashAlt"></fa-icon></button></td> <td><button type="button" class="btn btn-link" (click)="delDownload('queue', download.key)"><fa-icon [icon]="faTrashAlt"></fa-icon></button></td>
<td><a href="{{download.value.url}}" target="_blank"><fa-icon [icon]="faExternalLinkAlt"></fa-icon></a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -105,6 +107,7 @@
</th> </th>
<th scope="col" style="width: 2rem;"></th> <th scope="col" style="width: 2rem;"></th>
<th scope="col" style="width: 2rem;"></th> <th scope="col" style="width: 2rem;"></th>
<th scope="col" style="width: 2rem;"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -121,7 +124,10 @@
<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.quality)"><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.url, download.value.quality)"><fa-icon [icon]="faRedoAlt"></fa-icon></button>
</td>
<td>
<a href="{{download.value.url}}" target="_blank"><fa-icon [icon]="faExternalLinkAlt"></fa-icon></a>
</td> </td>
<td> <td>
<button type="button" class="btn btn-link" (click)="delDownload('done', download.key)"><fa-icon [icon]="faTrashAlt"></fa-icon></button> <button type="button" class="btn btn-link" (click)="delDownload('done', download.key)"><fa-icon [icon]="faTrashAlt"></fa-icon></button>

7
ui/src/app/app.component.ts
View File

@ -1,6 +1,6 @@
import { Component, ViewChild, ElementRef, AfterViewInit } from '@angular/core'; import { Component, ViewChild, ElementRef, AfterViewInit } from '@angular/core';
import { faTrashAlt, faCheckCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons'; import { faTrashAlt, faCheckCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons';
import { faRedoAlt, faSun, faMoon } from '@fortawesome/free-solid-svg-icons'; import { faRedoAlt, faSun, faMoon, faExternalLinkAlt } from '@fortawesome/free-solid-svg-icons';
import { CookieService } from 'ngx-cookie-service'; import { CookieService } from 'ngx-cookie-service';
import { DownloadsService, Status } from './downloads.service'; import { DownloadsService, Status } from './downloads.service';
@ -34,6 +34,7 @@ export class AppComponent implements AfterViewInit {
faRedoAlt = faRedoAlt; faRedoAlt = faRedoAlt;
faSun = faSun; faSun = faSun;
faMoon = faMoon; faMoon = faMoon;
faExternalLinkAlt = faExternalLinkAlt;
constructor(public downloads: DownloadsService, private cookieService: CookieService) { constructor(public downloads: DownloadsService, private cookieService: CookieService) {
this.format = cookieService.get('metube_format') || 'any'; this.format = cookieService.get('metube_format') || 'any';
@ -129,8 +130,8 @@ export class AppComponent implements AfterViewInit {
}); });
} }
retryDownload(key: string, quality: string, format: string) { retryDownload(key: string, url: string, quality: string, format: string) {
this.addDownload(key, quality, format); this.addDownload(url, quality, format);
this.downloads.delById('done', [key]).subscribe(); this.downloads.delById('done', [key]).subscribe();
} }