Fix book being overwritten by redirect, again

Author: object-Object

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and [Pydantic's HISTORY.md](https://github.com/pydantic/pydantic/blob/main/HISTORY.md), and this project *mostly* adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## `1!0.1.0a35`
+
+### Fixed
+
+* Fixed another issue with the web book being overwritten by a redirect page if the plugin version is removed from the site path.
+
 ## `1!0.1.0a34`
 
 ### Added

src/hexdoc/cli/app.py

@@ -18,6 +18,7 @@
 from hexdoc.core import ModResourceLoader, ResourceLocation
 from hexdoc.data.metadata import HexdocMetadata
 from hexdoc.data.sitemap import (
+    SitemapMarker,
     delete_updated_books,
     dump_sitemap,
     load_sitemap,
@@ -356,14 +357,17 @@ def merge(
     root_version: Version | None = None
     root_redirect: str | None = None
 
+    def add_redirect(marker: SitemapMarker, path: Path):
+        if path != Path(marker.path.removeprefix("/")):
+            redirects[path] = marker.redirect_contents
+
     for version, item in sitemap.items():
         if version.startswith("latest"):  # TODO: check type of item instead
             continue
 
-        redirects[plugin.site_root / version] = item.default_marker.redirect_contents
-        if plugin.site_root / version != plugin.versioned_site_path:  # hacky hacky
-            for lang, marker in item.markers.items():
-                redirects[plugin.site_root / version / lang] = marker.redirect_contents
+        add_redirect(item.default_marker, plugin.site_root / version)
+        for lang, marker in item.markers.items():
+            add_redirect(marker, plugin.site_root / version / lang)
 
         item_version = Version(version)
         if not root_version or item_version > root_version: