This commit is contained in:
Lucy Cifferello
2024-04-30 17:19:19 -04:00
parent 4b7034a9c6
commit 4eb81d7e59

View File

@@ -79,6 +79,7 @@ import Startlude (
(<&>), (<&>),
(=<<), (=<<),
(>) (>)
show
) )
import UnliftIO (Concurrently (..), mapConcurrently) import UnliftIO (Concurrently (..), mapConcurrently)
import Yesod ( import Yesod (
@@ -93,7 +94,7 @@ import Database.Persist.Postgresql (entityVal)
import Yesod.Core (getsYesod) import Yesod.Core (getsYesod)
import Data.List (head) import Data.List (head)
import Yesod (YesodRequest(reqGetParams)) import Yesod (YesodRequest(reqGetParams))
import Yesod (getRequest) import Yesod (getRequest, logWarn)
import Data.List (last) import Data.List (last)
import Data.Text (isPrefixOf) import Data.Text (isPrefixOf)
import Startlude (length) import Startlude (length)
@@ -219,7 +220,12 @@ getPackageDependencies osPredicate PackageMetadata{packageMetadataPkgId = pkg, p
pkgDepInfo' <- getPkgDependencyData pkg pkgVersion pkgDepInfo' <- getPkgDependencyData pkg pkgVersion
let pkgDepInfo = fmap (\a -> (entityVal $ fst a, entityVal $ snd a)) pkgDepInfo' let pkgDepInfo = fmap (\a -> (entityVal $ fst a, entityVal $ snd a)) pkgDepInfo'
pkgDepInfoWithVersions <- traverse getDependencyVersions (fst <$> pkgDepInfo) pkgDepInfoWithVersions <- traverse getDependencyVersions (fst <$> pkgDepInfo)
let depMetadata = zipWith (selectDependencyBestVersion osPredicate) pkgDepInfo pkgDepInfoWithVersions $logWarn $ "***PKG DEP INFO WITH VERSIONS***"
$logWarn $ show pkgDepInfoWithVersions
let compatiblePkgDepInfo = fmap (filter (osPredicate . versionRecordOsVersion)) pkgDepInfoWithVersions
$logWarn $ "***COMPATIBLE PKG DEP INFO***"
$logWarn $ show compatiblePkgDepInfo
let depMetadata = zipWith selectDependencyBestVersion pkgDepInfo compatiblePkgDepInfo
lift $ lift $
fmap HM.fromList $ fmap HM.fromList $
for depMetadata $ \(depId, title, v, isLocal) -> do for depMetadata $ \(depId, title, v, isLocal) -> do