Start9/registry
2
0
Fork 0
mirror of https://github.com/Start9Labs/registry.git synced 2026-03-30 19:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

swap arguments for loadIcon

Browse Source
This commit is contained in:
Keagan McClelland
2022-02-07 12:59:07 -07:00
parent fd5c816208
commit 7d10c19ee5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Handler/Marketplace.hs
View File

@@ -360,7 +360,7 @@ getPackageListR = do
let pkgId = unPkgRecordKey pkgKey let pkgId = unPkgRecordKey pkgKey
manifest <- flip runReaderT settings $ (snd <$> getManifest pkgId pkgVersion) >>= \bs -> manifest <- flip runReaderT settings $ (snd <$> getManifest pkgId pkgVersion) >>= \bs ->
runConduit $ bs .| CL.foldMap LBS.fromStrict runConduit $ bs .| CL.foldMap LBS.fromStrict
icon <- loadIcon pkgVersion pkgId icon <- loadIcon pkgId pkgVersion
deps <- constructDependenciesApiRes dependencies deps <- constructDependenciesApiRes dependencies
pure $ PackageRes { packageResIcon = encodeBase64 icon pure $ PackageRes { packageResIcon = encodeBase64 icon
-- pass through raw JSON Value, we have checked its correct parsing above -- pass through raw JSON Value, we have checked its correct parsing above
@@ -377,12 +377,12 @@ getPackageListR = do
constructDependenciesApiRes deps = traverse constructDependenciesApiRes deps = traverse
(\(depKey, depTitle, depVersion) -> do (\(depKey, depTitle, depVersion) -> do
let depId = unPkgRecordKey depKey let depId = unPkgRecordKey depKey
icon <- loadIcon depVersion depId icon <- loadIcon depId depVersion
pure (depId, DependencyRes { dependencyResTitle = depTitle, dependencyResIcon = encodeBase64 icon }) pure (depId, DependencyRes { dependencyResTitle = depTitle, dependencyResIcon = encodeBase64 icon })
) )
deps deps
loadIcon :: (Monad m, MonadResource m, MonadReader r m, Has PkgRepo r) => Version -> PkgId -> m ByteString loadIcon :: (Monad m, MonadResource m, MonadReader r m, Has PkgRepo r) => PkgId -> Version -> m ByteString
loadIcon version pkg = do loadIcon pkg version = do
(_, _, src) <- getIcon pkg version (_, _, src) <- getIcon pkg version
runConduit $ src .| CL.foldMap id runConduit $ src .| CL.foldMap id