haskell/stackage-server
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage-server.git synced 2026-02-05 23:57:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use getBy404

Browse Source
This commit is contained in:
Chris Done 2014-11-03 13:26:09 +01:00
parent f51e70c09e
commit d195dea789
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Handler/Package.hs
View File

@ -23,9 +23,7 @@ getPackageR pn = do
asInt = id asInt = id
haddocksLink ident version = haddocksLink ident version =
HaddockR ident [concat [toPathPiece pn, "-", toPathPiece version]] HaddockR ident [concat [toPathPiece pn, "-", toPathPiece version]]
(latestVersion, packages, downloads, recentDownloads, Entity _ metadata) <- runDB $ do (packages, downloads, recentDownloads, Entity _ metadata) <- runDB $ do
mupload <- selectFirst [UploadedName ==. pn] [Desc UploadedUploaded]
Entity _ (Uploaded _ latestVersion _) <- maybe notFound return mupload
packages <- fmap (map reformat) $ E.select $ E.from $ \(p, s) -> do packages <- fmap (map reformat) $ E.select $ E.from $ \(p, s) -> do
E.where_ $ (p ^. PackageStackage E.==. s ^. StackageId) E.where_ $ (p ^. PackageStackage E.==. s ^. StackageId)
&&. (p ^. PackageName' E.==. E.val pn) &&. (p ^. PackageName' E.==. E.val pn)
@ -38,9 +36,8 @@ getPackageR pn = do
now <- liftIO getCurrentTime now <- liftIO getCurrentTime
let nowMinus30 = addUTCTime (-30 * 24 * 60 * 60) now let nowMinus30 = addUTCTime (-30 * 24 * 60 * 60) now
recentDownloads <- count [DownloadPackage ==. pn, DownloadTimestamp >=. nowMinus30] recentDownloads <- count [DownloadPackage ==. pn, DownloadTimestamp >=. nowMinus30]
metadata <- fmap listToMaybe (selectList [MetadataName ==. pn] [LimitTo 1]) >>= metadata <- getBy404 (UniqueMetadata pn)
maybe notFound return return (packages, downloads, recentDownloads, metadata)
return (latestVersion, packages, downloads, recentDownloads, metadata)
readmeText <- return "TODO" readmeText <- return "TODO"
let readmeHtml = markdown def readmeText let readmeHtml = markdown def readmeText
deps = enumerate (metadataDeps metadata) deps = enumerate (metadataDeps metadata)

2
templates/package.hamlet
View File

@ -5,7 +5,7 @@ $newline never
<h1> <h1>
#{pn} # #{pn} #
<span .latest-version> <span .latest-version>
#{latestVersion} # #{metadataVersion metadata} #
<small> <small>
(current) (current)
<div .row> <div .row>