Skip to content

HSoC: Tag Features #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 18 commits into from
17 changes: 9 additions & 8 deletions Distribution/Server/Features.hs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import Distribution.Server.Features.Documentation (initDocumentationFeatur
import Distribution.Server.Features.BuildReports (initBuildReportsFeature)
import Distribution.Server.Features.LegacyRedirects (legacyRedirectsFeature)
import Distribution.Server.Features.PreferredVersions (initVersionsFeature)
-- [reverse index disabled] import Distribution.Server.Features.ReverseDependencies (initReverseFeature)
import Distribution.Server.Features.ReverseDependencies (initReverseFeature)
import Distribution.Server.Features.DownloadCount (initDownloadFeature)
import Distribution.Server.Features.Tags (initTagsFeature)
import Distribution.Server.Features.Search (initSearchFeature)
Expand Down Expand Up @@ -127,8 +127,8 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do
initTagsFeature env
mkVersionsFeature <- logStartup "versions" $
initVersionsFeature env
-- mkReverseFeature <- logStartup "reverse deps" $
-- initReverseFeature env
mkReverseFeature <- logStartup "reverse deps" $
initReverseFeature env
mkListFeature <- logStartup "list" $
initListFeature env
mkSearchFeature <- logStartup "search" $
Expand Down Expand Up @@ -247,18 +247,19 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do
uploadFeature
tagsFeature

{- [reverse index disabled]
reverseFeature <- mkReverseFeature
coreFeature
versionsFeature
-}


listFeature <- mkListFeature
coreFeature
-- [reverse index disabled] reverseFeature
reverseFeature
downloadFeature
votesFeature
tagsFeature
versionsFeature
usersFeature

searchFeature <- mkSearchFeature
coreFeature
Expand All @@ -273,7 +274,7 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do
uploadFeature
candidatesFeature
versionsFeature
-- [reverse index disabled] reverseFeature
reverseFeature
tagsFeature
downloadFeature
votesFeature
Expand Down Expand Up @@ -338,7 +339,7 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do
, getFeatureInterface downloadFeature
, getFeatureInterface tagsFeature
, getFeatureInterface versionsFeature
-- [reverse index disabled] , getFeatureInterface reverseFeature
, getFeatureInterface reverseFeature
, getFeatureInterface searchFeature
, getFeatureInterface listFeature
, getFeatureInterface platformFeature
Expand Down
5 changes: 4 additions & 1 deletion Distribution/Server/Features/Core.hs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ data CoreResource = CoreResource {

-- | Find a PackageId or PackageName inside a path.
packageInPath :: forall m a. (MonadPlus m, FromReqURI a) => DynamicPath -> m a,

-- | Find a TagName inside a path.
tagInPath :: forall m a. (MonadPlus m, FromReqURI a) => DynamicPath -> m a,
-- | Find a tarball's PackageId from inside a path, doing some checking
-- for consistency between the package and tarball.
--
Expand Down Expand Up @@ -448,6 +449,8 @@ coreFeature ServerEnv{serverBlobStore = store} UserFeature{..}

packageInPath dpath = maybe mzero return (lookup "package" dpath >>= fromReqURI)

tagInPath dpath = maybe mzero return (lookup "tag" dpath >>= fromReqURI)

packageTarballInPath dpath = do
PackageIdentifier name version <- packageInPath dpath
case lookup "tarball" dpath >>= fromReqURI of
Expand Down
Loading