fix icon endpoint

config/settings.yml

@@ -18,7 +18,7 @@ ip-from-header: "_env:YESOD_IP_FROM_HEADER:false"
 # Optional values with the following production defaults.
 # In development, they default to the inverse.
 #
-detailed-logging: false
+detailed-logging: true
 # should-log-all: false
 # reload-templates: false
 # mutable-static: false

src/Handler/Icons.hs

@@ -36,18 +36,11 @@ ixt = toS $ toUpper <$> drop 1 ".png"
 getIconsR :: AppIdentifier -> Handler TypedContent
 getIconsR appId = do
     (appsDir, appMgrDir) <- getsYesod $ ((</> "apps") . resourcesDir &&& staticBinDir) . appSettings
-    $logInfo $ show ext
     spec <- getVersionFromQuery appsDir ext >>= \case
         Nothing -> sendResponseStatus status404 ("Specified App Version Not Found" :: Text)
         Just v  -> pure v
-    servicePath <- liftIO $ getVersionedFileFromDir appsDir ext spec
-    case servicePath of
-        Nothing -> notFound
-        Just p  -> do
-            -- (_, Just hout, _, _) <- liftIO (createProcess $ iconBs { std_out = CreatePipe })
-            -- respondSource typePlain (runConduit $ yieldMany () [iconBs])
-            -- respondSource typePlain $ sourceHandle hout .| awaitForever sendChunkBS
-            manifest' <- handleS9ErrT $ getManifest appMgrDir appsDir ext
+    let appDir = (<> "/") . (</> show spec) . (</> toS appId) $ appsDir
+    manifest' <- handleS9ErrT $ getManifest appMgrDir appDir ext
     manifest  <- case eitherDecode $ BS.fromStrict manifest' of
         Left e -> do
             $logError "could not parse service manifest!"
@@ -68,13 +61,15 @@ getIconsR appId = do
                         SVG  -> pure typeSvg
                         JPG  -> pure typeJpeg
                         JPEG -> pure typeJpeg
-            respondSource mimeType (sendChunkBS =<< handleS9ErrT (getIcon appMgrDir p ext))
+    respondSource mimeType (sendChunkBS =<< handleS9ErrT (getIcon appMgrDir (appDir </> show ext) ext))
+    -- (_, 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"
 
 getLicenseR :: AppIdentifier -> Handler TypedContent
 getLicenseR appId = do
     (appsDir, appMgrDir) <- getsYesod $ ((</> "apps") . resourcesDir &&& staticBinDir) . appSettings
-    $logInfo $ show ext
     spec <- getVersionFromQuery appsDir ext >>= \case
         Nothing -> sendResponseStatus status404 ("Specified App Version Not Found" :: Text)
         Just v  -> pure v
@@ -88,7 +83,6 @@ getLicenseR appId = do
 getInstructionsR :: AppIdentifier -> Handler TypedContent
 getInstructionsR appId = do
     (appsDir, appMgrDir) <- getsYesod $ ((</> "apps") . resourcesDir &&& staticBinDir) . appSettings
-    $logInfo $ show ext
     spec <- getVersionFromQuery appsDir ext >>= \case
         Nothing -> sendResponseStatus status404 ("Specified App Version Not Found" :: Text)
         Just v  -> pure v

src/Util/Shared.hs

@@ -29,7 +29,6 @@ getBestVersion rootDir ext spec = do
     appVersions <- liftIO $ getAvailableAppVersions rootDir ext
     let satisfactory = filter ((<|| spec) . fst . unRegisteredAppVersion) appVersions
     let best         = getMax <$> foldMap (Just . Max . fst . unRegisteredAppVersion) satisfactory
-    $logInfo $ show best
     pure best
 
 addPackageHeader :: (MonadHandler m, KnownSymbol a) => FilePath -> FilePath -> Extension a -> m ()