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

rename and degeneralize

Browse Source
This commit is contained in:
Keagan McClelland
2021-09-27 11:26:00 -06:00
parent 97e779941c
commit f79c14fa60
2 changed files with 9 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Handler/Marketplace.hs
View File

@@ -461,19 +461,11 @@ mapDependencyMetadata domain metadata (appId, depInfo) = do
-- sendResponseStatus status400 e'
-- Right (i' :: URL) -> pure $ i' <> T.pack icon
decodeInstructions :: (MonadUnliftIO m, MonadHandler m, KnownSymbol a, MonadThrow m)
=> FilePath
-> FilePath
-> Extension a
-> m Text
decodeInstructions :: (MonadUnliftIO m, MonadHandler m, MonadThrow m) => FilePath -> FilePath -> S9PK -> m Text
decodeInstructions appmgrPath depPath package = do
sourceInstructions appmgrPath depPath package (\bs -> sinkMem (bs .| CT.decode CT.utf8))
decodeLicense :: (MonadUnliftIO m, MonadThrow m, MonadHandler m, KnownSymbol a)
=> FilePath
-> FilePath
-> Extension a
-> m Text
decodeLicense :: (MonadUnliftIO m, MonadThrow m, MonadHandler m) => FilePath -> FilePath -> S9PK -> m Text
decodeLicense appmgrPath depPath package =
sourceLicense appmgrPath depPath package (\bs -> sinkMem (bs .| CT.decode CT.utf8))

34
src/Lib/External/AppMgr.hs vendored
View File

@@ -57,10 +57,10 @@ readProcessInheritStderr a b c sink = do
$ System.Process.Typed.proc a b
withProcessTerm_ pc $ \p -> sink (getStdout p)
sourceConfig :: (MonadUnliftIO m, MonadThrow m, KnownSymbol a)
sourceConfig :: (MonadUnliftIO m, MonadThrow m)
=> FilePath
-> FilePath
-> Extension a
-> S9PK
-> (ConduitT () ByteString m () -> m r)
-> m r
sourceConfig appmgrPath appPath e@(Extension appId) sink = do
@@ -70,48 +70,28 @@ sourceConfig appmgrPath appPath e@(Extension appId) sink = do
""
appmgr sink `catch` \ece -> throwIO (AppMgrE [i|inspect config #{appId} \--json|] (eceExitCode ece))
sourceManifest :: (MonadUnliftIO m, KnownSymbol a)
=> FilePath
-> FilePath
-> Extension a
-> (ConduitT () ByteString m () -> m r)
-> m r
sourceManifest :: (MonadUnliftIO m) => FilePath -> FilePath -> S9PK -> (ConduitT () ByteString m () -> m r) -> m r
sourceManifest appmgrPath appPath e@(Extension appId) sink = do
let appmgr = readProcessInheritStderr (appmgrPath <> "embassy-sdk") ["inspect", "manifest", appPath </> show e] ""
appmgr sink `catch` \ece -> throwIO (AppMgrE [i|embassy-sdk inspect manifest #{appId}|] (eceExitCode ece))
sourceIcon :: (MonadUnliftIO m, KnownSymbol a)
=> FilePath
-> FilePath
-> Extension a
-> (ConduitT () ByteString m () -> m r)
-> m r
sourceIcon :: (MonadUnliftIO m) => FilePath -> FilePath -> S9PK -> (ConduitT () ByteString m () -> m r) -> m r
sourceIcon appmgrPath appPath (Extension icon) sink = do
let appmgr = readProcessInheritStderr (appmgrPath <> "embassy-sdk") ["inspect", "icon", appPath] ""
appmgr sink `catch` \ece -> throwIO $ AppMgrE [i|embassy-sdk inspect icon #{icon}|] (eceExitCode ece)
getPackageHash :: (MonadUnliftIO m, KnownSymbol a) => FilePath -> FilePath -> Extension a -> m ByteString
getPackageHash :: (MonadUnliftIO m) => FilePath -> FilePath -> S9PK -> m ByteString
getPackageHash appmgrPath appPath e@(Extension appId) = do
let appmgr = readProcessInheritStderr (appmgrPath <> "embassy-sdk") ["inspect", "hash", appPath <> show e] ""
appmgr (\bsSource -> runConduit $ bsSource .| CL.foldMap id)
`catch` \ece -> throwIO $ AppMgrE [i|embassy-sdk inspect hash #{appId}|] (eceExitCode ece)
sourceInstructions :: (MonadUnliftIO m, KnownSymbol a)
=> FilePath
-> FilePath
-> Extension a
-> (ConduitT () ByteString m () -> m r)
-> m r
sourceInstructions :: (MonadUnliftIO m) => FilePath -> FilePath -> S9PK -> (ConduitT () ByteString m () -> m r) -> m r
sourceInstructions appmgrPath appPath (Extension appId) sink = do
let appmgr = readProcessInheritStderr (appmgrPath <> "embassy-sdk") ["inspect", "instructions", appPath] ""
appmgr sink `catch` \ece -> throwIO $ AppMgrE [i|embassy-sdk inspect instructions #{appId}|] (eceExitCode ece)
sourceLicense :: (MonadUnliftIO m, KnownSymbol a)
=> FilePath
-> FilePath
-> Extension a
-> (ConduitT () ByteString m () -> m r)
-> m r
sourceLicense :: (MonadUnliftIO m) => FilePath -> FilePath -> S9PK -> (ConduitT () ByteString m () -> m r) -> m r
sourceLicense appmgrPath appPath (Extension appId) sink = do
let appmgr = readProcessInheritStderr (appmgrPath <> "embassy-sdk") ["inspect", "license", appPath] ""
appmgr sink `catch` \ece -> throwIO $ AppMgrE [i|embassy-sdk inspect license #{appId}|] (eceExitCode ece)