Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-02 05:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes timestamp parsing

Browse Source
This commit is contained in:
Keagan McClelland
2021-01-18 16:07:02 -07:00
committed by Aiden McClelland
parent 718d556080
commit 68a87c8c4f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
agent/src/Lib/External/Registry.hs vendored
View File

@@ -36,6 +36,7 @@ import Lib.SystemPaths
import Lib.Types.Core import Lib.Types.Core
import Lib.Types.Emver import Lib.Types.Emver
import Lib.Types.ServerApp import Lib.Types.ServerApp
import Data.Time.ISO8601 ( parseISO8601 )
newtype AppManifestRes = AppManifestRes newtype AppManifestRes = AppManifestRes
{ storeApps :: [StoreApp] } deriving (Eq, Show) { storeApps :: [StoreApp] } deriving (Eq, Show)
@@ -135,7 +136,7 @@ parseAppData = do
storeAppVersions <- ad .: "version-info" >>= \case storeAppVersions <- ad .: "version-info" >>= \case
[] -> fail "No Valid Version Info" [] -> fail "No Valid Version Info"
(x : xs) -> pure $ x :| xs (x : xs) -> pure $ x :| xs
storeAppTimestamp <- ad .: "timestamp" storeAppTimestamp <- ad .: "timestamp" >>= maybe (fail "Invalid ISO8601 Timestamp") pure . parseISO8601
pure StoreApp { .. } pure StoreApp { .. }
getAppVersionForSpec :: (Has RegistryUrl sig m, Has (Error S9Error) sig m, MonadIO m) getAppVersionForSpec :: (Has RegistryUrl sig m, Has (Error S9Error) sig m, MonadIO m)

2
agent/src/Lib/Types/ServerApp.hs
View File

@@ -36,7 +36,7 @@ instance FromJSON StoreAppVersionInfo where
parseJSON = withObject "Store App Version Info" $ \o -> do parseJSON = withObject "Store App Version Info" $ \o -> do
storeAppVersionInfoVersion <- o .: "version" storeAppVersionInfoVersion <- o .: "version"
storeAppVersionInfoReleaseNotes <- o .: "release-notes" storeAppVersionInfoReleaseNotes <- o .: "release-notes"
storeAppVersionInfoInstallAlert <- o .: "install-alert" storeAppVersionInfoInstallAlert <- o .:? "install-alert"
pure StoreAppVersionInfo { .. } pure StoreAppVersionInfo { .. }
instance ToJSON StoreAppVersionInfo where instance ToJSON StoreAppVersionInfo where
toJSON StoreAppVersionInfo {..} = toJSON StoreAppVersionInfo {..} =