fix: exclude fragments

JayJayArr · JayJayArr · commit 3a919dbe06c8 · 2025-09-30T12:24:10.000+02:00
cleanup

fix: merge conflicts
diff --git a/lychee-bin/tests/cli.rs b/lychee-bin/tests/cli.rs
@@ -2940,7 +2940,8 @@ mod cli {
             .assert()
             .success()
             .stdout(contains("https://example.org")); // Should extract the link as plaintext
-
+    }
+    #[test]
     fn test_wikilink_fixture_obsidian_style() {
         let input = fixtures_path().join("wiki/obsidian-style.md");
 
@@ -2959,52 +2960,39 @@ mod cli {
     }
 
     #[test]
-    fn test_wikilink_fixture_with_fragments_obsidian_style() {
+    fn test_wikilink_fixture_with_fragments_obsidian_style_fixtures_excluded() {
         let input = fixtures_path().join("wiki/obsidian-style-plus-headers.md");
 
         //fragments should resolve all headers
-        let dir_links_with_fragment = 2;
-        main_command()
-            .arg(&input)
-            .arg("--include-wikilinks")
-            .arg("--include-fragments")
-            .arg("--fallback-extensions")
-            .arg("md")
-            .assert()
-            .failure()
-            .stdout(contains("Cannot find fragment").count(dir_links_with_fragment))
-            .stdout(contains("#").count(dir_links_with_fragment));
-    }
-
-    #[test]
-    fn test_wikilink_fixture_wikilink_style() {
-        let input = fixtures_path().join("wiki/wikilink-style.md");
-
-        // testing without fragments should not yield failures
         main_command()
             .arg(&input)
             .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_wikilink_style() {
-        let input = fixtures_path().join("wiki/wikilink-style.md");
+    fn test_wikilink_fixture_with_fragments_obsidian_style() {
+        let input = fixtures_path().join("wiki/obsidian-style-plus-headers.md");
 
         //fragments should resolve all headers
-        let dir_links_with_fragment = 2;
         main_command()
             .arg(&input)
             .arg("--include-wikilinks")
             .arg("--include-fragments")
             .arg("--fallback-extensions")
             .arg("md")
+            .arg("--base-url")
+            .arg(fixtures_path())
+            .arg("--root-dir")
+            .arg(fixtures_path())
             .assert()
-            .failure()
-            .stdout(contains("Cannot find fragment").count(dir_links_with_fragment))
-            .stdout(contains("#").count(dir_links_with_fragment));
+            .success();
     }
 }
diff --git a/lychee-lib/src/checker/file.rs b/lychee-lib/src/checker/file.rs
@@ -83,7 +83,7 @@ impl FileChecker {
     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;
+            self.setup_wikilinks();
         }
         let Ok(path) = uri.url.to_file_path() else {
             return ErrorKind::InvalidFilePath(uri.clone()).into();
@@ -150,7 +150,7 @@ impl FileChecker {
             Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
                 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),
+                    Err(_) => self.apply_wikilink_check(path, uri).map(Cow::Owned),
                 }
             }
 
@@ -322,16 +322,16 @@ impl FileChecker {
     }
 
     // Initializes the Index of the wikilink checker
-    async fn setup_wikilinks(&self) {
-        self.wikilink_checker.index_files().await;
+    fn setup_wikilinks(&self) {
+        self.wikilink_checker.index_files();
     }
     // 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> {
+    fn apply_wikilink_check(&self, path: &Path, uri: &Uri) -> Result<PathBuf, ErrorKind> {
         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 {
+            match self.wikilink_checker.check(&path_buf, uri) {
                 Err(_) => {}
                 Ok(resolved_path) => return Ok(resolved_path),
             }
diff --git a/lychee-lib/src/extract/markdown.rs b/lychee-lib/src/extract/markdown.rs
@@ -94,17 +94,27 @@ pub(crate) fn extract_markdown(
                         }
 
                         //Strip potholes (|) from wikilinks
-                        let stripped_dest_url = if has_pothole {
+                        let mut stripped_dest_url = if has_pothole {
                             pulldown_cmark::CowStr::Borrowed(&dest_url[0..dest_url.find('|').unwrap_or(dest_url.len())])
                         }else {
                             dest_url.clone()
                         };
 
-                        Some(vec![RawUri {
-                            text: stripped_dest_url.to_string(),
-                            element: Some("a".to_string()),
-                            attribute: Some("wikilink".to_string()),
-                        }])
+                        //Strip fragments (#) from wikilinks, according to the obsidian spec
+                        //fragments come before potholes
+                        if stripped_dest_url.contains('#') {
+                            stripped_dest_url = pulldown_cmark::CowStr::Borrowed(&dest_url[0..dest_url.find('#').unwrap_or(dest_url.len())]);
+                        }
+
+                        if stripped_dest_url.is_empty() {
+                            None
+                        } else {
+                            Some(vec![RawUri {
+                                text: stripped_dest_url.to_string(),
+                                element: Some("a".to_string()),
+                                attribute: Some("wikilink".to_string()),
+                            }])
+                        }
                     }
                 }
             }
@@ -580,7 +590,8 @@ Shortcut link: [link4]
                 "Missing expected URI: {expected_uri:?}. Found: {uris:?}"
             );
         }
-
+    }
+    #[test]
     fn test_remove_wikilink_pothole() {
         let markdown = r"[[foo|bar]]";
         let uris = extract_markdown(markdown, true, true);
@@ -591,4 +602,28 @@ Shortcut link: [link4]
         }];
         assert_eq!(uris, expected);
     }
