Fixed redirects for computed destinations and URLs

mkdocs_redirects/plugin.py

@@ -55,7 +55,6 @@ def get_relative_html_path(old_page, new_page, use_directory_urls):
     """Return the relative path from the old html path to the new html path"""
     old_path = get_html_path(old_page, use_directory_urls)
     new_path, new_hash_fragment = _split_hash_fragment(new_page)
-    new_path = get_html_path(new_path, use_directory_urls)
 
     if use_directory_urls:
         # remove /index.html from end of path
@@ -129,14 +128,15 @@ def on_post_build(self, config, **kwargs):
         # Walk through the redirect map and write their HTML files
         for page_old, page_new in self.redirects.items():
             # Need to remove hash fragment from new page to verify existence
-            page_new_without_hash, _ = _split_hash_fragment(str(page_new))
+            page_new_without_hash, hash = _split_hash_fragment(str(page_new))
 
             # External redirect targets are easy, just use it as the target path
             if page_new.lower().startswith(('http://', 'https://')):
                 dest_path = page_new
 
             elif page_new_without_hash in self.doc_pages:
-                dest_path = get_relative_html_path(page_old, page_new, use_directory_urls)
+                file = self.doc_pages[page_new_without_hash]
+                dest_path = get_relative_html_path(page_old, "".join([file.url, hash]), use_directory_urls)
 
             # If the redirect target isn't external or a valid internal page, throw an error
             # Note: we use 'warn' here specifically; mkdocs treats warnings specially when in strict mode

tests/test_plugin.py

@@ -4,7 +4,8 @@
 """
 import pytest
 
-from mkdocs_redirects.plugin import get_relative_html_path
+from mkdocs_redirects.plugin import get_relative_html_path, _split_hash_fragment
+from mkdocs.structure.files import File
 
 
 @pytest.mark.parametrize(
@@ -29,7 +30,9 @@
     ],
 )
 def test_relative_redirect_directory_urls(old_page, new_page, expected):
-    result = get_relative_html_path(old_page, new_page, use_directory_urls=True)
+    page_new_without_hash, hash = _split_hash_fragment(new_page)
+    file = File(page_new_without_hash, ".", ".", True)
+    result = get_relative_html_path(old_page, "".join([file.url, hash]), use_directory_urls=True)
 
     assert result == expected
 
@@ -60,6 +63,8 @@ def test_relative_redirect_directory_urls(old_page, new_page, expected):
     ],
 )
 def test_relative_redirect_no_directory_urls(old_page, new_page, expected):
-    result = get_relative_html_path(old_page, new_page, use_directory_urls=False)
+    page_new_without_hash, hash = _split_hash_fragment(new_page)
+    file = File(page_new_without_hash, ".", ".", False)
+    result = get_relative_html_path(old_page, "".join([file.url, hash]), use_directory_urls=False)
 
     assert result == expected