From 3c471c46b069edb944f2b3c2fb3cedd49afb44cf Mon Sep 17 00:00:00 2001 From: Max Bradbury Date: Sun, 6 Nov 2022 23:27:30 +0000 Subject: [PATCH] better matches --- src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 69f464b..7b4acb6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -102,10 +102,10 @@ fn handle_mp3(file: DirEntry) { } } -/// if filename contains something like `(1971)` or `[2003]` it's a movie +/// if filename contains something like `(1971)` or `[2003]` or `.1985.` it's a movie fn is_movie(file: &DirEntry) -> bool { lazy_static! { - static ref MOVIE: Regex = Regex::new(r"\(\d{4}\)|\[\d{4}]").unwrap(); + static ref MOVIE: Regex = Regex::new(r"\.\d{4}\.|\(\d{4}\)|\[\d{4}]").unwrap(); } MOVIE.is_match(file.file_name().to_str().unwrap()) @@ -114,7 +114,7 @@ fn is_movie(file: &DirEntry) -> bool { /// if filename contains something like "S03E21" it's a TV programme fn is_tv_episode(file: &DirEntry) -> bool { lazy_static! { - static ref TV: Regex = Regex::new(r"s\d{2}\s*e\d{2}").unwrap(); + static ref TV: Regex = Regex::new(r"[sS]\d{2}\s*[eE][pP]?\d{2}").unwrap(); } TV.is_match(file.file_name().to_str().unwrap())