fix works

Author: syphar

src/web/crate_details.rs

@@ -454,6 +454,8 @@ pub(crate) async fn crate_details_handler(
 struct ReleaseList {
     releases: Vec<Release>,
     crate_name: String,
+    inner_path: String,
+    target: String,
 }
 
 impl_axum_webpage! {
@@ -464,35 +466,85 @@ impl_axum_webpage! {
 
 #[tracing::instrument]
 pub(crate) async fn get_all_releases(
-    Path(params): Path<CrateDetailHandlerParams>,
+    Path(params): Path<RustdocHtmlParams>,
     Extension(pool): Extension<Pool>,
 ) -> AxumResult<AxumResponse> {
-    let releases: Vec<Release> = spawn_blocking({
+    let req_path: String = params.path.clone().unwrap_or_default();
+    let req_path: Vec<&str> = req_path.split('/').collect();
+
+    let release_found = match_version_axum(&pool, &params.name, Some(&params.version)).await?;
+    trace!(?release_found, "found release");
+
+    let (version, _) = match release_found.version {
+        MatchSemver::Exact((version, _)) => (version.clone(), version),
+        MatchSemver::Latest((version, _)) => (version, "latest".to_string()),
+        MatchSemver::Semver(_) => return Err(AxumNope::VersionNotFound),
+    };
+
+    let (doc_targets, releases): (Vec<String>, Vec<Release>) = spawn_blocking({
         let pool = pool.clone();
         let params = params.clone();
         move || {
             let mut conn = pool.get()?;
             let query = "
-            SELECT
-                crates.id AS crate_id
-            FROM crates
-            WHERE crates.name = $1;";
+                    SELECT
+                        crates.id AS crate_id,
+                        releases.doc_targets
+                    FROM crates
+                    INNER JOIN releases on crates.id = releases.crate_id
+                    WHERE crates.name = $1 and releases.version = $2;";
 
-            let rows = conn.query(query, &[&params.name])?;
+            let rows = conn.query(query, &[&params.name, &version])?;
 
             let result = if rows.is_empty() {
-                return Ok(Vec::new());
+                return Err(AxumNope::CrateNotFound.into());
             } else {
                 &rows[0]
             };
-            // get releases, sorted by semver
-            releases_for_crate(&mut *conn, result.get("crate_id"))
+
+            Ok((
+                MetaData::parse_doc_targets(result.get("doc_targets")),
+                // get releases, sorted by semver
+                releases_for_crate(&mut *conn, result.get("crate_id"))?,
+            ))
         }
     })
     .await?;
 
+    let inner;
+    let (target, inner_path) = {
+        let mut inner_path = req_path.clone();
+
+        let target = if inner_path.len() > 1
+            && doc_targets
+                .iter()
+                .any(|s| Some(s) == params.target.as_ref())
+        {
+            inner_path.remove(0);
+            params.target.as_ref().unwrap()
+        } else {
+            ""
+        };
+
+        inner = inner_path.join("/");
+        (target, inner.trim_end_matches('/'))
+    };
+    let inner_path = if inner_path.is_empty() {
+        format!("{}/index.html", params.name)
+    } else {
+        format!("{}/{inner_path}", params.name)
+    };
+
+    let target = if target.is_empty() {
+        String::new()
+    } else {
+        format!("{target}/")
+    };
+
     let res = ReleaseList {
         releases,
+        target: target.to_string(),
+        inner_path,
         crate_name: params.name,
     };
     Ok(res.into_response())

src/web/routes.rs

@@ -276,10 +276,22 @@ pub(super) fn build_axum_routes() -> AxumRouter {
             "/crate/:name/:version/menus/platforms/:target/",
             get_internal(super::crate_details::get_all_platforms),
         )
+        .route(
+            "/crate/:name/:version/menus/releases/:target",
+            get_internal(super::crate_details::get_all_releases),
+        )
+        .route(
+            "/crate/:name/:version/menus/releases/:target/*path",
+            get_internal(super::crate_details::get_all_releases),
+        )
         .route(
             "/crate/:name/:version/menus/releases",
             get_internal(super::crate_details::get_all_releases),
         )
+        .route(
+            "/crate/:name/:version/menus/releases/:target/",
+            get_internal(super::crate_details::get_all_releases),
+        )
         .route(
             "/-/rustdoc.static/*path",
             get_internal(super::rustdoc::static_asset_handler),

static/menu.js

@@ -93,18 +93,28 @@ function loadAjaxMenu(menu, id, msg, path, extra) {
         currentMenu = newMenu;
         newMenu.className += " pure-menu-active";
         backdrop.style.display = "block";
+
+        const parts = window.location.pathname.split("/");
+        const startFrom = parts[1] === "crate" ? 4 : 3;
+        // We get everything except the first crate name and the version.
+        const innerPath = "/" + parts.slice(startFrom).join("/")
+
         if (newMenu.querySelector("#releases-list")) {
-            loadAjaxMenu(newMenu, "releases-list", "release list", "releases", "");
+            loadAjaxMenu(
+                newMenu, 
+                "releases-list", 
+                "release list", 
+                "releases", 
+                innerPath,
+            );
+
         } else if (newMenu.querySelector("#platforms")) {
-            const parts = window.location.pathname.split("/");
-            const startFrom = parts[1] === "crate" ? 4 : 3;
             loadAjaxMenu(
                 newMenu,
                 "platforms",
                 "platforms list",
                 "platforms",
-                // We get everything except the first crate name and the version.
-                "/" + parts.slice(startFrom).join("/")
+                innerPath,
             );
         }
     }

templates/rustdoc/releases.html

@@ -1,6 +1,4 @@
 {% import "macros.html" as macros %}
-{% set target = "" %}
-{% set inner_path = releases[0].target_name ~ "/index.html" %}
 <ul class="pure-menu-list">
 {{ macros::releases_list(name=crate_name, releases=releases, target=target, inner_path=inner_path) }}
 </ul>