From 6cf5be6ff1a495d27dec6733a96017d0a7de6e25 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 16 Mar 2015 13:34:10 +0200 Subject: [PATCH] Remove bundle links in preparation of much larger v2 bundles --- Handler/Alias.hs | 3 +-- Handler/StackageIndex.hs | 16 ---------------- config/routes | 1 - templates/stackage-home.hamlet | 8 -------- 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/Handler/Alias.hs b/Handler/Alias.hs index c3657ec..c47baf2 100644 --- a/Handler/Alias.hs +++ b/Handler/Alias.hs @@ -7,7 +7,7 @@ module Handler.Alias import Import import Data.Slug (Slug) import Handler.StackageHome (getStackageHomeR, getStackageMetadataR, getStackageCabalConfigR, getSnapshotPackagesR, getDocsR) -import Handler.StackageIndex (getStackageIndexR, getStackageBundleR) +import Handler.StackageIndex (getStackageIndexR) import Handler.StackageSdist (getStackageSdistR) import Handler.Hoogle (getHoogleR) @@ -74,7 +74,6 @@ goSid sid pieces = do StackageMetadataR -> getStackageMetadataR slug >>= sendResponse StackageCabalConfigR -> getStackageCabalConfigR slug >>= sendResponse StackageIndexR -> getStackageIndexR slug >>= sendResponse - StackageBundleR -> getStackageBundleR slug >>= sendResponse StackageSdistR pnv -> getStackageSdistR slug pnv >>= sendResponse SnapshotPackagesR -> getSnapshotPackagesR slug >>= sendResponse DocsR -> getDocsR slug >>= sendResponse diff --git a/Handler/StackageIndex.hs b/Handler/StackageIndex.hs index 83a4585..cc2f065 100644 --- a/Handler/StackageIndex.hs +++ b/Handler/StackageIndex.hs @@ -16,19 +16,3 @@ getStackageIndexR slug = do addHeader "content-disposition" "attachment; filename=\"00-index.tar.gz\"" neverExpires respondSource "application/x-gzip" $ mapOutput (Chunk . toBuilder) src - -getStackageBundleR :: SnapSlug -> Handler TypedContent -getStackageBundleR slug = do - Entity _ stackage <- runDB $ getBy404 $ UniqueSnapshot slug - let ident = stackageIdent stackage - slug' = stackageSlug stackage - msrc <- storeRead $ SnapshotBundle ident - case msrc of - Nothing -> notFound - Just src -> do - addHeader "content-disposition" $ mconcat - [ "attachment; filename=\"bundle-" - , toPathPiece slug' - , ".tar.gz\"" - ] - respondSource "application/x-gzip" $ mapOutput (Chunk . toBuilder) src diff --git a/config/routes b/config/routes index 54134e8..76f35b5 100644 --- a/config/routes +++ b/config/routes @@ -21,7 +21,6 @@ /metadata StackageMetadataR GET /cabal.config StackageCabalConfigR GET /00-index.tar.gz StackageIndexR GET - /bundle StackageBundleR GET /package/#PackageNameVersion StackageSdistR GET /packages SnapshotPackagesR GET /docs DocsR GET diff --git a/templates/stackage-home.hamlet b/templates/stackage-home.hamlet index cdd04e1..15f3b25 100644 --- a/templates/stackage-home.hamlet +++ b/templates/stackage-home.hamlet @@ -74,11 +74,3 @@ $newline never Docs #{synopsis} - - -
-

- $if hasBundle - - - \Bundle