Have /latest be an actual page, not a redirect

elm · Aug 22, 2016 · 2995ff9 · 2995ff9
1 parent d5370a8
commit 2995ff9
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/src/backend/Routes.hs b/src/backend/Routes.hs
@@ -46,16 +46,14 @@ package =
       ifTop (ServeFile.pkgOverview pkg)
         <|>
         route
-          [ ("latest", redirectToLatest pkg)
-          , (":version", servePackageInfo pkg)
+          [ ("latest", serveLatestInfo pkg)
+          , (":version", servePackageInfo pkg =<< getParameter "version" Pkg.versionFromString)
           ]
 
 
-servePackageInfo :: Pkg.Name -> Snap ()
-servePackageInfo name =
-  do  version <- getParameter "version" Pkg.versionFromString
-
-      let pkgDir = packageRoot name version
+servePackageInfo :: Pkg.Name -> Pkg.Version -> Snap ()
+servePackageInfo name version =
+  do  let pkgDir = packageRoot name version
       exists <- liftIO $ doesDirectoryExist pkgDir
       when (not exists) pass
 
@@ -80,23 +78,19 @@ serveModule name version =
             ServeFile.pkgDocs name version (Just moduleName)
 
 
-redirectToLatest :: Pkg.Name -> Snap ()
-redirectToLatest name =
+serveLatestInfo :: Pkg.Name -> Snap ()
+serveLatestInfo name =
   do  maybeVersions <- liftIO $ PkgSummary.readVersionsOf name
       case maybeVersions of
         Just versions@(_:_) ->
-          do  let latestVersion = last (List.sort versions)
-              let url = "/packages/" ++ Pkg.toUrl name ++ "/" ++ Pkg.versionToString latestVersion ++ "/"
-              request <- getRequest
-              redirect (BS.append (BS.pack url) (rqPathInfo request))
+          servePackageInfo name (last (List.sort versions))
 
         _ ->
           httpStringError 404 $
             "Could not find any versions of package " ++ Pkg.toString name
 
 
 
-
 -- DIRECTORIES