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

logs

Browse Source
This commit is contained in:
Aaron Greenspan
2019-12-24 22:23:07 -07:00
parent 840acbcac6
commit 2188208ce0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Handler/Apps.hs
View File

@@ -52,7 +52,10 @@ getAppR (S9PK appId) = getApp appResourceDir appId
getApp :: FilePath -> FilePath -> Handler TypedContent getApp :: FilePath -> FilePath -> Handler TypedContent
getApp rootDir appId = do getApp rootDir appId = do
spec <- querySpecD mostRecentVersion <$> lookupGetParam "spec" spec <- querySpecD mostRecentVersion <$> lookupGetParam "spec"
appVersions <- registeredAppVersions appId <$> loadRegistry rootDir reg <- loadRegistry rootDir
putStrLn ("got registry" :: String)
let appVersions = registeredAppVersions appId reg
putStrLn $ "valid appversion for " <> appId <> ": " <> show (fmap version appVersions)
case getSpecifiedAppVersion spec appVersions of case getSpecifiedAppVersion spec appVersions of
Nothing -> respondSource typePlain sendFlush Nothing -> respondSource typePlain sendFlush
Just (RegisteredAppVersion (_, filePath)) -> do Just (RegisteredAppVersion (_, filePath)) -> do

6
src/Lib/Registry.hs
View File

@@ -38,10 +38,10 @@ sysResourceDir :: FilePath
sysResourceDir = resourcesPath </> "sys" sysResourceDir = resourcesPath </> "sys"
appManifestPath :: FilePath appManifestPath :: FilePath
appManifestPath = appResourceDir </> "apps.yaml" appManifestPath = appResourceDir </> appManifestFile
appManifestFile :: FilePath appManifestFile :: FilePath
appManifestFile = "apps.yml" appManifestFile = "apps.yaml"
s9pkExt :: String -> FilePath s9pkExt :: String -> FilePath
s9pkExt = show . S9PK s9pkExt = show . S9PK
@@ -61,9 +61,11 @@ loadSysRegistry = loadRegistry sysResourceDir
loadRegistry :: MonadIO m => FilePath -> m Registry loadRegistry :: MonadIO m => FilePath -> m Registry
loadRegistry rootDirectory = liftIO $ do loadRegistry rootDirectory = liftIO $ do
appDirectories <- getSubDirectories rootDirectory appDirectories <- getSubDirectories rootDirectory
putStrLn $ "got appDirectories for " <> rootDirectory <> ": " <> show appDirectories
foldM foldM
( \registry appId -> do ( \registry appId -> do
subdirs <- getSubDirectories (rootDirectory </> appId) subdirs <- getSubDirectories (rootDirectory </> appId)
putStrLn $ "got appDirectories for " <> (rootDirectory </> appId) <> ": " <> show subdirs
let validVersions = mapMaybe readMaybe subdirs let validVersions = mapMaybe readMaybe subdirs
versionApps <- for validVersions $ \v -> versionApps <- for validVersions $ \v ->
getAppFileFromDir rootDirectory appId v getAppFileFromDir rootDirectory appId v