Merge pull request #90 from glubsy/po_token_as_file

Allow passing multiple "extractor_args"

Author: glubsy

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v0.3.2] - 2025-10-25
+
+### Added
+- Store PO token in a file inside the configuration directory
+
 ## [v0.3.1] - 2025-08-24
 
 ### Added

config/po_token.txt

@@ -17,8 +17,13 @@
     // https://github.com/yt-dlp/yt-dlp/wiki/Extractors
     // You can load one PO_TOKEN value into environment variables with 
     // export PO_TOKEN="your_token"
+    // or you can put it into a file named "po_token.txt" in the config directory
     // and it will be automatically replaced in the config.
-    "extractor-args": "youtube:player-client=web,default;po_token=web+<PO_TOKEN_VALUE>",
+    // This can be a single string value or a list of strings for multiple args.
+    "extractor-args": [
+        "youtube:player-client=web,default;po_token=web+<PO_TOKEN_VALUE>",
+        "youtube:po_token=web.subs+<PO_TOKEN_VALUE>"
+    ],
 
     // Do not stop on download/postprocessing errors.
     // Can be "only_download" to ignore only download errors.

config/ytdlp_config.json

@@ -15,6 +15,7 @@ COPY "livestream_saver.py" .
 COPY "./config/ytdlp_config.json" "/root/.config/livestream_saver/ytdlp_config.json"
 COPY "./config/livestream_saver.cfg" "/root/.config/livestream_saver/livestream_saver.cfg"
 COPY "./config/.env" "/root/.config/livestream_saver/.env"
+COPY "./config/po_token.txt" "/root/.config/livestream_saver/po_token.txt"
 
 COPY "./docker/entrypoint.sh" ./entrypoint.sh
 RUN chmod +x ./entrypoint.sh

docker/Containerfile

@@ -907,25 +907,52 @@ def load_commented_json(path: Path) -> Dict:
         return data
 
 
-def interpolate_ytdlp_config(data: dict[str, Any]) -> None:
+def interpolate_ytdlp_config(data: dict[str, Any], po_token: str) -> None:
     """
     Interpolate the ytdlp config file with values from the environment variables.
     """
     # currently this is only used to replace the default PO token value
     if not (extractor_args := data.get("extractor-args")):
         return
-    if "<PO_TOKEN_VALUE>" not in extractor_args:
-        return
+    if type(extractor_args) is str:
+        if "<PO_TOKEN_VALUE>" not in extractor_args:
+            return
+        data["extractor-args"] = extractor_args.replace(
+            "<PO_TOKEN_VALUE>", po_token
+        )
+    # Looks like passing a list to ytdlp works as if passing multiple --extractor-args flags
+    elif type(extractor_args) is list:
+        for i, val in enumerate(extractor_args):
+            if type(val) is str and "<PO_TOKEN_VALUE>" in val:
+                extractor_args[i] = val.replace("<PO_TOKEN_VALUE>", po_token)
+    else:
+        log.warning(
+            "extractor-args in ytdlp config is neither a string, list or dict."
+            "Cannot interpolate PO token."
+        )
+
 
+def load_po_token(config_dir: Path) -> str:
+    """
+    Load the PO token either from environment variable or from file (env variable
+    takes precedence).
+    Raise ValueError if none was found.
+    """
     token = environ.get("PO_TOKEN", None)
+    if token and len(token) > 0:
+        return token.strip()
+
+    with open(config_dir / "po_token.txt", "r") as f:
+        token = f.read().strip()
+    
     if not token:
         raise ValueError(
-            "PO_TOKEN environment variable not set. "
-            "Please set the value with export PO_TOKEN=<your_token_value>"
+            "Failed to load PO token from environment variable or po_token file."
+            "Please set the value with export PO_TOKEN=<your_token_value> "
+            "or create a file named 'po_token' in the config directory."
         )
-    data["extractor-args"] = extractor_args.replace(
-        "<PO_TOKEN_VALUE>", token
-    )
+    return token
+
 
 
 def load_env_file(path: Path) -> None:
@@ -987,7 +1014,7 @@ def main():
         ytdlp_conf_file = fallback
 
     loaded_ytdlp_conf = load_commented_json(ytdlp_conf_file)
-    interpolate_ytdlp_config(loaded_ytdlp_conf)
+    interpolate_ytdlp_config(loaded_ytdlp_conf, po_token=load_po_token(config_dir))
     args["ytdlp_config"] = loaded_ytdlp_conf
 
     logfile_path = Path("")  # cwd by default

livestream_saver/livestream_saver.py

@@ -1,6 +1,6 @@
 [project]
 name = "livestream_saver"
-version = "0.3.1"
+version = "0.3.2"
 description = "Monitor Youtube channels to download live streams"
 readme = "README.md"
 requires-python = ">=3.12"