Merge pull request #557 from arabcoders/dev

fix: use yt-dlp[default] for upgrading logic

Author: arabcoders

.github/workflows/update-yt-dlp.yml

@@ -42,7 +42,7 @@ jobs:
           VER=$(uv pip list --outdated | awk '$1 == "yt-dlp" {print $3}')
           if [ -n "$VER" ]; then
             echo "YTLDLP_VER=${VER}" >> "$GITHUB_OUTPUT"
-            uv pip install --upgrade yt-dlp
+            uv pip install --upgrade yt-dlp[default]
             uv sync --upgrade
             UPDATED=true
           else

FAQ.md

@@ -317,22 +317,13 @@ Then simply create a new preset, and in the `Command options for yt-dlp` field s
 
 ```bash
 --extractor-args "youtubepot-bgutilhttp:base_url=http://bgutil_provider:4416" 
---extractor-args "youtube:player-client=default,tv,mweb;formats=incomplete"
 ```
 
-you and also enable the fallback by using the follow extractor args
-
-```bash
---extractor-args "youtubepot-bgutilhttp:base_url=http://bgutil_provider:4416;disable_innertube=1"
---extractor-args "youtube:player-client=default,tv,mweb;formats=incomplete"
-```
-
-Use this alternative extractor args in case the extractor fails to get the pot tokens from the bgutil provider server. 
 For more information please visit [bgutil-ytdlp-pot-provider](https://github.com/Brainicism/bgutil-ytdlp-pot-provider) project.
 
 # Troubleshooting and submitting issues
 
-Before asking a question or submitting an issue for YTPTube, please remember that YTPTube is only a thin wrapper for 
+Before asking a question or submitting an issue for YTPTube, please remember that YTPTube is only a wrapper for 
 [yt-dlp](https://github.com/yt-dlp/yt-dlp). Any issues you might be experiencing with authentication to video websites, 
 postprocessing, permissions, other `yt-dlp options` configurations which seem not to work, or anything else that 
 concerns the workings of the underlying yt-dlp library, need not be opened on the YTPTube project.
@@ -343,7 +334,8 @@ and once that is working, importing the options that worked for you into a new `
 ## Via HTTP
 
 If you have enabled the web terminal via `YTP_CONSOLE_ENABLED` environment variable, simply go to `Other > Terminal` use
- the yt-dlp command, the interface is jailed to the `yt-dlp` binary you can't access anything else.
+ the yt-dlp command, the interface is jailed to the `yt-dlp` binary you can't access anything else. Or from download form 
+ by clicking `advanced options` button than the yellow terminal icon `Run directly in console`.
 
 ## Via CLI 
 
@@ -503,7 +495,7 @@ as we only test for GPU encoding once on first video stream.
 
 # Allowing internal URLs requests
 
-By default, YTPTube prevents requests to internal resources, for security reasons. However, if you want to allow requests to internal URLs, you can set the `YTP_ALLOW_INTERNAL_URLS` environment variable to `true`. This will allow requests to internal URLs. 
+By default, YTPTube prevents requests to internal resources. However, if you want to allow requests to internal URLs, you can set the `YTP_ALLOW_INTERNAL_URLS` environment variable to `true`. This will allow requests to internal URLs. 
 
 We do not recommend enabling this option unless you know what you are doing, as it can expose your internal network to 
 potential security risks. This should only be used if it's truly needed.
@@ -557,7 +549,6 @@ services:
 After making the changes, restart your container. This should resolve the "No space left on device" 
 error during download.
 
-
 # How to prevent loading screen during YouTube premieres?
 
 Depending on how you look at it, YTPTube live download implementation is rather great and fast. However, during YouTube 
@@ -566,7 +557,6 @@ playing. By default we wait for 5min + the duration of the video before starting
 the loading screen. However, you can override the behavior by setting the following environment variable:
 
 ```env
-YTP_PREVENT_LIVE_PREMIERE=true
 YTP_LIVE_PREMIERE_BUFFER=10
 ```
 

app/features/streaming/library/segments.py

@@ -94,7 +94,7 @@ async def build_ffmpeg_args(self, file: Path, s_codec: str) -> list[str]:
         }
 
         caps: dict[str, dict[str, bool]] = detect_qsv_capabilities()
-        base_codec: str = s_codec.split("_")[0]
+        base_codec: str = s_codec.split("_", maxsplit=1)[0]
         codec_caps: dict[str, bool] = caps.get(base_codec, {"full": False, "lp": False})
         ctx["qsv"] = codec_caps
 

app/features/streaming/router.py

@@ -213,7 +213,7 @@ async def segments_stream(request: Request, config: Config, app: web.Application
     await Segments(
         download_path=config.download_path,
         index=int(segment),
-        duration=float(f"{float(sd if sd else M3u8.duration):.6f}"),
+        duration=float(f"{float(sd or M3u8.duration):.6f}"),
         vconvert=vc == 1,
         aconvert=ac == 1,
     ).stream(realFile, resp)

app/features/tasks/definitions/service.py

@@ -397,7 +397,7 @@ async def inspect(
 
             return TaskFailure(
                 message=extraction.message,
-                error=extraction.error if extraction.error else extraction.message,
+                error=extraction.error or extraction.message,
                 metadata=combined_failure_metadata,
             )
 

app/features/ytdlp/extractor.py

@@ -235,7 +235,7 @@ def extract_info_sync(
     archive_id: str | None = f".{id_dict['id']}" if id_dict.get("id") else None
 
     log_wrapper.add_target(
-        target=logging.getLogger(f"yt-dlp{archive_id if archive_id else '.extract_info'}"),
+        target=logging.getLogger(f"yt-dlp{archive_id or '.extract_info'}"),
         level=logging.DEBUG if debug else logging.WARNING,
     )
 

app/features/ytdlp/router.py

@@ -394,7 +394,7 @@ async def get_info(request: Request, cache: Cache, config: Config) -> Response:
         data["is_archived"] = False
 
         archive_file: str | None = ytdlp_opts.get("download_archive")
-        data["archive_file"] = archive_file if archive_file else None
+        data["archive_file"] = archive_file or None
 
         if archive_file and (archive_id := get_archive_id(url=url).get("archive_id")):
             data["archive_id"] = archive_id

app/features/ytdlp/ytdlp_opts.py

@@ -130,7 +130,7 @@ def __init__(self, item, config: Config | None = None):
             raise ValueError(msg)
 
         self.item = item
-        preset_name = item.preset if item.preset else self._config.default_preset
+        preset_name = item.preset or self._config.default_preset
         self.preset: Preset | None = YTDLPCli._get_presets().get(preset_name)
         self._config: Config = config or Config.get_instance()
 

app/library/ItemDTO.py

@@ -227,7 +227,7 @@ def get_preset(self) -> "Preset | None":
         """
         from app.features.presets.service import Presets
 
-        return Presets.get_instance().get(self.preset if self.preset else self._default_preset())
+        return Presets.get_instance().get(self.preset or self._default_preset())
 
     def get_archive_id(self) -> str | None:
         """
@@ -553,7 +553,7 @@ def get_preset(self) -> "Preset | None":
         """
         from app.features.presets.service import Presets
 
-        return Presets.get_instance().get(self.preset if self.preset else "default")
+        return Presets.get_instance().get(self.preset or "default")
 
     def archive_status(self, force: bool = False) -> None:
         """

app/library/PackageInstaller.py

@@ -113,15 +113,16 @@ def _install_pkg(self, pkg: str, version: str | None = None) -> bool:
         if "yt_dlp" == pkg:
             pkg = "yt-dlp"
 
+        pkg_name: str = "yt-dlp[default]" if pkg == "yt-dlp" else pkg
         if version:
-            if "nightly" == version and pkg == "yt-dlp":
-                cmd.extend(["--pre", "yt-dlp[default]"])
-            elif "master" == version and pkg == "yt-dlp":
+            if "nightly" == version and "yt-dlp" == pkg:
+                cmd.extend(["--pre", pkg_name])
+            elif "master" == version and "yt-dlp" == pkg:
                 cmd.append("git+https://github.com/yt-dlp/yt-dlp.git@master")
             else:
-                cmd.append(version if str(version).startswith("git+") else f"{pkg}=={version}")
+                cmd.append(version if str(version).startswith("git+") else f"{pkg_name}=={version}")
         else:
-            cmd.extend(["--disable-pip-version-check", pkg])
+            cmd.extend(["--disable-pip-version-check", pkg_name])
 
         try:
             proc: subprocess.CompletedProcess[bytes] = subprocess.run(