diff --git a/src/main.rs b/src/main.rs
index 9f2bbd5..1856b0e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,7 +13,7 @@ use rules::*;
use utils::status_icon::*;
const VIDEO_EXTENSIONS: [&str; 14] = ["mkv", "mp4", "avi", "webm", "mov", "wmv", "flv", "ogg", "ogv", "yuv", "amv", "mpg", "mpeg", "m4v"];
-pub(crate) const SERIES_REGEX: &str = r"^(?P
.+)(?P-\s)?(?P[Ss]|\s|\.)(?P\d{1,3})(?P[Ee]|[Xx]|[Ss])(?P\d{1,3})([Ee](?P\d{2,3}))?((?P\s-\s)?(?P.+))?\.(?P...)$";
+pub(crate) const SERIES_REGEX: &str = r"^(?P.*?)(?P\s-\s?)?(?P[Ss]|\s|\.)(?P\d{1,3})(?P[Ee]|[Xx]|[Ss])(?P\d{1,3})([Ee](?P\d{2,3}))?((?P\s-\s)?(?P.+))?\.(?P...)$";
// const FILE_EXT_REGEX: &str = r"^(?P.+)\.(?P...)$";
// const MOVIE_REGEX: &str = r"^(?P.+)\s(?P\(\d{4}\))\s(?P\[.+\])\.(?P...)$";
@@ -107,6 +107,10 @@ fn lint_file_name(file: &DirEntry, filename: &str, regex: &Regex, episode_name:
let captures = captures.unwrap();
+ if let Some(reason) = DashInTitle::check(filename, &captures) {
+ return ComplianceStatus::NonCompliant(reason);
+ }
+
if let Some(reason) = EpisodeMarker::check(filename, &captures) {
return ComplianceStatus::NonCompliant(reason);
}
@@ -127,9 +131,5 @@ fn lint_file_name(file: &DirEntry, filename: &str, regex: &Regex, episode_name:
return ComplianceStatus::NonCompliant(reason);
}
- if let Some(reason) = DashInTitle::check(filename, &captures) {
- return ComplianceStatus::NonCompliant(reason);
- }
-
ComplianceStatus::Compliant
}
\ No newline at end of file
diff --git a/src/rules/has_dash_in_title.rs b/src/rules/has_dash_in_title.rs
index 2db0fa8..6ca96ea 100644
--- a/src/rules/has_dash_in_title.rs
+++ b/src/rules/has_dash_in_title.rs
@@ -10,12 +10,6 @@ impl Rule for DashInTitle {
return Some(NonCompliantReason::DashInTitle)
}
- let title = captures.name("title").unwrap();
-
- if title.as_str().contains("-") {
- return Some(NonCompliantReason::DashInTitle)
- }
-
return None
}