NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 12:12:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix output formatting for full path (#101)

Browse source
This commit is contained in:
bytedream 2023-01-09 10:27:28 +01:00
parent 13f54c0da6
commit 4b33ef02c6
3 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crunchy-cli-core/src/cli/download.rs
View file

@ -1,7 +1,7 @@
use crate::cli::log::tab_info;
use crate::cli::utils::{download_segments, find_resolution, FFmpegPreset, interactive_season_choosing, find_multiple_seasons_with_same_number};
use crate::utils::context::Context;
use crate::utils::format::{format_string, Format};
use crate::utils::format::{Format, format_path};
use crate::utils::log::progress;
use crate::utils::os::{free_file, has_ffmpeg, is_special_file};
use crate::utils::parse::{parse_url, UrlFilter};
@ -206,19 +206,11 @@ impl Execute for Download {
}
for format in formats {
let mut path = PathBuf::from(&self.output);
path = free_file(
path.with_file_name(format_string(
if let Some(fname) = path.file_name() {
fname.to_str().unwrap()
} else {
"{title}.ts"
}
.to_string(),
&format,
true,
)),
);
let path = free_file(format_path(if self.output.is_empty() {
"{title}.mkv"
} else {
&self.output
}.into(), &format, true));
info!(
"Downloading {} to '{}'",