+
+    #[test]
+    fn test_remove_wikilink_fragment() {
+        let markdown = r"[[foo#bar]]";
+        let uris = extract_markdown(markdown, true, true);
+        let expected = vec![RawUri {
+            text: "foo".to_string(),
+            element: Some("a".to_string()),
+            attribute: Some("wikilink".to_string()),
+        }];
+        assert_eq!(uris, expected);
+    }
+
+    #[test]
+    fn test_remove_wikilink_potholes_and_fragments() {
+        let markdown = r"[[foo#bar|baz]]";
+        let uris = extract_markdown(markdown, true, true);
+        let expected = vec![RawUri {
+            text: "foo".to_string(),
+            element: Some("a".to_string()),
+            attribute: Some("wikilink".to_string()),
+        }];
+        assert_eq!(uris, expected);
+    }
 }
diff --git a/lychee-lib/src/utils/wikilink_checker.rs b/lychee-lib/src/utils/wikilink_checker.rs
@@ -3,8 +3,8 @@ use log::info;
 use std::collections::HashMap;
 use std::ffi::OsString;
 use std::path::Path;
+use std::sync::Mutex;
 use std::{path::PathBuf, sync::Arc};
-use tokio::sync::Mutex;
 use walkdir::WalkDir;
 
 #[derive(Clone, Debug, Default)]
@@ -22,9 +22,9 @@ impl WikilinkChecker {
         }
     }
 
-    pub(crate) async fn index_files(&self) {
+    pub(crate) fn index_files(&self) {
         //Skip the indexing step in case the filenames are already populated
-        if !self.filenames.lock().await.is_empty() {
+        if !self.filenames.lock().unwrap().is_empty() {
             return;
         }
         match self.basedir {
@@ -39,7 +39,7 @@ impl WikilinkChecker {
                         localbasename.display()
                     );
 
-                    let mut filenameslock = self.filenames.lock().await;
+                    let mut filenameslock = self.filenames.lock().unwrap();
                     for entry in WalkDir::new::<PathBuf>(localbasename.into())
                         //actively ignore symlinks
                         .follow_links(false)
@@ -58,11 +58,11 @@ impl WikilinkChecker {
         }
     }
 
-    pub(crate) async fn check(&self, path: &Path, uri: &Uri) -> Result<PathBuf, ErrorKind> {
+    pub(crate) fn check(&self, path: &Path, uri: &Uri) -> Result<PathBuf, ErrorKind> {
         match path.file_name() {
             None => Err(ErrorKind::InvalidFilePath(uri.clone())),
             Some(filename) => {
-                let filenamelock = self.filenames.lock().await;
+                let filenamelock = self.filenames.lock().unwrap();
                 if filenamelock.contains_key(&filename.to_ascii_lowercase()) {
                     Ok(filenamelock
                         .get(&filename.to_ascii_lowercase())
