fix: handle multiple file arguments for show and edit
This commit is contained in:
+8
-7
@@ -10,11 +10,10 @@ use std::io::Write;
|
||||
use std::path::PathBuf;
|
||||
use std::{fs::read_dir, fs::File, io::Read, process::Command};
|
||||
|
||||
pub fn edit(file_path: PathBuf, extra_files: [String; 8]) -> std::io::Result<()> {
|
||||
pub fn edit(file_path: Vec<PathBuf>, extra_files: [String; 8]) -> std::io::Result<()> {
|
||||
let tmp_file_path = PathBuf::from("/tmp/keks-sort-metadata");
|
||||
let mut tmp_file = File::create(&tmp_file_path)?;
|
||||
let editor = var("EDITOR").unwrap();
|
||||
let mut path: PathBuf = file_path.clone();
|
||||
let mut files = Vec::new();
|
||||
|
||||
struct FileMetadata {
|
||||
@@ -22,9 +21,10 @@ pub fn edit(file_path: PathBuf, extra_files: [String; 8]) -> std::io::Result<()>
|
||||
tag: Tag,
|
||||
}
|
||||
|
||||
if file_path.is_dir() {
|
||||
for music_file in read_dir(&file_path)? {
|
||||
path = music_file?.path();
|
||||
for file in &file_path {
|
||||
if file.is_dir() {
|
||||
for music_file in read_dir(file)? {
|
||||
let path = music_file?.path();
|
||||
|
||||
if path
|
||||
.extension()
|
||||
@@ -38,12 +38,13 @@ pub fn edit(file_path: PathBuf, extra_files: [String; 8]) -> std::io::Result<()>
|
||||
files.push(FileMetadata { path, tag });
|
||||
}
|
||||
} else {
|
||||
let tag = &crate::get_metadata(file_path);
|
||||
let tag = &crate::get_metadata(file);
|
||||
files.push(FileMetadata {
|
||||
path,
|
||||
path: file.to_path_buf(),
|
||||
tag: tag.clone(),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
for file in &files {
|
||||
writeln!(
|
||||
|
||||
+23
-5
@@ -1,4 +1,5 @@
|
||||
use clap::{Parser, Subcommand};
|
||||
//use ini::Ini;
|
||||
use lofty::file::TaggedFileExt;
|
||||
use lofty::probe::Probe;
|
||||
use std::ffi::OsStr;
|
||||
@@ -21,20 +22,35 @@ struct Args {
|
||||
#[derive(Subcommand)]
|
||||
enum Commands {
|
||||
Import {
|
||||
#[arg(num_args = 1..)]
|
||||
files: Vec<PathBuf>,
|
||||
#[arg(short, long, default_value_t = false)]
|
||||
copy: bool,
|
||||
},
|
||||
Show {
|
||||
file: PathBuf,
|
||||
files: Vec<PathBuf>,
|
||||
},
|
||||
Edit {
|
||||
files: PathBuf,
|
||||
files: Vec<PathBuf>,
|
||||
},
|
||||
}
|
||||
|
||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
//let mut conf = Ini::new();
|
||||
//conf.with_section(Some("General"))
|
||||
// .set("target_directory", "");
|
||||
////conf.write_to_file("conf.ini").unwrap();
|
||||
//
|
||||
//let conf = Ini::load_from_file("conf.ini").unwrap();
|
||||
//
|
||||
//let section = conf.section(Some("General")).unwrap();
|
||||
//println!("target_dir={:?}", section.get("target_directory"));
|
||||
//
|
||||
//for (_sec, prop) in &conf {
|
||||
// for (key, value) in prop.iter() {
|
||||
// println!("{:?}:{:?}", key, value);
|
||||
// }
|
||||
//}
|
||||
//
|
||||
let args = Args::parse();
|
||||
let extra_files = ["jpg", "png", "pdf", "log", "cue", "mp4", "lrc", "txt"].map(str::to_string);
|
||||
|
||||
@@ -70,7 +86,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
}
|
||||
}
|
||||
|
||||
Commands::Show { file } => {
|
||||
Commands::Show { files } => {
|
||||
for file in files {
|
||||
println!("Show file: {:?}", file);
|
||||
let tag = get_metadata(file);
|
||||
|
||||
@@ -78,9 +95,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
println!("{:?}", item)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Commands::Edit { files } => {
|
||||
edit(files.to_path_buf(), extra_files)?;
|
||||
edit(files.to_vec(), extra_files)?;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user