enable custom name prefix

This commit is contained in:
hellodword
2023-04-09 11:27:41 +08:00
parent d922970d0c
commit 2ff7b0975a
5 changed files with 34 additions and 22 deletions

View File

@@ -56,9 +56,15 @@
<span class="sr-only">Advanced options</span>
</button>
<div ngbDropdownMenu aria-labelledby="advancedButton" class="dropdown-menu dropdown-menu-end folder-dropdown-menu">
<div class="input-group">
<span class="input-group-text">Download Folder</span>
<ng-select [items]="customDirs$ | async" placeholder="Default" [addTag]="allowCustomDir.bind(this)" addTagText="Create directory" [ngStyle]="{'flex-grow':'1'}" bindLabel="folder" [(ngModel)]="folder" [disabled]="addInProgress || downloads.loading"></ng-select>
<div class="container">
<div class="input-group add-url-component">
<span class="input-group-text">Download Folder</span>
<ng-select [items]="customDirs$ | async" placeholder="Default" [addTag]="allowCustomDir.bind(this)" addTagText="Create directory" [ngStyle]="{'flex-grow':'1'}" bindLabel="folder" [(ngModel)]="folder" [disabled]="addInProgress || downloads.loading"></ng-select>
</div>
<div class="input-group add-url-component">
<span class="input-group-text">Custom Name Prefix</span>
<input type="text" autocomplete="off" spellcheck="false" class="form-control" placeholder="Default" name="customNamePrefix" [(ngModel)]="customNamePrefix" [disabled]="addInProgress || downloads.loading">
</div>
</div>
</div>
</div>

View File

@@ -20,6 +20,7 @@ export class AppComponent implements AfterViewInit {
quality: string;
format: string;
folder: string;
customNamePrefix: string;
addInProgress = false;
darkMode: boolean;
customDirs$: Observable<string[]>;
@@ -154,15 +155,16 @@ export class AppComponent implements AfterViewInit {
this.quality = exists ? this.quality : 'best'
}
addDownload(url?: string, quality?: string, format?: string, folder?: string) {
addDownload(url?: string, quality?: string, format?: string, folder?: string, customNamePrefix?: string) {
url = url ?? this.addUrl
quality = quality ?? this.quality
format = format ?? this.format
folder = folder ?? this.folder
customNamePrefix = customNamePrefix ?? this.customNamePrefix
console.debug('Downloading: url='+url+' quality='+quality+' format='+format+' folder='+folder);
console.debug('Downloading: url='+url+' quality='+quality+' format='+format+' folder='+folder+' customNamePrefix='+customNamePrefix);
this.addInProgress = true;
this.downloads.add(url, quality, format, folder).subscribe((status: Status) => {
this.downloads.add(url, quality, format, folder, customNamePrefix).subscribe((status: Status) => {
if (status.status === 'error') {
alert(`Error adding URL: ${status.msg}`);
} else {
@@ -172,8 +174,8 @@ export class AppComponent implements AfterViewInit {
});
}
retryDownload(key: string, url: string, quality: string, format: string, folder: string) {
this.addDownload(url, quality, format, folder);
retryDownload(key: string, url: string, quality: string, format: string, folder: string, customNamePrefix: string) {
this.addDownload(url, quality, format, folder, customNamePrefix);
this.downloads.delById('done', [key]).subscribe();
}

View File

@@ -97,8 +97,8 @@ export class DownloadsService {
return of({status: 'error', msg: msg})
}
public add(url: string, quality: string, format: string, folder: string) {
return this.http.post<Status>('add', {url: url, quality: quality, format: format, folder: folder}).pipe(
public add(url: string, quality: string, format: string, folder: string, customNamePrefix: string) {
return this.http.post<Status>('add', {url: url, quality: quality, format: format, folder: folder, custom_name_prefix: customNamePrefix}).pipe(
catchError(this.handleHTTPError)
);
}