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

fixes lack of content length in eos image download

Browse Source
This commit is contained in:
Keagan McClelland
2021-10-14 12:02:50 -06:00
parent 107cf20503
commit edc091b93f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Handler/Marketplace.hs
View File

@@ -108,6 +108,7 @@ import Network.HTTP.Types ( status400
) )
import Protolude.Unsafe ( unsafeFromJust ) import Protolude.Unsafe ( unsafeFromJust )
import Settings ( AppSettings(registryHostname, resourcesDir) ) import Settings ( AppSettings(registryHostname, resourcesDir) )
import System.Directory ( getFileSize )
import System.FilePath ( (</>) ) import System.FilePath ( (</>) )
import UnliftIO.Async ( concurrently import UnliftIO.Async ( concurrently
, mapConcurrently , mapConcurrently
@@ -124,6 +125,7 @@ import Yesod.Core ( HandlerFor
, ToTypedContent(..) , ToTypedContent(..)
, TypedContent , TypedContent
, YesodRequest(..) , YesodRequest(..)
, addHeader
, getRequest , getRequest
, getsYesod , getsYesod
, logWarn , logWarn
@@ -131,6 +133,7 @@ import Yesod.Core ( HandlerFor
, respondSource , respondSource
, sendChunkBS , sendChunkBS
, sendResponseStatus , sendResponseStatus
, setHeader
, typeOctet , typeOctet
) )
import Yesod.Persist.Core ( YesodPersist(runDB) ) import Yesod.Persist.Core ( YesodPersist(runDB) )
@@ -321,6 +324,7 @@ getEosR = do
Nothing -> sendResponseStatus status404 (NotFoundE [i|EOS version satisfying #{spec}|]) Nothing -> sendResponseStatus status404 (NotFoundE [i|EOS version satisfying #{spec}|])
Just r -> do Just r -> do
let imgPath = root </> show r </> "eos.img" let imgPath = root </> show r </> "eos.img"
liftIO (getFileSize imgPath) >>= addHeader "Content-Length" . show
respondSource typeOctet (sourceFile imgPath .| awaitForever sendChunkBS) respondSource typeOctet (sourceFile imgPath .| awaitForever sendChunkBS)
getVersionLatestR :: Handler VersionLatestRes getVersionLatestR :: Handler VersionLatestRes