Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "download-organiser"
-version = "0.1.1"
+version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/main.rs

@@ -9,10 +9,6 @@ fn home_dir() -> PathBuf {
     dirs::home_dir().expect("Couldn't find home dir")
 }
 
-fn documents_dir() -> PathBuf {
-    dirs::document_dir().expect("Couldn't find downloads dir")
-}
-
 fn downloads_dir() -> PathBuf {
     dirs::download_dir().expect("Couldn't find downloads dir")
 }
@@ -106,18 +102,10 @@ fn handle_mp3(file: DirEntry) {
     }
 }
 
-fn handle_pdf(file: DirEntry) {
+/// if filename contains something like `(1971)` or `[2003]` it's a movie
-    let mut dir = documents_dir();
-
-    dir.push("PDFs");
-
-    move_file(file.path(), dir);
-}
-
-/// 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}\)|\[\d{4}]").unwrap();
+        static ref MOVIE: Regex = Regex::new(r"\(\d{4}\)|\[\d{4}]").unwrap();
     }
 
     MOVIE.is_match(file.file_name().to_str().unwrap())
@@ -126,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"[sS]\d{2}\s*[eE][pP]?\d{2}").unwrap();
+        static ref TV: Regex = Regex::new(r"s\d{2}\s*e\d{2}").unwrap();
     }
 
     TV.is_match(file.file_name().to_str().unwrap())
@@ -154,8 +142,6 @@ fn handle_video(file: DirEntry) {
 fn handle_dir(path: PathBuf) {
     let dir = std::fs::read_dir(path).expect("Couldn't read dir");
 
-    // todo if dir is empty, delete
-
     for inode in dir {
         let inode = inode.expect("Couldn't read inode");
 
@@ -171,7 +157,6 @@ fn handle_dir(path: PathBuf) {
                 "jpeg" => { handle_image(inode) }
                 "png"  => { handle_image(inode) }
                 "mp3"  => { handle_mp3(  inode) }
-                "pdf"  => { handle_pdf(  inode) }
                 "avi"  => { handle_video(inode) }
                 "m4v"  => { handle_video(inode) }
                 "mkv"  => { handle_video(inode) }