synchronize with 0.3.0 branch

This commit is contained in:
Lucy Cifferello
2021-09-23 19:40:39 -06:00
committed by Keagan McClelland
parent 16251afd35
commit 6fc7431930
4 changed files with 41 additions and 49 deletions

View File

@@ -39,7 +39,7 @@ getIconsR appId = do
spec <- getVersionFromQuery appsDir ext >>= \case
Nothing -> sendResponseStatus status404 ("Specified App Version Not Found" :: Text)
Just v -> pure v
let appDir = (<> "/") . (</> show spec) . (</> toS appId) $ appsDir
let appDir = (<> "/") . (</> show spec) . (</> show appId) $ appsDir
manifest' <- handleS9ErrT $ getManifest appMgrDir appDir ext
manifest <- case eitherDecode manifest' of
Left e -> do
@@ -65,7 +65,7 @@ getIconsR appId = do
-- (_, Just hout, _, _) <- liftIO (createProcess $ iconBs { std_out = CreatePipe })
-- respondSource typePlain (runConduit $ yieldMany () [iconBs])
-- respondSource typePlain $ sourceHandle hout .| awaitForever sendChunkBS
where ext = Extension (toS appId) :: Extension "s9pk"
where ext = Extension (show appId) :: Extension "s9pk"
getLicenseR :: AppIdentifier -> Handler TypedContent
getLicenseR appId = do