Remove no longer necessary code

[rbdr/page] / src / file_finder.rs

diff --git a/src/file_finder.rs b/src/file_finder.rs
index 754412ac1ee3499dd369110cb2991b2c81608e56..ef57950d366adb5bd325c86840b179277c4fa99b 100644 (file)
--- a/src/file_finder.rs
+++ b/src/file_finder.rs
@@ -17,7 +17,7 @@ fn find_files_recursively(root_path: &PathBuf, directory_path: &PathBuf) -> Vec<
             continue;
         }
         if path.is_dir() {
             continue;
         }
         if path.is_dir() {

-            result.append(&mut find_files_recursively(root_path, &path))
+            result.append(&mut find_files_recursively(root_path, &path));

         } else {
             let file_type = file_handler.identify(&path);
             result.push(File { path, file_type });
         } else {
             let file_type = file_handler.identify(&path);
             result.push(File { path, file_type });


@@ -38,7 +38,7 @@ mod tests {
     use crate::file_handler::FileType;
     use test_utilities::*;
 
     use crate::file_handler::FileType;
     use test_utilities::*;
 

-    fn get_paths(root_directory: &PathBuf, files: &Vec<File>) -> HashSet<String> {
+    fn get_paths(root_directory: &PathBuf, files: &[File]) -> HashSet<String> {

         files
             .iter()
             .map(|file| {
         files
             .iter()
             .map(|file| {


@@ -54,8 +54,8 @@ mod tests {
     #[test]
     fn finds_all_files() {
         let test_dir = setup_test_dir();
     #[test]
     fn finds_all_files() {
         let test_dir = setup_test_dir();

-        create_dir_all(&test_dir.join("nested")).expect("Could not create nested test directory");
-        create_dir_all(&test_dir.join("assets")).expect("Could not create assets test directory");
+        create_dir_all(test_dir.join("nested")).expect("Could not create nested test directory");
+        create_dir_all(test_dir.join("assets")).expect("Could not create assets test directory");

         create_test_file(&test_dir.join("test1.gmi"), "");
         create_test_file(&test_dir.join("_layout.html"), "");
         create_test_file(&test_dir.join("nested/nested.gmi"), "");
         create_test_file(&test_dir.join("test1.gmi"), "");
         create_test_file(&test_dir.join("_layout.html"), "");
         create_test_file(&test_dir.join("nested/nested.gmi"), "");


@@ -75,9 +75,10 @@ mod tests {
     #[test]
     fn identifies_correct_file_types() {
         let test_dir = setup_test_dir();
     #[test]
     fn identifies_correct_file_types() {
         let test_dir = setup_test_dir();

-        create_dir_all(&test_dir.join("nested")).expect("Could not create nested test directory");
-        create_dir_all(&test_dir.join("assets")).expect("Could not create assets test directory");
+        create_dir_all(test_dir.join("nested")).expect("Could not create nested test directory");
+        create_dir_all(test_dir.join("assets")).expect("Could not create assets test directory");

         create_test_file(&test_dir.join("_layout.html"), "");
         create_test_file(&test_dir.join("_layout.html"), "");

+        create_test_file(&test_dir.join("notalayout.html"), "");

         create_test_file(&test_dir.join("nested/nested.gmi"), "");
         create_test_file(&test_dir.join("assets/style.css"), "");
         create_test_file(&test_dir.join("image.png"), "");
         create_test_file(&test_dir.join("nested/nested.gmi"), "");
         create_test_file(&test_dir.join("assets/style.css"), "");
         create_test_file(&test_dir.join("image.png"), "");


@@ -89,9 +90,9 @@ mod tests {
                 Some("gmi") => assert_eq!(file.file_type, FileType::Gemini),
                 Some("html") => {
                     if file.path.ends_with("_layout.html") {
                 Some("gmi") => assert_eq!(file.file_type, FileType::Gemini),
                 Some("html") => {
                     if file.path.ends_with("_layout.html") {

-                        assert_eq!(file.file_type, FileType::Layout)
+                        assert_eq!(file.file_type, FileType::Layout);

                     } else {
                     } else {

-                        assert_eq!(file.file_type, FileType::File)
+                        assert_eq!(file.file_type, FileType::File);

                     }
                 }
                 _ => assert_eq!(file.file_type, FileType::File),
                     }
                 }
                 _ => assert_eq!(file.file_type, FileType::File),


@@ -102,9 +103,9 @@ mod tests {
     #[test]
     fn ignores_git_directory() {
         let test_dir = setup_test_dir();
     #[test]
     fn ignores_git_directory() {
         let test_dir = setup_test_dir();

-        create_dir_all(&test_dir.join("nested")).expect("Could not create nested test directory");
-        create_dir_all(&test_dir.join("assets")).expect("Could not create assets test directory");
-        create_dir_all(&test_dir.join(".git")).expect("Could not create git test directory");
+        create_dir_all(test_dir.join("nested")).expect("Could not create nested test directory");
+        create_dir_all(test_dir.join("assets")).expect("Could not create assets test directory");
+        create_dir_all(test_dir.join(".git")).expect("Could not create git test directory");

         create_test_file(&test_dir.join("_layout.html"), "");
         create_test_file(&test_dir.join("nested/nested.gmi"), "");
         create_test_file(&test_dir.join("assets/style.css"), "");
         create_test_file(&test_dir.join("_layout.html"), "");
         create_test_file(&test_dir.join("nested/nested.gmi"), "");
         create_test_file(&test_dir.join("assets/style.css"), "");