Link to audio files and those with custom folders properly

5 files changed, 39 insertions, 19 deletions

diff --git a/app/main.py b/app/main.py
index de13f1e..d70d360 100644
--- a/app/main.py
+++ b/app/main.py
@@ -150,6 +150,7 @@ if config.URL_PREFIX != '/':
 

 routes.static(config.URL_PREFIX + 'favicon/', 'favicon')

 routes.static(config.URL_PREFIX + 'download/', config.DOWNLOAD_DIR)

+routes.static(config.URL_PREFIX + 'audio_download/', config.AUDIO_DOWNLOAD_DIR)

 routes.static(config.URL_PREFIX, 'ui/dist/metube')

 try:

     app.add_routes(routes)

diff --git a/app/ytdl.py b/app/ytdl.py
index 4329147..b7a0f41 100644
--- a/app/ytdl.py
+++ b/app/ytdl.py
@@ -208,7 +208,7 @@ class DownloadQueue:
             **self.config.YTDL_OPTIONS,

         }).extract_info(url, download=False)

 

-    async def __add_entry(self, entry, quality, format, already, folder=None):

+    async def __add_entry(self, entry, quality, format, folder, already):

         etype = entry.get('_type') or 'video'

         if etype == 'playlist':

             entries = entry['entries']

@@ -221,7 +221,7 @@ class DownloadQueue:
                 for property in ("id", "title", "uploader", "uploader_id"):

                     if property in entry:

                         etr[f"playlist_{property}"] = entry[property]

-                results.append(await self.__add_entry(etr, quality, format, already, folder=folder))

+                results.append(await self.__add_entry(etr, quality, format, folder, already))

             if any(res['status'] == 'error' for res in results):

                 return {'status': 'error', 'msg': ', '.join(res['msg'] for res in results if res['status'] == 'error' and 'msg' in res)}

             return {'status': 'ok'}

@@ -252,10 +252,10 @@ class DownloadQueue:
                 await self.notifier.added(dl)

             return {'status': 'ok'}

         elif etype.startswith('url'):

-            return await self.add(entry['url'], quality, format, already, folder=folder)

+            return await self.add(entry['url'], quality, format, folder, already)

         return {'status': 'error', 'msg': f'Unsupported resource "{etype}"'}

 

-    async def add(self, url, quality, format, already=None, folder=None):

+    async def add(self, url, quality, format, folder, already=None):

         log.info(f'adding {url}: {quality=} {format=} {already=} {folder=}')

         already = set() if already is None else already

         if url in already:

@@ -267,7 +267,7 @@ class DownloadQueue:
             entry = await asyncio.get_running_loop().run_in_executor(None, self.__extract_info, url)

         except yt_dlp.utils.YoutubeDLError as exc:

             return {'status': 'error', 'msg': str(exc)}

-        return await self.__add_entry(entry, quality, format, already, folder=folder)

+        return await self.__add_entry(entry, quality, format, folder, already)

 

     async def cancel(self, ids):

         for id in ids:

diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index 23dccce..4ca9a07 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -129,11 +129,11 @@
             <fa-icon *ngIf="download.value.status == 'finished'" [icon]="faCheckCircle" style="color: green;"></fa-icon>
             <fa-icon *ngIf="download.value.status == 'error'" [icon]="faTimesCircle" style="color: red;"></fa-icon>
           </div>
-          <span ngbTooltip="{{download.value.msg}}"><a *ngIf="!!download.value.filename; else noDownloadLink" href="download/{{download.value.filename | encodeURIComponent}}" target="_blank">{{ download.value.title }}</a></span>
+          <span ngbTooltip="{{download.value.msg}}"><a *ngIf="!!download.value.filename; else noDownloadLink" href="{{buildDownloadLink(download.value)}}" target="_blank">{{ download.value.title }}</a></span>
           <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.url, 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, download.value.folder)"><fa-icon [icon]="faRedoAlt"></fa-icon></button>
         </td>
         <td>
           <a href="{{download.value.url}}" target="_blank"><fa-icon [icon]="faExternalLinkAlt"></fa-icon></a>
diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
index cdcd8f6..97ff020 100644
--- a/ui/src/app/app.component.ts
+++ b/ui/src/app/app.component.ts
@@ -4,7 +4,7 @@ import { faRedoAlt, faSun, faMoon, faExternalLinkAlt } from '@fortawesome/free-s
 import { CookieService } from 'ngx-cookie-service';
 import { map, Observable, of } from 'rxjs';
 
-import { DownloadsService, Status } from './downloads.service';
+import { Download, DownloadsService, Status } from './downloads.service';
 import { MasterCheckboxComponent } from './master-checkbox.component';
 import { Formats, Format, Quality } from './formats';
 
@@ -89,15 +89,19 @@ export class AppComponent implements AfterViewInit {
     return this.downloads.configuration['CREATE_DIRS'] == 'true';
   }
 
+  isAudioType() {
+    return this.quality == 'audio' || this.format == 'mp3';
+  }
+
   getMatchingCustomDir() : Observable<string[]> {
     return this.downloads.customDirsChanged.asObservable().pipe(map((output) => {
       // Keep logic consistent with app/ytdl.py
-      if (this.quality != 'audio' && this.format != 'mp3') {
-        console.debug("Showing default download directories");
-        return output["download_dir"];
-      } else {
+      if (this.isAudioType()) {
         console.debug("Showing audio-specific download directories");
         return output["audio_download_dir"];
+      } else {
+        console.debug("Showing default download directories");
+        return output["download_dir"];
       }
     }));
   }
@@ -146,13 +150,14 @@ export class AppComponent implements AfterViewInit {
     this.quality = exists ? this.quality : 'best'
   }
 
-  addDownload(url?: string, quality?: string, format?: string) {
+  addDownload(url?: string, quality?: string, format?: string, folder?: string) {
     url = url ?? this.addUrl
     quality = quality ?? this.quality
     format = format ?? this.format
+    folder = folder ?? this.folder
 
     this.addInProgress = true;
-    this.downloads.add(url, quality, format).subscribe((status: Status) => {
+    this.downloads.add(url, quality, format, folder).subscribe((status: Status) => {
       if (status.status === 'error') {
         alert(`Error adding URL: ${status.msg}`);
       } else {
@@ -162,8 +167,8 @@ export class AppComponent implements AfterViewInit {
     });
   }
 
-  retryDownload(key: string, url: string, quality: string, format: string) {
-    this.addDownload(url, quality, format);
+  retryDownload(key: string, url: string, quality: string, format: string, folder: string) {
+    this.addDownload(url, quality, format, folder);
     this.downloads.delById('done', [key]).subscribe();
   }
 
@@ -182,4 +187,17 @@ export class AppComponent implements AfterViewInit {
   clearFailedDownloads() {
     this.downloads.delByFilter('done', dl => dl.status === 'error').subscribe();
   }
+
+  buildDownloadLink(download: Download) {
+    let baseDir = 'download/';
+    if (download.quality == 'audio' || download.filename.endsWith('.mp3')) {
+      baseDir = 'audio_download/';
+    }
+
+    if (download.folder) {
+      baseDir += download.folder + '/';
+    }
+
+    return baseDir + encodeURIComponent(download.filename);
+  }
 }
diff --git a/ui/src/app/downloads.service.ts b/ui/src/app/downloads.service.ts
index a2ea912..77d2fed 100644
--- a/ui/src/app/downloads.service.ts
+++ b/ui/src/app/downloads.service.ts
@@ -9,13 +9,14 @@ export interface Status {
   msg?: string;
 }
 
-interface Download {
+export interface Download {
   id: string;
   title: string;
   url: string,
   status: string;
   msg: string;
   filename: string;
+  folder: string;
   quality: string;
   percent: number;
   speed: number;
@@ -96,8 +97,8 @@ export class DownloadsService {
     return of({status: 'error', msg: msg})
   }
 
-  public add(url: string, quality: string, format: string) {
-    return this.http.post<Status>('add', {url: url, quality: quality, format: format}).pipe(
+  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(
       catchError(this.handleHTTPError)
     );
   }