Merge pull request #58 from coq/simplify-middleware

Simplify middleware

Author: tabareau

src/rocqproverorg_web/lib/middleware.ml

@@ -15,50 +15,22 @@ let language_manual_version next_handler request =
   let open Data in
   let init_path = request |> Dream.target |> String.split_on_char '/' in
   let patch (release : Release.t) = Rocqproverorg.Url.patch release.version in
-  let release str =
-    str |> Release.get_by_version
-    |> Option.value ~default:Release.latest
-    |> patch
-  in
-  let release_path = function
-    | [] -> (patch Release.latest, [ "index.html" ])
-    | x :: u -> (
-        match Release.get_by_version x with
-        | None -> (patch Release.latest, x :: u)
-        | Some v -> (patch v, u))
-  in
   let tweak_base u =
     match List.rev u with
-    | _ :: "notes" :: _ -> u
     | base :: _ when String.contains base '.' -> u
     | htap -> List.rev ("index.html" :: htap)
   in
   let path =
     match init_path with
-    | "" :: ("manual" | "refman") :: path ->
-        let version, path = release_path path in
-        "" :: "doc" :: ("V" ^ version) :: "refman" :: tweak_base path
-    | "" :: "stdlib" :: path ->
-        let version, path = release_path path in
-        "" :: "doc" :: ("V" ^ version) :: "stdlib" :: tweak_base path
-    | [ ""; "doc"; version; ("refman" | "stdlib" | "api" | "doc") as path ] ->
-        "" :: "doc" :: version :: path :: [ "index.html" ]
-    | "" :: "api" :: path ->
-        let version, path = release_path path in
-        "" :: "doc" :: ("V" ^ version) :: "api" :: tweak_base path
-    | [ ""; "releases"; version; "index.html" ] -> [ ""; "releases"; version ]
-    | [ ""; "releases"; something ]
-      when String.ends_with ~suffix:".html" something ->
-        let prefix = String.(sub something 0 (length something - 5)) in
-        "" :: "releases" :: (if prefix = "index" then [] else [ prefix ])
-    | "" :: "releases" :: version :: ("htmlman" | "manual") :: tl ->
-        "" :: "manual" :: release version
-        :: (if tl = [] then [ "index.html" ] else tl)
-    | "" :: "releases" :: version :: (("notes" | "api") as folder) :: tl ->
-        "" :: "manual" :: release version :: folder
-        :: (if tl = [] && folder = "api" then [ "index.html" ] else tl)
-    | [ ""; "releases"; version; man ] when String.contains_s man "refman" ->
-        [ ""; "manual"; release version; man ]
+    (* When using the /doc/ path, a version is always already provided. *)
+    | "" :: "doc" :: version :: path ->
+        "" :: "doc" :: version :: tweak_base path
+    (* We provide shorter paths that always redirect to the latest version. *)
+    | ""
+      :: (("api" | "corelib" | "refman" | "stdlib" | "refman-stdlib") :: _ as
+          path) ->
+        let version = patch Release.latest in
+        "" :: "doc" :: ("V" ^ version) :: tweak_base path
     | u -> u
   in
   if init_path = path then next_handler request