Preserve leading slash; deduplicate recursion warnings

oprypin · May 24, 2021 · 4391a9c · 4391a9c
1 parent 1b02eb7
commit 4391a9c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/mkdocs_literate_nav/parser.py b/mkdocs_literate_nav/parser.py
@@ -1,4 +1,5 @@
 import copy
+import functools
 import itertools
 import logging
 import posixpath
@@ -36,6 +37,7 @@ def __init__(
         self.globber = globber
         self.implicit_index = implicit_index
         self.seen_items = set()
+        self._warn = functools.lru_cache()(log.warning)
 
     def markdown_to_nav(self, roots: Tuple[str, ...] = (".",)) -> Nav:
         root = roots[0]
@@ -102,7 +104,7 @@ def _list_element_to_nav(
         return result
 
     def _maybe_directory_wildcard(self, root: str, link: str) -> Union["Wildcard", str]:
-        abs_link = posixpath.normpath(posixpath.join(root, link).lstrip("/"))
+        abs_link = posixpath.normpath(posixpath.join(root, link))
         self.seen_items.add(abs_link)
         if link.endswith("/") and self.globber.isdir(abs_link):
             return DirectoryWildcard(root, link)
@@ -112,7 +114,7 @@ def _resolve_wildcards(self, nav, roots: RootStack = (".",)) -> Nav:
         def can_recurse(new_root):
             if new_root in roots:
                 rec = " -> ".join(repr(r) for r in reversed((new_root,) + roots))
-                log.warning(f"Disallowing recursion {rec}")
+                self._warn(f"Disallowing recursion {rec}")
                 return False
             return True
 

diff --git a/tests/nav/hybrid/test_keeps_original_nav.yml b/tests/nav/hybrid/test_keeps_original_nav.yml
@@ -5,7 +5,7 @@ nav:
   - Test: foo.md
 files: {}
 output:
-- hi-hi: ho-ho
+- hi-hi: /ho-ho
 - test: test
 - sub:
   - Test: foo.md
diff --git a/tests/nav/nested/test_recursion.yml b/tests/nav/nested/test_recursion.yml
@@ -40,12 +40,8 @@ output:
     - Section 1: .
 logs:
 - WARNING:Disallowing recursion '.' -> 'section2' -> '.'
-- WARNING:Disallowing recursion '.' -> 'section2' -> '.'
-- WARNING:Disallowing recursion '.' -> 'section2' -> 'section2'
 - WARNING:Disallowing recursion '.' -> 'section2' -> 'section2'
 - WARNING:Disallowing recursion '.' -> 'section2' -> 'section3' -> 'section2'
 - WARNING:Disallowing recursion '.' -> 'section3' -> 'section2' -> '.'
-- WARNING:Disallowing recursion '.' -> 'section3' -> 'section2' -> '.'
-- WARNING:Disallowing recursion '.' -> 'section3' -> 'section2' -> 'section2'
 - WARNING:Disallowing recursion '.' -> 'section3' -> 'section2' -> 'section2'
 - WARNING:Disallowing recursion '.' -> 'section3' -> 'section2' -> 'section3'