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

parse empty device object as null

Browse Source
This commit is contained in:
Lucy Cifferello
2023-08-02 17:20:42 -04:00
parent a26920b9b8
commit cc8e5a8955
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Lib/Types/Manifest.hs
View File

@@ -11,7 +11,7 @@ import Data.String.Interpolate.IsString (i)
import Data.Text qualified as T import Data.Text qualified as T
import Lib.Types.Core (PkgId, OsArch) import Lib.Types.Core (PkgId, OsArch)
import Lib.Types.Emver (Version (..), VersionRange) import Lib.Types.Emver (Version (..), VersionRange)
import Startlude (ByteString, Eq, Generic, Hashable, Maybe (..), Monad ((>>=)), Read, Show, Text, for, pure, readMaybe, ($), Int, (.), fmap, String) import Startlude (ByteString, Eq, Generic, Hashable, Maybe (..), Monad ((>>=)), Read, Show, Text, for, pure, readMaybe, ($), Int, (.), fmap, String, null, (<$>), otherwise)
import Data.Aeson import Data.Aeson
( eitherDecodeStrict, ( eitherDecodeStrict,
(.:), (.:),
@@ -28,6 +28,7 @@ import Database.Persist.Class ( PersistField(..) )
import Data.Maybe (maybe) import Data.Maybe (maybe)
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import Yesod.Persist (LiteralType(Escaped)) import Yesod.Persist (LiteralType(Escaped))
import Data.Aeson.Types (Value(Object), Parser)
data PackageManifest = PackageManifest data PackageManifest = PackageManifest
@@ -65,11 +66,17 @@ instance FromJSON PackageManifest where
let packageManifestAlerts = HM.fromList a let packageManifestAlerts = HM.fromList a
packageManifestDependencies <- o .: "dependencies" packageManifestDependencies <- o .: "dependencies"
packageManifestEosVersion <- o .: "eos-version" packageManifestEosVersion <- o .: "eos-version"
packageHardwareDevice <- o .:? "hardware-requirements" >>= maybe (pure Nothing) (.:? "device") packageHardwareDevice <- o .:? "hardware-requirements" >>= maybe (pure Nothing) (.:? "devices") >>= parsePackageDevice
packageHardwareRam <- o .:? "hardware-requirements" >>= maybe (pure Nothing) (.:? "ram") packageHardwareRam <- o .:? "hardware-requirements" >>= maybe (pure Nothing) (.:? "ram")
packageHardwareArch <- o .:? "hardware-requirements" >>= maybe (pure Nothing) (.:? "arch") packageHardwareArch <- o .:? "hardware-requirements" >>= maybe (pure Nothing) (.:? "arch")
pure PackageManifest{..} pure PackageManifest{..}
parsePackageDevice :: Maybe Value -> Parser (Maybe PackageDevice)
parsePackageDevice (Just (Object o))
| null o = pure Nothing
| otherwise = Just . PackageDevice <$> parseJSON (Object o)
parsePackageDevice _ = pure Nothing
data PackageDependency = PackageDependency data PackageDependency = PackageDependency
{ packageDependencyOptional :: !(Maybe Text) { packageDependencyOptional :: !(Maybe Text)
, packageDependencyVersion :: !VersionRange , packageDependencyVersion :: !VersionRange