修复内置规则逻辑错误

Chikage0o0 · Mar 15, 2023 · bf9c486 · bf9c486
1 parent e026163
commit bf9c486
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/UPDATELOG.md b/UPDATELOG.md
@@ -1,3 +1,7 @@
+## v0.2.2
+
+- 修复内置规则逻辑错误
+
 ## v0.2.1
 
 - 添加内置正则表达式匹配电影和电视剧

diff --git a/src-tauri/src/utils/matcher.rs b/src-tauri/src/utils/matcher.rs
@@ -262,6 +262,7 @@ pub async fn internal_matcher<P: AsRef<Path>>(file: P) -> Result<(), MatcherErro
                                 )
                                 .await
                                 .map_err(|e| MatcherError::ProcessError(e.to_string()))?;
+                                return Ok(());
                             } else {
                                 log::error!("Can't find `{}`", title);
                             }
@@ -281,6 +282,7 @@ pub async fn internal_matcher<P: AsRef<Path>>(file: P) -> Result<(), MatcherErro
                                 nfo::movie::process(&id, provider, lang, &path)
                                     .await
                                     .map_err(|e| MatcherError::ProcessError(e.to_string()))?;
+                                return Ok(());
                             } else {
                                 log::error!("Can't find `{}`", title);
                             }
@@ -293,5 +295,5 @@ pub async fn internal_matcher<P: AsRef<Path>>(file: P) -> Result<(), MatcherErro
             }
         }
     }
-    Ok(())
+    return Err(MatcherError::FileNotMatch(file.as_ref().to_path_buf()));
 }