From 17f29f59bed6e0480fb0b16602f1d6ecce1babe1 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Tue, 23 Sep 2025 11:37:02 +0300
Subject: [PATCH] feat(yt): use yt-dlp preset aliases

---
 docker-compose.yml |  1 -
 src/download.rs    | 15 ++-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7b77447..5510414 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,6 @@ services:
         BINARY_NAME: tg-relay-rs
     environment:
       TELOXIDE_TOKEN: ${TELOXIDE_TOKEN}
-      YTDLP_FORMAT: ${YTDLP_FORMAT:-best}
       COOKIES_PATH: /app/yt-cookies.txt
       RUST_LOG: ${RUST_LOG:-info}
     restart: unless-stopped
diff --git a/src/download.rs b/src/download.rs
index 3ea2ac2..68d60e6 100644
--- a/src/download.rs
+++ b/src/download.rs
@@ -8,7 +8,6 @@ use crate::{
 use futures::{StreamExt, stream};
 use std::{
     cmp::min,
-    env,
     ffi::OsStr,
     fs::{self, metadata},
     path::{Path, PathBuf},
@@ -130,18 +129,13 @@ pub async fn download_ytdlp<P: AsRef<Path>>(
     url: &str,
     cookies_path: Option<P>,
 ) -> Result<DownloadResult> {
-    let format_selector = env::var("YTDLP_FORMAT").unwrap_or_else(|_| "best".into());
-    info!(format_selector = format_selector, "video format");
-
     let base_args = [
         "--no-playlist",
-        "--merge-output-format",
+        "-t",
         "mp4",
-        "-f",
-        // format_selector
         "--restrict-filenames",
         "-o",
-        "%(id)s.%(ext)s",
+        "%(title)s.%(ext)s",
         "--no-warnings",
         "--quiet",
     ];
@@ -151,11 +145,6 @@ pub async fn download_ytdlp<P: AsRef<Path>>(
         .map(ToString::to_string)
         .collect::<Vec<_>>();
 
-    match args.iter().position(|s| s == "-f") {
-        Some(pos) => args.insert(pos + 1, format_selector),
-        None => args.extend(["-f".into(), format_selector]),
-    }
-
     if let Some(cookie_path) = cookies_path {
         let path = cookie_path.as_ref();
         let path_str = path.to_string_lossy().to_string();