From 58e3d76f90eb4588e8d0fbb04c5d577d320d08fc Mon Sep 17 00:00:00 2001 From: euzu Date: Wed, 29 Sep 2021 21:45:09 +0200 Subject: [PATCH] fixed rename issue, added perists filename output --- bin/build_lin.sh | 0 src/processor.rs | 2 +- src/utils.rs | 9 +++++---- 3 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 bin/build_lin.sh diff --git a/bin/build_lin.sh b/bin/build_lin.sh old mode 100644 new mode 100755 diff --git a/src/processor.rs b/src/processor.rs index 51c17587d..749d830d1 100644 --- a/src/processor.rs +++ b/src/processor.rs @@ -64,7 +64,7 @@ fn exec_rename(pli: &m3u::PlaylistItem, rename: &Vec) -> O if rename.len() > 0 { let mut result = pli.clone(); for r in rename { - let value = get_field_value(pli, &r.field); + let value = get_field_value(&result, &r.field); let cap = r.re.as_ref().unwrap().replace_all(value, &r.new_name); let value = cap.into_owned(); set_field_value(&mut result, &r.field, value); diff --git a/src/utils.rs b/src/utils.rs index d580cdf14..aaf3a1d03 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -79,12 +79,13 @@ fn download_content(url: Url, persist_file: Option) -> Result, text: &String) { match persist_file { Some(path_buf) => { - match std::fs::File::create(path_buf) { + let filename = &path_buf.to_str().unwrap_or("?"); + match std::fs::File::create(&path_buf) { Ok(mut file) => match file.write_all(text.as_bytes()) { - Ok(_) => {}, - Err(e) => println!("failed to persist file {}", e) + Ok(_) => println!("persisted: {}", filename), + Err(e) => println!("failed to persist file {}, {}", filename, e) }, - Err(e) => println!("failed to persist file {}", e) + Err(e) => println!("failed to persist file {}, {}", filename, e) } }, None => {}