feat: resolve Filenames through wikilink checker

Author: JayJayArr

fixtures/wiki/obsidian-style-plus-headers.md

@@ -0,0 +1,8 @@
+[[#LocalHeader]]
+
+# LocalHeader
+
+[[Usage#Header|HeaderRenaming]]
+[[Space Usage#Header|HeaderRenaming]]
+[[Space Usage DifferentDirectory#Header|HeaderRenaming]]
+[[DifferentDirectory#Header|HeaderRenaming]]

fixtures/wiki/obsidian-style.md

@@ -1,13 +1,4 @@
-[[#LocalHeader]]
-
 [[Usage]]
 [[Space Usage]]
 [[Space Usage DifferentDirectory]]
 [[DifferentDirectory]]
-
-[[Usage#Header|HeaderRenaming]]
-[[Space Usage#Header|HeaderRenaming]]
-[[Space Usage DifferentDirectory#Header|HeaderRenaming]]
-[[DifferentDirectory#Header|HeaderRenaming]]
-
-# LocalHeader

lychee-bin/tests/cli.rs

@@ -2950,13 +2950,17 @@ mod cli {
             .arg("--include-wikilinks")
             .arg("--fallback-extensions")
             .arg("md")
+            .arg("--base-url")
+            .arg(fixtures_path())
+            .arg("--root-dir")
+            .arg(fixtures_path())
             .assert()
             .success();
     }
 
     #[test]
     fn test_wikilink_fixture_with_fragments_obsidian_style() {
-        let input = fixtures_path().join("wiki/obsidian-style.md");
+        let input = fixtures_path().join("wiki/obsidian-style-plus-headers.md");
 
         //fragments should resolve all headers
         let dir_links_with_fragment = 2;

lychee-lib/src/checker/file.rs

@@ -81,6 +81,7 @@ impl FileChecker {
     ///
     /// Returns a `Status` indicating the result of the check.
     pub(crate) async fn check(&self, uri: &Uri) -> Status {
+        //only populate the wikilink filenames if it is enabled
         if self.include_wikilinks {
             self.setup_wikilinks().await;
         }
@@ -145,8 +146,12 @@ impl FileChecker {
     ) -> Result<Cow<'a, Path>, ErrorKind> {
         let path = match path.metadata() {
             // for non-existing paths, attempt fallback extensions
+            // if fallback extensions don't help, try wikilinks
             Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
-                self.apply_fallback_extensions(path, uri).map(Cow::Owned)
+                match self.apply_fallback_extensions(path, uri).map(Cow::Owned) {
+                    Ok(val) => Ok(val),
+                    Err(_) => self.apply_wikilink_check(path, uri).await.map(Cow::Owned),
+                }
             }
 
             // other IO errors are unexpected and should fail the check
@@ -257,7 +262,7 @@ impl FileChecker {
     }
 
     /// Checks a resolved file, optionally verifying fragments for HTML files.
-    ///
+    ///u
     /// # Arguments
     ///
     /// * `path` - The resolved path to check.
@@ -323,7 +328,16 @@ impl FileChecker {
     // Tries to resolve a link by looking up the filename in the wikilink index
     // The
     async fn apply_wikilink_check(&self, path: &Path, uri: &Uri) -> Result<PathBuf, ErrorKind> {
-        self.wikilink_checker.check(path, uri).await
+        let mut path_buf = path.to_path_buf();
+        for ext in &self.fallback_extensions {
+            path_buf.set_extension(ext);
+            match self.wikilink_checker.check(&path_buf, uri).await {
+                Err(_) => {}
+                Ok(resolved_path) => return Ok(resolved_path),
+            }
+        }
+
+        Err(ErrorKind::InvalidFilePath(uri.clone()))
     }
 }
 

lychee-lib/src/utils/wikilink_checker.rs

@@ -44,13 +44,11 @@ impl WikilinkChecker {
                         //actively ignore symlinks
                         .follow_links(false)
                         .into_iter()
-                        .filter_map(|e| e.ok())
+                        .filter_map(std::result::Result::ok)
                     {
-                        match entry.path().file_name() {
-                            Some(filename) => {
-                                filenameslock.insert(filename.into(), entry.path().to_path_buf());
-                            }
-                            None => {}
+                        if let Some(filename) = entry.path().file_name() {
+                            filenameslock
+                                .insert(filename.to_ascii_lowercase(), entry.path().to_path_buf());
                         }
                     }
                 }
@@ -65,9 +63,9 @@ impl WikilinkChecker {
             None => Err(ErrorKind::InvalidFilePath(uri.clone())),
             Some(filename) => {
                 let filenamelock = self.filenames.lock().await;
-                if filenamelock.contains_key(filename.into()) {
+                if filenamelock.contains_key(&filename.to_ascii_lowercase()) {
                     Ok(filenamelock
-                        .get(filename.into())
+                        .get(&filename.to_ascii_lowercase())
                         .expect("Could not retrieve inserted Path for discovered Wikilink-Path"))
                     .cloned()
                 } else {