Merge remote-tracking branch 'upstream/master'

README.md

@@ -49,6 +49,8 @@ Certain values can be set via environment variables, using the `-e` parameter on
   * __Note__: Using a RAM filesystem may prevent downloads from being resumed
 * __DELETE_FILE_ON_TRASHCAN__: if `true`, downloaded files are deleted on the server, when they are trashed from the "Completed" section of the UI. Defaults to `false`.
 * __URL_PREFIX__: base path for the web server (for use when hosting behind a reverse proxy). Defaults to `/`.
+* __PUBLIC_HOST_URL__: base URL for the download links shown in the UI for completed files. By default MeTube serves them under its own URL. If your download directory is accessible on another URL and you want the download links to be based there, use this variable to set it.
+* __PUBLIC_HOST_AUDIO_URL__: same as PUBLIC_HOST_URL but for audio downloads.
 * __OUTPUT_TEMPLATE__: the template for the filenames of the downloaded videos, formatted according to [this spec](https://github.com/yt-dlp/yt-dlp/blob/master/README.md#output-template). Defaults to `%(title)s.%(ext)s`.
 * __OUTPUT_TEMPLATE_CHAPTER__: the template for the filenames of the downloaded videos, when split into chapters via postprocessors. Defaults to `%(title)s - %(section_number)s %(section_title)s.%(ext)s`.
 * __YTDL_OPTIONS__: Additional options to pass to youtube-dl, in JSON format. [See available options here](https://github.com/yt-dlp/yt-dlp/blob/master/yt_dlp/YoutubeDL.py#L183). They roughly correspond to command-line options, though some do not have exact equivalents here, for example `--recode-video` has to be specified via `postprocessors`. Also note that dashes are replaced with underscores.

app/dl_formats.py

@@ -2,6 +2,7 @@
 
 AUDIO_FORMATS = ("m4a", "mp3", "opus", "wav", "flac")
 
+
 def get_format(format: str, quality: str) -> str:
     """
     Returns format for download
@@ -27,10 +28,7 @@ def get_format(format: str, quality: str) -> str:
 
     if format in AUDIO_FORMATS:
         # Audio quality needs to be set post-download, set in opts
-        return "bestaudio/best"
-
-    if format == "thumbnail":
-        return "w/w"
+        return f"bestaudio[ext={format}]/bestaudio/best"
 
     if format in ("mp4", "any"):
         if quality == "audio":
@@ -40,7 +38,13 @@ def get_format(format: str, quality: str) -> str:
         vres = f"[height<={quality}]" if quality != "best" else ""
         vcombo = vres + vfmt
 
-        return f"bestvideo{vcombo}+bestaudio{afmt}/best{vcombo}"
+        # iOS has strict requirements for video files, requiring h264 or h265
+        # video codec and aac audio codec in MP4 container. This format string
+        # attempts to get the fully compatible formats first, then the h264/h265
+        # video codec with any M4A audio codec (because audio is faster to
+        # convert if needed), and falls back to getting the best available MP4
+        # file.
+        return f"bestvideo[vcodec~='^((he|a)vc|h26[45])']{vres}+bestaudio[acodec=aac]/bestvideo[vcodec~='^((he|a)vc|h26[45])']{vres}+bestaudio{afmt}/bestvideo{vcombo}+bestaudio{afmt}/best{vcombo}"
 
     raise Exception(f"Unkown format {format}")
 
@@ -58,29 +62,41 @@ def get_opts(format: str, quality: str, ytdl_opts: dict) -> dict:
     Returns:
       ytdl_opts: Extra options
     """
-    
+
     opts = copy.deepcopy(ytdl_opts)
 
     postprocessors = []
 
     if format in AUDIO_FORMATS:
-        postprocessors.append({
-            "key": "FFmpegExtractAudio",
-            "preferredcodec": format,
-            "preferredquality": 0 if quality == "best" else quality,
-        })
-
-        #Audio formats without thumbnail
+        postprocessors.append(
+            {
+                "key": "FFmpegExtractAudio",
+                "preferredcodec": format,
+                "preferredquality": 0 if quality == "best" else quality,
+            }
+        )
+
+        # Audio formats without thumbnail
         if format not in ("wav") and "writethumbnail" not in opts:
             opts["writethumbnail"] = True
-            postprocessors.append({"key": "FFmpegThumbnailsConvertor", "format": "jpg", "when": "before_dl"})
+            postprocessors.append(
+                {
+                    "key": "FFmpegThumbnailsConvertor",
+                    "format": "jpg",
+                    "when": "before_dl",
+                }
+            )
             postprocessors.append({"key": "FFmpegMetadata"})
             postprocessors.append({"key": "EmbedThumbnail"})
-    
+
     if format == "thumbnail":
         opts["skip_download"] = True
         opts["writethumbnail"] = True
-        postprocessors.append({"key": "FFmpegThumbnailsConvertor", "format": "jpg", "when": "before_dl"})
-
-    opts["postprocessors"] = postprocessors + (opts["postprocessors"] if "postprocessors" in opts else [])
+        postprocessors.append(
+            {"key": "FFmpegThumbnailsConvertor", "format": "jpg", "when": "before_dl"}
+        )
+
+    opts["postprocessors"] = postprocessors + (
+        opts["postprocessors"] if "postprocessors" in opts else []
+    )
     return opts

app/main.py

@@ -24,6 +24,8 @@ class Config:
         'DELETE_FILE_ON_TRASHCAN': 'false',
         'STATE_DIR': '.',
         'URL_PREFIX': '/ytdl',
+        'PUBLIC_HOST_URL': 'download/',
+        'PUBLIC_HOST_AUDIO_URL': 'audio_download/',
         'OUTPUT_TEMPLATE': '%(title)s.%(ext)s',
         'OUTPUT_TEMPLATE_CHAPTER': '%(title)s - %(section_number)s %(section_title)s.%(ext)s',
         'YTDL_OPTIONS': '{}',

ui/src/app/app.component.ts

@@ -233,9 +233,9 @@ export class AppComponent implements AfterViewInit {
   }
 
   buildDownloadLink(download: Download) {
-    let baseDir = 'download/';
+    let baseDir = this.downloads.configuration["PUBLIC_HOST_URL"];
     if (download.quality == 'audio' || download.filename.endsWith('.mp3')) {
-      baseDir = 'audio_download/';
+      baseDir = this.downloads.configuration["PUBLIC_HOST_AUDIO_URL"];
     }
 
     if (download.folder) {