From 2188208ce0f8f035a3e34cc7c181ef1b7cfe95dd Mon Sep 17 00:00:00 2001
From: Aaron Greenspan <agreenspan@Salt-100014.local>
Date: Tue, 24 Dec 2019 22:23:07 -0700
Subject: [PATCH] logs

---
 src/Handler/Apps.hs | 5 ++++-
 src/Lib/Registry.hs | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Handler/Apps.hs b/src/Handler/Apps.hs
index 47790b7..ad31cb6 100644
--- a/src/Handler/Apps.hs
+++ b/src/Handler/Apps.hs
@@ -52,7 +52,10 @@ getAppR (S9PK appId) = getApp appResourceDir appId
 getApp :: FilePath -> FilePath -> Handler TypedContent
 getApp rootDir appId = do
     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
         Nothing -> respondSource typePlain sendFlush
         Just (RegisteredAppVersion (_, filePath)) -> do
diff --git a/src/Lib/Registry.hs b/src/Lib/Registry.hs
index 381091c..e1d1e3b 100644
--- a/src/Lib/Registry.hs
+++ b/src/Lib/Registry.hs
@@ -38,10 +38,10 @@ sysResourceDir :: FilePath
 sysResourceDir = resourcesPath </> "sys"
 
 appManifestPath :: FilePath
-appManifestPath = appResourceDir </> "apps.yaml"
+appManifestPath = appResourceDir </> appManifestFile
 
 appManifestFile :: FilePath
-appManifestFile = "apps.yml"
+appManifestFile = "apps.yaml"
 
 s9pkExt :: String -> FilePath
 s9pkExt = show . S9PK
@@ -61,9 +61,11 @@ loadSysRegistry = loadRegistry sysResourceDir
 loadRegistry :: MonadIO m => FilePath -> m Registry
 loadRegistry rootDirectory = liftIO $ do
     appDirectories <- getSubDirectories rootDirectory
+    putStrLn $ "got appDirectories for " <> rootDirectory <> ": " <> show appDirectories
     foldM
         ( \registry appId -> do
             subdirs <- getSubDirectories (rootDirectory </> appId)
+            putStrLn $ "got appDirectories for " <> (rootDirectory </> appId) <> ": " <> show subdirs
             let validVersions = mapMaybe readMaybe subdirs
             versionApps <- for validVersions $ \v ->
                 getAppFileFromDir rootDirectory appId v