Start9/registry
2
0
Fork 0
mirror of https://github.com/Start9Labs/registry.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Lucy Cifferello
2024-05-01 14:40:12 -04:00
parent 80e2d80b27
commit f9e476145b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Handler/Package/V1/Index.hs
View File

@@ -131,9 +131,9 @@ getPackageIndexR = do
limit' <- fromMaybe 20 <$> getLimitQuery limit' <- fromMaybe 20 <$> getLimitQuery
query <- T.strip . fromMaybe "" <$> lookupGetParam "query" query <- T.strip . fromMaybe "" <$> lookupGetParam "query"
let (source, packageRanges) = case pkgIds of let (source, packageRanges) = case pkgIds of
Nothing -> (Database.Queries.serviceQuerySource category query pkgArch ram, const Any) Nothing -> (serviceQuerySource category query pkgArch ram, const Any)
Just packages -> Just packages ->
let s = Database.Queries.getPkgDataSource (packageReqId <$> packages) pkgArch ram let s = getPkgDataSource (packageReqId <$> packages) pkgArch ram
r = fromMaybe None . (flip lookup $ (packageReqId &&& packageReqVersion) <$> packages) r = fromMaybe None . (flip lookup $ (packageReqId &&& packageReqVersion) <$> packages)
in (s, r) in (s, r)
filteredPackages <- filteredPackages <-
@@ -141,7 +141,7 @@ getPackageIndexR = do
runConduit $ runConduit $
source source
-- group conduit pipeline by pkg id -- group conduit pipeline by pkg id
.| Database.Queries.collateVersions .| collateVersions
-- filter out versions of apps that are incompatible with the OS predicate -- filter out versions of apps that are incompatible with the OS predicate
.| mapC (second (filter (osPredicate . versionRecordOsVersion . fst))) .| mapC (second (filter (osPredicate . versionRecordOsVersion . fst)))
-- filter hardware device compatability -- filter hardware device compatability
@@ -156,7 +156,7 @@ getPackageIndexR = do
-- grab the latest matching version if it exists -- grab the latest matching version if it exists
.| concatMapC (\(a, b) -> (a,b,) <$> (selectLatestVersionFromSpec packageRanges b)) .| concatMapC (\(a, b) -> (a,b,) <$> (selectLatestVersionFromSpec packageRanges b))
-- construct -- construct
.| mapMC (\(a, b, c) -> PackageMetadata a b (versionRecordNumber c) <$> Database.Queries.getCategoriesFor a) .| mapMC (\(a, b, c) -> PackageMetadata a b (versionRecordNumber c) <$> getCategoriesFor a)
-- pages start at 1 for some reason. TODO: make pages start at 0 -- pages start at 1 for some reason. TODO: make pages start at 0
.| (dropC (limit' * (page - 1)) *> takeC limit') .| (dropC (limit' * (page - 1)) *> takeC limit')
.| sinkList .| sinkList
@@ -211,12 +211,12 @@ getPackageDependencies ::
ReaderT SqlBackend m (HashMap PkgId DependencyRes) ReaderT SqlBackend m (HashMap PkgId DependencyRes)
getPackageDependencies PackageMetadata{packageMetadataPkgId = pkg, packageMetadataPkgVersion = pkgVersion} = getPackageDependencies PackageMetadata{packageMetadataPkgId = pkg, packageMetadataPkgVersion = pkgVersion} =
do do
depPkgRecordEntities <- Database.Queries.getPkgDependencyData pkg pkgVersion depPkgRecordEntities <- getPkgDependencyData pkg pkgVersion
fmap HM.fromList $ fmap HM.fromList $
for depPkgRecordEntities $ \(pr) -> do for depPkgRecordEntities $ \(pr) -> do
let depId = unPkgRecordKey $ entityKey pr let depId = unPkgRecordKey $ entityKey pr
let depPkgRecord = entityVal pr let depPkgRecord = entityVal pr
mVersionRecord <- Database.Queries.getLatestVersionRecord $ entityKey pr mVersionRecord <- getLatestVersionRecord $ entityKey pr
case mVersionRecord of case mVersionRecord of
Just VersionRecord{..} -> do Just VersionRecord{..} -> do
icon <- lift $ loadIcon depId versionRecordNumber icon <- lift $ loadIcon depId versionRecordNumber