diff options
| author | Alex <alexta69@gmail.com> | 2022-01-05 20:59:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-05 20:59:45 +0200 |
| commit | 62570a0a407eda256adb4afcce44df096a21abc1 (patch) | |
| tree | 2c807701435f2140ee52f3627bfd8da369c5f87c | |
| parent | upgraded yt-dlp (diff) | |
| parent | Updated layout for new Button (diff) | |
| download | metube-62570a0a407eda256adb4afcce44df096a21abc1.tar.gz metube-62570a0a407eda256adb4afcce44df096a21abc1.tar.bz2 metube-62570a0a407eda256adb4afcce44df096a21abc1.zip | |
Merge pull request #99 from Erazor2/RealRetry
Fixed Retry Button
| -rw-r--r-- | ui/src/app/app.component.html | 8 | ||||
| -rw-r--r-- | ui/src/app/app.component.ts | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index cebd97f..f681f79 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -75,6 +75,7 @@ <th scope="col" style="width: 8rem;">Speed</th> <th scope="col" style="width: 7rem;">ETA</th> <th scope="col" style="width: 2rem;"></th> + <th scope="col" style="width: 2rem;"></th> </tr> </thead> <tbody> @@ -87,6 +88,7 @@ <td>{{ download.value.speed | speed }}</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><a href="{{download.value.url}}" target="_blank"><fa-icon [icon]="faExternalLinkAlt"></fa-icon></a></td> </tr> </tbody> </table> @@ -105,6 +107,7 @@ </th> <th scope="col" style="width: 2rem;"></th> <th scope="col" style="width: 2rem;"></th> + <th scope="col" style="width: 2rem;"></th> </tr> </thead> <tbody> @@ -121,7 +124,10 @@ <ng-template #noDownloadLink>{{ download.value.title }}</ng-template> </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> <button type="button" class="btn btn-link" (click)="delDownload('done', download.key)"><fa-icon [icon]="faTrashAlt"></fa-icon></button> diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index 8f7d965..a9b46a3 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -1,6 +1,6 @@ import { Component, ViewChild, ElementRef, AfterViewInit } from '@angular/core'; 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 { DownloadsService, Status } from './downloads.service'; @@ -33,7 +33,8 @@ export class AppComponent implements AfterViewInit { faTimesCircle = faTimesCircle; faRedoAlt = faRedoAlt; faSun = faSun; - faMoon = faMoon; + faMoon = faMoon; + faExternalLinkAlt = faExternalLinkAlt; constructor(public downloads: DownloadsService, private cookieService: CookieService) { this.format = cookieService.get('metube_format') || 'any'; @@ -129,8 +130,8 @@ export class AppComponent implements AfterViewInit { }); } - retryDownload(key: string, quality: string, format: string) { - this.addDownload(key, quality, format); + retryDownload(key: string, url: string, quality: string, format: string) { + this.addDownload(url, quality, format); this.downloads.delById('done', [key]).subscribe(); } |