SinTan1729/movie-rename
1
0
Fork 0
mirror of https://github.com/SinTan1729/movie-rename.git synced 2024-12-26 12:18:37 -06:00
Code Issues Projects Releases Packages Wiki Activity

change: Put variable inside format string directly when possible

Browse source
This commit is contained in:
Sayantan Santra 2023-05-21 21:10:47 -05:00
parent 0e92c693f7
commit 8b6e83a55a
Signed by: SinTan1729
GPG key ID: EB3E68BFBA25C85F
3 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/functions.rs
View file

@ -62,10 +62,7 @@ pub async fn process_file(
// Check if it should be ignored // Check if it should be ignored
if preprocessed && new_name_base.is_empty() { if preprocessed && new_name_base.is_empty() {
eprintln!( eprintln!(" Ignoring {file_base} as per previous choice for related files...");
" Ignoring {} as per previous choice for related files...",
file_base
);
return (filename_without_ext, "".to_string(), false); return (filename_without_ext, "".to_string(), false);
} }
@ -75,9 +72,9 @@ pub async fn process_file(
// Process only if it's a valid file format // Process only if it's a valid file format
let mut extension = metadata.extension().unwrap_or("").to_string(); let mut extension = metadata.extension().unwrap_or("").to_string();
if ["mp4", "avi", "mkv", "flv", "m4a", "srt", "ssa"].contains(&extension.as_str()) { if ["mp4", "avi", "mkv", "flv", "m4a", "srt", "ssa"].contains(&extension.as_str()) {
println!(" Processing {}...", file_base); println!(" Processing {file_base}...");
} else { } else {
println!(" Ignoring {}...", file_base); println!(" Ignoring {file_base}...");
return (filename_without_ext, "".to_string(), false); return (filename_without_ext, "".to_string(), false);
} }
@ -91,7 +88,7 @@ pub async fn process_file(
let results = match reply { let results = match reply {
Ok(res) => Ok(res.results), Ok(res) => Ok(res.results),
Err(e) => { Err(e) => {
eprintln!(" There was an error while searching {}!", file_base); eprintln!(" There was an error while searching {file_base}!");
Err(e) Err(e)
} }
}; };
@ -126,13 +123,13 @@ pub async fn process_file(
// If nothing is found, skip // If nothing is found, skip
if movie_list.is_empty() { if movie_list.is_empty() {
eprintln!(" Could not find any entries matching {}!", file_base); eprintln!(" Could not find any entries matching {file_base}!");
return (filename_without_ext, "".to_string(), true); return (filename_without_ext, "".to_string(), true);
} }
// Choose from the possible entries // Choose from the possible entries
let choice = match Select::new( let choice = match Select::new(
format!(" Possible choices for {}:", file_base).as_str(), format!(" Possible choices for {file_base}:").as_str(),
movie_list, movie_list,
) )
.prompt() .prompt()
@ -174,18 +171,18 @@ pub async fn process_file(
// Add extension and stuff to the new name // Add extension and stuff to the new name
let mut new_name_with_ext = new_name_base.clone(); let mut new_name_with_ext = new_name_base.clone();
if !extension.is_empty() { if !extension.is_empty() {
new_name_with_ext = format!("{}.{}", new_name_with_ext, extension); new_name_with_ext = format!("{new_name_with_ext}.{extension}");
} }
let mut new_name = new_name_with_ext.clone(); let mut new_name = new_name_with_ext.clone();
if parent != *"" { if parent != *"" {
new_name = format!("{}/{}", parent, new_name); new_name = format!("{parent}/{new_name}");
} }
// Process the renaming // Process the renaming
if *filename == new_name { if *filename == new_name {
println!(" [file] '{}' already has correct name.", file_base); println!(" [file] '{file_base}' already has correct name.");
} else { } else {
println!(" [file] '{}' -> '{}'", file_base, new_name_with_ext); println!(" [file] '{file_base}' -> '{new_name_with_ext}'");
// Only do the rename of --dry-run isn't passed // Only do the rename of --dry-run isn't passed
if !dry_run { if !dry_run {
if !Path::new(new_name.as_str()).is_file() { if !Path::new(new_name.as_str()).is_file() {
@ -230,7 +227,7 @@ pub fn process_args(mut args: Vec<String>) -> (Vec<String>, HashMap<&'static str
exit(0); exit(0);
} }
"--version" | "-v" => { "--version" | "-v" => {
println!("movie-rename {}", VERSION); println!("movie-rename {VERSION}");
exit(0); exit(0);
} }
"--dry-run" | "-n" => { "--dry-run" | "-n" => {
@ -248,7 +245,7 @@ pub fn process_args(mut args: Vec<String>) -> (Vec<String>, HashMap<&'static str
} }
other => { other => {
if other.starts_with('-') { if other.starts_with('-') {
eprintln!("Unknown argument passed: {}", other); eprintln!("Unknown argument passed: {other}");
exit(1); exit(1);
} else { } else {
entries.push(arg); entries.push(arg);

14
src/main.rs
View file

@ -50,14 +50,14 @@ async fn main() {
// Process the filename for movie entries // Process the filename for movie entries
process_file(&entry, &tmdb, pattern, settings["dry_run"], None).await; process_file(&entry, &tmdb, pattern, settings["dry_run"], None).await;
} else { } else {
eprintln!("The file {} wasn't found on disk, skipping...", entry); eprintln!("The file {entry} wasn't found on disk, skipping...");
continue; continue;
} }
} }
// Directory // Directory
true => { true => {
if Path::new(entry.as_str()).is_dir() { if Path::new(entry.as_str()).is_dir() {
println!("Processing files inside the directory {}...", entry); println!("Processing files inside the directory {entry}...");
let mut movie_list = HashMap::new(); let mut movie_list = HashMap::new();
if let Ok(files_in_dir) = fs::read_dir(entry.as_str()) { if let Ok(files_in_dir) = fs::read_dir(entry.as_str()) {
@ -84,7 +84,7 @@ async fn main() {
} }
} }
} else { } else {
eprintln!("There was an error accessing the directory {}!", entry); eprintln!("There was an error accessing the directory {entry}!");
continue; continue;
} }
if movie_list.len() == 1 { if movie_list.len() == 1 {
@ -92,9 +92,9 @@ async fn main() {
let movie_name = movie_list.into_values().next().unwrap(); let movie_name = movie_list.into_values().next().unwrap();
if entry_clean == movie_name { if entry_clean == movie_name {
println!("[directory] '{}' already has correct name.", entry_clean); println!("[directory] '{entry_clean}' already has correct name.");
} else { } else {
println!("[directory] '{}' -> '{}'", entry_clean, movie_name); println!("[directory] '{entry_clean}' -> '{movie_name}'");
if !settings["dry_run"] { if !settings["dry_run"] {
if !Path::new(movie_name.as_str()).is_dir() { if !Path::new(movie_name.as_str()).is_dir() {
fs::rename(entry, movie_name) fs::rename(entry, movie_name)
@ -105,10 +105,10 @@ async fn main() {
} }
} }
} else { } else {
eprintln!("Could not determine how to rename the directory {}!", entry); eprintln!("Could not determine how to rename the directory {entry}!");
} }
} else { } else {
eprintln!("The directory {} wasn't found on disk, skipping...", entry); eprintln!("The directory {entry} wasn't found on disk, skipping...");
continue; continue;
} }
} }

2
src/structs.rs
View file

@ -73,7 +73,7 @@ impl fmt::Display for MovieEntry {
buffer.push_str(&format!("Directed by: {}, ", self.director)); buffer.push_str(&format!("Directed by: {}, ", self.director));
buffer.push_str(&format!("TMDB ID: {}", self.id)); buffer.push_str(&format!("TMDB ID: {}", self.id));
// buffer.push_str(&format!("Synopsis: {}", self.overview)); // buffer.push_str(&format!("Synopsis: {}", self.overview));
write!(f, "{}", buffer) write!(f, "{buffer}")
} }
} }