update

Author: biezhihua

soda_resource_tools_cli/src/main.rs

@@ -9,7 +9,7 @@ use magic_crypt::{new_magic_crypt, MagicCryptTrait};
 use serde_json::Value;
 use soda_resource_tools_lib::soda::{
     self,
-    entity::{EmbyRenameStyle, RenameStyle, ResourceType, ScrapeConfig, SodaError, TransferType},
+    entity::{RenameStyle, ResourceType, ScrapeConfig, SodaError, TransferType},
 };
 use tracing_appender::non_blocking::NonBlocking;
 use tracing_subscriber::{filter, fmt::time::ChronoLocal, layer::SubscriberExt, util::SubscriberInitExt, Layer};
@@ -72,6 +72,12 @@ enum Commands {
         /// 刮削图片
         #[arg(long)]
         scrape_image: Option<bool>,
+
+        /// 重命名格式
+        #[arg( long, value_parser = clap::builder::PossibleValuesParser::new(["emby"])
+                .map(|s| s.parse::<RenameStyle>().unwrap()),
+        )]
+        rename_style: Option<RenameStyle>,
     },
 }
 
@@ -118,34 +124,43 @@ fn main() {
     tracing::info!(target:"soda::info", "缓存文件目录: {}", cache_dir.to_str().unwrap());
     tracing::info!(target:"soda::info", "日志文件目录: {}", log_dir.to_str().unwrap());
 
-    // 开发者配置
-    if dev {
-        let lib_dir = current_dir().unwrap().parent().unwrap().join("soda_resource_tools_lib");
-        init_lib_config_dev(&lib_dir);
-    }
-    // Release配置
-    else {
-        if let Ok(()) = init_config(&config_dir) {
-            tracing::info!(target:"soda::info", "初始化配置文件成功");
-        } else {
-            tracing::error!(target:"soda::info", "初始化配置文件失败");
-            return;
-        }
+    match args.command {
+        Commands::Scrape {
+            resource_type,
+            transfer_type,
+            src_dir,
+            target_dir,
+            scrape_image,
+            rename_style: rename_format,
+        } => {
+            let rename_style = rename_format.unwrap_or(RenameStyle::Emby);
+
+            // 开发者配置
+            if dev {
+                let lib_dir = current_dir().unwrap().parent().unwrap().join("soda_resource_tools_lib");
+                init_lib_config_dev(&lib_dir, &rename_style);
+            }
+            // Release配置
+            else {
+                if let Ok(()) = init_config(&config_dir) {
+                    tracing::info!(target:"soda::info", "初始化配置文件成功");
+                } else {
+                    tracing::error!(target:"soda::info", "初始化配置文件失败");
+                    return;
+                }
 
-        let local_soda_config_path = config_dir.join("soda_config.json");
-        let local_soda_config: Value = serde_json::from_str(&fs::read_to_string(&local_soda_config_path).unwrap()).unwrap();
-        tracing::info!(target:"soda::info", "配置文件: {}", local_soda_config);
+                let local_soda_config_path = config_dir.join("soda_config.json");
+                let local_soda_config: Value = serde_json::from_str(&fs::read_to_string(&local_soda_config_path).unwrap()).unwrap();
+                tracing::info!(target:"soda::info", "配置文件: {}", local_soda_config);
 
-        if !local_soda_config.get("enable_cli").unwrap().as_bool().unwrap() {
-            tracing::error!(target:"soda::info", "配置文件中enable_cli为false，不允许使用soda_cli");
-            return;
-        }
+                if !local_soda_config.get("enable_cli").unwrap().as_bool().unwrap() {
+                    tracing::error!(target:"soda::info", "配置文件中enable_cli为false，不允许使用soda_cli");
+                    return;
+                }
 
-        init_lib_config(&local_soda_config, &config_dir, &cache_dir);
-    }
+                init_lib_config(&local_soda_config, &config_dir, &cache_dir, &rename_style);
+            }
 
-    match args.command {
-        Commands::Scrape { resource_type, transfer_type, src_dir, target_dir, scrape_image } => {
             if src_dir.is_some() {
                 let src_dir = src_dir.clone().unwrap();
                 let target_dir = if target_dir.is_some() { target_dir.unwrap() } else { src_dir.clone() };
@@ -165,7 +180,7 @@ fn main() {
     }
 }
 
-fn init_lib_config(local_soda_config: &Value, config_dir: &Path, cache_dir: &Path) {
+fn init_lib_config(local_soda_config: &Value, config_dir: &Path, cache_dir: &Path, rename_style: &RenameStyle) {
     let mc = new_magic_crypt!("biezhihua_soda", 256);
 
     let bin_path_name = local_soda_config.get("bin").unwrap().as_str().unwrap();
@@ -190,21 +205,21 @@ fn init_lib_config(local_soda_config: &Value, config_dir: &Path, cache_dir: &Pat
     config.strong_match_regex_rules_path = "".to_string();
     config.strong_match_name_map_path = "".to_string();
     config.metadata_skip_special = true;
-    config.movie_rename_format = Some(RenameStyle::Emby(EmbyRenameStyle::EmbyMovie));
-    config.tv_rename_format = Some(RenameStyle::Emby(EmbyRenameStyle::EmbyTV));
+    config.movie_rename_format = Some(rename_style.clone());
+    config.tv_rename_format = Some(rename_style.clone());
     soda::update_lib_config(config);
     tracing::info!(target:"soda::info", "配置更新成功");
 }
 
-fn init_lib_config_dev(lib_dir: &Path) {
+fn init_lib_config_dev(lib_dir: &Path, rename_style: &RenameStyle) {
     let mut config = soda::get_lib_config();
     config.cache_path = lib_dir.join("cache").to_str().unwrap().to_string();
     config.strong_match_rules_tv_path = lib_dir.join("config").join("mt_strong_match_rules_tv.json").to_str().unwrap().to_string();
     config.strong_match_rules_movie_path = lib_dir.join("config").join("mt_strong_match_rules_movie.json").to_str().unwrap().to_string();
     config.strong_match_regex_rules_path = lib_dir.join("config").join("mt_strong_match_regex_rules.json").to_str().unwrap().to_string();
     config.strong_match_name_map_path = lib_dir.join("config").join("mt_strong_match_name_map.json").to_str().unwrap().to_string();
-    config.movie_rename_format = Some(RenameStyle::Emby(EmbyRenameStyle::EmbyMovie));
-    config.tv_rename_format = Some(RenameStyle::Emby(EmbyRenameStyle::EmbyTV));
+    config.movie_rename_format = Some(rename_style.clone());
+    config.tv_rename_format = Some(rename_style.clone());
     config.metadata_skip_special = true;
     soda::update_lib_config(config);
     tracing::info!(target:"soda::info", "配置更新成功");

soda_resource_tools_lib/src/soda.rs

@@ -64,8 +64,20 @@ pub fn update_lib_config(new_config: LibConfig) {
 /// https://emby.media/support/articles/Movie-Naming.html
 /// https://support.emby.media/support/solutions/articles/44001159110-tv-naming
 ///
-pub fn scrape(resource_type: ResourceType, transfer_type: TransferType, scrape_config: ScrapeConfig, src_directory: String, target_directory: String) {
-    tracing::debug!("scrape_src_to_target resource_type {:?}, transfer_mode {:?}, src_directory {:?}, target_directory {:?}", resource_type, transfer_type, src_directory, target_directory);
+pub fn scrape(
+    resource_type: ResourceType,
+    transfer_type: TransferType,
+    scrape_config: ScrapeConfig,
+    src_directory: String,
+    target_directory: String,
+) {
+    tracing::debug!(
+        "scrape_src_to_target resource_type {:?}, transfer_mode {:?}, src_directory {:?}, target_directory {:?}",
+        resource_type,
+        transfer_type,
+        src_directory,
+        target_directory
+    );
 
     let mut paths: Vec<String> = Vec::new();
 
@@ -100,7 +112,14 @@ pub fn scrape(resource_type: ResourceType, transfer_type: TransferType, scrape_c
                 // 初始化上下文
                 if meta_context.init(&src_path) {
                     // 刮削
-                    match scrape_mt(&mut meta_context, &mut mt_infos, src_path, &scrape_config, &target_directory, &transfer_type) {
+                    match scrape_mt(
+                        &mut meta_context,
+                        &mut mt_infos,
+                        src_path,
+                        &scrape_config,
+                        &target_directory,
+                        &transfer_type,
+                    ) {
                         Ok(_) => {}
                         Err(e) => {
                             tracing::error!(target: "soda::info","刮削失败 e = {}", e);
@@ -114,7 +133,14 @@ pub fn scrape(resource_type: ResourceType, transfer_type: TransferType, scrape_c
     }
 }
 
-fn scrape_mt(meta_context: &mut MetaContext, mt_infos: &mut HashMap<String, MTInfo>, src_path: String, scrape_config: &ScrapeConfig, target_directory: &String, transfer_type: &TransferType) -> Result<(), SodaError> {
+fn scrape_mt(
+    meta_context: &mut MetaContext,
+    mt_infos: &mut HashMap<String, MTInfo>,
+    src_path: String,
+    scrape_config: &ScrapeConfig,
+    target_directory: &String,
+    transfer_type: &TransferType,
+) -> Result<(), SodaError> {
     tracing::info!(target:"soda::info", "开始刮削: {}", src_path);
 
     // 创建meta
@@ -190,7 +216,11 @@ fn scrape_mt(meta_context: &mut MetaContext, mt_infos: &mut HashMap<String, MTIn
             }
 
             // 选择重命名格式
-            let rename_format = if mt_meta.is_movie() { LIB_CONFIG.lock().unwrap().transfer_rename_format_movie.clone() } else { LIB_CONFIG.lock().unwrap().transfer_rename_format_tv.clone() };
+            let rename_format = if mt_meta.is_movie() {
+                LIB_CONFIG.lock().unwrap().transfer_rename_format_movie.clone()
+            } else {
+                LIB_CONFIG.lock().unwrap().transfer_rename_format_tv.clone()
+            };
 
             // 生成转移文件路径
             let transfer_target_path = transfer::gen_mt_transfer_target_path(&target_directory, &rename_format, &mt_meta);
@@ -207,14 +237,17 @@ fn scrape_mt(meta_context: &mut MetaContext, mt_infos: &mut HashMap<String, MTIn
             tracing::error!(target: "soda::info","识别失败 e = {}", error);
 
             // 选择重命名格式
-            let rename_format = if mt_meta.is_movie() { LIB_CONFIG.lock().unwrap().transfer_rename_format_movie.clone() } else { LIB_CONFIG.lock().unwrap().transfer_rename_format_tv.clone() };
+            let rename_format = if mt_meta.is_movie() {
+                LIB_CONFIG.lock().unwrap().transfer_rename_format_movie.clone()
+            } else {
+                LIB_CONFIG.lock().unwrap().transfer_rename_format_tv.clone()
+            };
 
             // 生成转移文件路径
             let transfer_target_path = transfer::gen_mt_transfer_target_path(&target_directory, &rename_format, &mt_meta);
 
             // 转移文件
             transfer::transfer_mt_file(&mt_meta, &src_path, &transfer_target_path, &transfer_type)?;
-
         }
     }
 

soda_resource_tools_lib/src/soda/entity.rs

@@ -74,7 +74,27 @@ impl From<serde_json::Error> for SodaError {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum RenameStyle {
     /// Emby 重命名格式
-    Emby(EmbyRenameStyle),
+    Emby,
+}
+
+impl std::fmt::Display for RenameStyle {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let s = match self {
+            RenameStyle::Emby => "emby",
+        };
+        s.fmt(f)
+    }
+}
+
+impl std::str::FromStr for RenameStyle {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "emby" => Ok(Self::Emby),
+            _ => Err(format!("Unknown type: {s}")),
+        }
+    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -384,6 +404,7 @@ pub enum MTType {
 #[derive(Debug, Clone)]
 pub enum ResourceType {
     /// 影视 MT
+    /// Movie or TV
     MT,
 }
 
@@ -1005,6 +1026,7 @@ impl std::fmt::Display for TransferType {
         s.fmt(f)
     }
 }
+
 impl std::str::FromStr for TransferType {
     type Err = String;
 

soda_resource_tools_lib/src/soda/fanart/entity.rs

@@ -14,7 +14,6 @@ pub struct FanartTV {
     pub tvposter: Option<Vec<FanartImg>>,
 }
 
-
 #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct FanartMovie {
     pub name: Option<String>,

soda_resource_tools_lib/src/soda/filebrowser.rs

@@ -33,11 +33,22 @@ impl FileItem {
     pub(crate) fn create(path_obj: &Path) -> FileItem {
         let is_dir = path_obj.is_dir();
         let file_type = if is_dir { "dir".to_string() } else { "file".to_string() };
-        let path = if system::is_windows_os() { path_obj.to_str().unwrap().to_string().replace("\\", "/") } else { path_obj.to_str().unwrap().to_string() };
+        let path = if system::is_windows_os() {
+            path_obj.to_str().unwrap().to_string().replace("\\", "/")
+        } else {
+            path_obj.to_str().unwrap().to_string()
+        };
         let name = path_obj.file_name().unwrap().to_str().unwrap().to_string();
         let extension = Self::get_extension(path_obj, is_dir);
         let size = if is_dir { 0 } else { path_obj.metadata().unwrap().len() };
-        let modify_time = path_obj.metadata().unwrap().modified().unwrap().duration_since(UNIX_EPOCH).unwrap().as_secs();
+        let modify_time = path_obj
+            .metadata()
+            .unwrap()
+            .modified()
+            .unwrap()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_secs();
         FileItem {
             file_type,
             path,
@@ -67,7 +78,11 @@ impl FileItem {
     }
 
     fn get_extension(path_obj: &Path, is_dir: bool) -> String {
-        let extension = if is_dir { "".to_string() } else { path_obj.extension().unwrap_or(OsStr::new("")).to_str().unwrap_or("").to_string() };
+        let extension = if is_dir {
+            "".to_string()
+        } else {
+            path_obj.extension().unwrap_or(OsStr::new("")).to_str().unwrap_or("").to_string()
+        };
         extension
     }
 
@@ -78,7 +93,14 @@ impl FileItem {
         let name = path_obj.to_str().unwrap().to_string();
         let extension = Self::get_extension(path_obj, is_dir);
         let size = if is_dir { 0 } else { path_obj.metadata().unwrap().len() };
-        let modify_time = path_obj.metadata().unwrap().modified().unwrap().duration_since(UNIX_EPOCH).unwrap().as_secs();
+        let modify_time = path_obj
+            .metadata()
+            .unwrap()
+            .modified()
+            .unwrap()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_secs();
         FileItem {
             file_type,
             path,
@@ -98,7 +120,14 @@ impl FileItem {
         let name = path_obj.to_str().unwrap().to_string();
         let extension = Self::get_extension(path_obj, is_dir);
         let size = if is_dir { 0 } else { path_obj.metadata().unwrap().len() };
-        let modify_time = path_obj.metadata().unwrap().modified().unwrap().duration_since(UNIX_EPOCH).unwrap().as_secs();
+        let modify_time = path_obj
+            .metadata()
+            .unwrap()
+            .modified()
+            .unwrap()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_secs();
         FileItem {
             file_type,
             path,

soda_resource_tools_lib/src/soda/meta.rs

@@ -22,7 +22,11 @@ pub fn create_metadata_mt(meta_context: &mut MetaContext) -> Result<MTMetadata,
         if let Some(meta) = gen_metadata_mt(&cur_file_name, tokens) {
             let end_time = SystemTime::now();
             tracing::debug!("meta = {:?} ", meta);
-            tracing::debug!("create metadata success title = {:?} time = {:?}", cur_file_name, (end_time.duration_since(start_time)).unwrap());
+            tracing::debug!(
+                "create metadata success title = {:?} time = {:?}",
+                cur_file_name,
+                (end_time.duration_since(start_time)).unwrap()
+            );
             return Ok(meta);
         }
     }

soda_resource_tools_lib/src/soda/request.rs

@@ -58,7 +58,11 @@ pub(crate) fn blocking_request_value_with_cache(cache_type: CacheType, method: &
 }
 
 pub(crate) fn blocking_request(method: &str, url: &str) -> Result<reqwest::blocking::Response, SodaError> {
-    Ok(if method == "GET" { blocking_request_get(url)? } else { blocking_request_post(url)? })
+    Ok(if method == "GET" {
+        blocking_request_get(url)?
+    } else {
+        blocking_request_post(url)?
+    })
 }
 
 pub(crate) fn blocking_request_post(url: &str) -> Result<reqwest::blocking::Response, SodaError> {

soda_resource_tools_lib/src/soda/tmdb/movie.rs

@@ -163,5 +163,3 @@ pub(crate) fn movie_details(tmdb_id: &str) -> Result<TmdbMovie, SodaError> {
         Err(e) => Err(SodaError::String(format!("movie_details json error {:?}", e))),
     }
 }
-
-

soda_resource_tools_lib/src/soda/tmdb/request.rs

@@ -13,7 +13,18 @@ pub(crate) fn tmdb_request(action: &str, params: &str, method: &str) -> Result<V
         })
         .unwrap();
 
-    let url = if params.contains("language") { format!("https://{}/3{}?api_key={}&{}", get_api_domain(), action, api_key, params) } else { format!("https://{}/3{}?api_key={}&{}&language={}", get_api_domain(), action, api_key, params, get_api_language()) };
+    let url = if params.contains("language") {
+        format!("https://{}/3{}?api_key={}&{}", get_api_domain(), action, api_key, params)
+    } else {
+        format!(
+            "https://{}/3{}?api_key={}&{}&language={}",
+            get_api_domain(),
+            action,
+            api_key,
+            params,
+            get_api_language()
+        )
+    };
 
     let json = request::blocking_request_value_with_cache(cache::CacheType::TMDB, method, &url)?;
 

soda_resource_tools_lib/src/soda/tmdb/scraper.rs

@@ -267,7 +267,6 @@ fn save_movie_images(tmdb: &TmdbMovie, fanart: &FanartMovie, root_path: &Path) {
             tracing::debug!("backdrop image exist, skip save backdrop image, image_path = {:?}", image_path);
         }
     }
-
 }
 
 fn save_tv_show_images(tmdb: &TmdbTV, fanart: &FanartTV, root_path: &Path) {