mirror of
https://github.com/kristoferssolo/tg-relay-rs.git
synced 2026-02-04 06:42:09 +00:00
Compare commits
1 Commits
main
...
465f9c49e9
| Author | SHA1 | Date | |
|---|---|---|---|
|
465f9c49e9
|
@@ -10,10 +10,10 @@ RUN cargo chef prepare --recipe-path recipe.json
|
||||
FROM chef AS builder-rs
|
||||
COPY --from=planner /app/recipe.json recipe.json
|
||||
# Build dependencies - this is the caching Docker layer!
|
||||
RUN cargo chef cook --release --no-default-features --features tiktok --features twitter --features youtube --recipe-path recipe.json
|
||||
RUN cargo chef cook --release --recipe-path recipe.json
|
||||
# Build application
|
||||
COPY . .
|
||||
RUN cargo build --release --no-default-features --features tiktok --features twitter --features youtube
|
||||
RUN cargo build --release --no-default-features -F tiktok -F twitter -F youtube
|
||||
|
||||
|
||||
FROM ghcr.io/astral-sh/uv:trixie-slim AS builder-py
|
||||
@@ -30,12 +30,9 @@ RUN uv python install 3.13
|
||||
|
||||
RUN apt-get update -y \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
pkg-config libssl-dev ca-certificates ffmpeg curl unzip \
|
||||
pkg-config libssl-dev ca-certificates ffmpeg \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Deno (required by yt-dlp for YouTube challenge solving)
|
||||
RUN curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local sh
|
||||
|
||||
RUN --mount=type=cache,target=/root/.cache/uv
|
||||
|
||||
# Intstall deps
|
||||
|
||||
@@ -106,7 +106,12 @@ async fn run_command_in_tempdir(cmd: &str, args: &[&str]) -> Result<DownloadResu
|
||||
#[cfg(feature = "instagram")]
|
||||
pub async fn download_instagram(url: String) -> Result<DownloadResult> {
|
||||
let config = global_config();
|
||||
run_yt_dlp(&["-t", "mp4"], config.instagram.cookies_path.as_ref(), &url).await
|
||||
run_yt_dlp(
|
||||
&["-t", "mp4", "--extractor-args", "instagram:"],
|
||||
config.instagram.cookies_path.as_ref(),
|
||||
&url,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Download a Tiktok URL with yt-dlp.
|
||||
@@ -117,7 +122,12 @@ pub async fn download_instagram(url: String) -> Result<DownloadResult> {
|
||||
#[cfg(feature = "tiktok")]
|
||||
pub async fn download_tiktok(url: String) -> Result<DownloadResult> {
|
||||
let config = global_config();
|
||||
run_yt_dlp(&["-t", "mp4"], config.tiktok.cookies_path.as_ref(), &url).await
|
||||
run_yt_dlp(
|
||||
&["-t", "mp4", "--extractor-args", "tiktok:"],
|
||||
config.tiktok.cookies_path.as_ref(),
|
||||
&url,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Download a Twitter URL with yt-dlp.
|
||||
@@ -128,7 +138,12 @@ pub async fn download_tiktok(url: String) -> Result<DownloadResult> {
|
||||
#[cfg(feature = "twitter")]
|
||||
pub async fn download_twitter(url: String) -> Result<DownloadResult> {
|
||||
let config = global_config();
|
||||
run_yt_dlp(&["-t", "mp4"], config.twitter.cookies_path.as_ref(), &url).await
|
||||
run_yt_dlp(
|
||||
&["-t", "mp4", "--extractor-args", "twitter:"],
|
||||
config.twitter.cookies_path.as_ref(),
|
||||
&url,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Download a URL with yt-dlp.
|
||||
@@ -139,17 +154,18 @@ pub async fn download_twitter(url: String) -> Result<DownloadResult> {
|
||||
#[cfg(feature = "youtube")]
|
||||
pub async fn download_youtube(url: String) -> Result<DownloadResult> {
|
||||
let config = global_config();
|
||||
let mut args = vec![
|
||||
run_yt_dlp(
|
||||
&[
|
||||
"--no-playlist",
|
||||
"-f",
|
||||
"bestvideo[ext=mp4]+bestaudio[ext=m4a]/bestvideo+bestaudio/best",
|
||||
"--merge-output-format",
|
||||
"-t",
|
||||
"mp4",
|
||||
];
|
||||
if !config.youtube.postprocessor_args.is_empty() {
|
||||
args.extend(["--postprocessor-args", &config.youtube.postprocessor_args]);
|
||||
}
|
||||
run_yt_dlp(&args, config.youtube.cookies_path.as_ref(), &url).await
|
||||
"--postprocessor-args",
|
||||
&config.youtube.postprocessor_args,
|
||||
],
|
||||
config.youtube.cookies_path.as_ref(),
|
||||
&url,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Post-process a `DownloadResult`.
|
||||
|
||||
Reference in New Issue
Block a user