Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustifydl"
version = "0.2.21"
version = "0.2.3"
edition = "2024"
authors = [ "ThePangel" ]
description = "A fast, no-fuss Spotify downloader built in Rust."
Expand Down
13 changes: 10 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use {
crate::{
metadata::metadata,
spotify::{fetch_album, fetch_playlist, fetch_track},
youtube::{DownloadResult, search_yt},
youtube::{DownloadResult, download_ytdlp, search_yt},
},
indicatif::{MultiProgress, ProgressBar, ProgressStyle},
indicatif_log_bridge::LogWrapper,
Expand Down Expand Up @@ -308,6 +308,7 @@ async fn download_and_tag_tracks(
no_tag: options.no_tag,
});

let ytdlp_path = download_ytdlp()?;
let multi = Arc::new(multi);

for (i, (name, track)) in tracks.iter().enumerate() {
Expand All @@ -316,15 +317,18 @@ async fn download_and_tag_tracks(
let track = track.clone();
let options_cloned = Arc::clone(&options_cloned);
let multi = Arc::clone(&multi);

if options.verbosity.clone() != "no-bars" {
let task_ytdlp_path = ytdlp_path.clone();
let handle = tokio::spawn(async move {
let bar = multi.add(ProgressBar::new_spinner());
bar.set_style(ProgressStyle::with_template("{spinner:.cyan} {msg}")?);
bar.enable_steady_tick(Duration::from_millis(100));

let _permit = semaphore.acquire().await.unwrap();
bar.set_message(format!("{}/{} Downloading: {}", i + 1, lenght, name));
if let DownloadResult::Completed = search_yt(&name, options_cloned.as_ref()).await?
if let DownloadResult::Completed =
search_yt(&name, options_cloned.as_ref(), task_ytdlp_path).await?
{
if !options_cloned.no_tag {
bar.set_message(format!("{}/{} Tagging: {}", i + 1, lenght, name));
Expand All @@ -340,10 +344,13 @@ async fn download_and_tag_tracks(
});
handles.push(handle);
} else {
let task_ytdlp_path = ytdlp_path.clone();
let handle = tokio::spawn(async move {
let _permit = semaphore.acquire().await.unwrap();
info!("{}/{} Starting download: {}", i + 1, lenght, name);
if let DownloadResult::Completed = search_yt(&name, &options_cloned).await? {
if let DownloadResult::Completed =
search_yt(&name, &options_cloned, task_ytdlp_path).await?
{
metadata(&name, &track, &options_cloned).await?;
info!("{}/{} Tagging: {}", i + 1, lenght, name);
} else {
Expand Down
15 changes: 10 additions & 5 deletions src/youtube.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,18 @@ pub enum DownloadResult {
pub async fn search_yt(
name: &str,
options: &DownloadOptions,
ytdlp_path: PathBuf,
) -> Result<DownloadResult, Box<dyn std::error::Error + Send + Sync>> {
let rp = RustyPipe::new();
let search_results = rp.query().music_search_tracks(name).await?;

if let DownloadResult::Skipped =
download(search_results.items.items[0].id.as_str(), name, options).await?
if let DownloadResult::Skipped = download(
search_results.items.items[0].id.as_str(),
name,
options,
ytdlp_path,
)
.await?
{
return Ok(DownloadResult::Skipped);
}
Expand All @@ -52,6 +58,7 @@ pub async fn download(
id: &str,
name: &str,
options: &DownloadOptions,
ytdlp_path: PathBuf,
) -> Result<DownloadResult, Box<dyn std::error::Error + Send + Sync>> {
fs::create_dir_all(options.output_dir.clone())?;
let mut file = PathBuf::from(format!("{}/temp/{}", options.output_dir, name));
Expand All @@ -67,9 +74,7 @@ pub async fn download(
return Ok(DownloadResult::Skipped);
}

let ytdl_path = download_ytdlp()?;

let download_video = Command::new(ytdl_path.to_str().ok_or("Invalid UTF-8 in file path")?)
let download_video = Command::new(ytdlp_path.to_str().ok_or("Invalid UTF-8 in file path")?)
.args([
"--audio-format",
"opus",
Expand Down