Skip to content

Commit f7893c0

Browse files
committed
only calculate forkAliasMap once
1 parent ffe34d1 commit f7893c0

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/App/Fossa/Analyze.hs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ analyze cfg = Diag.context "fossa-analyze" $ do
477477
(Just firstParty, Nothing) -> Just firstParty
478478
let keywordSearchResultsFound = (maybe False (not . null . lernieResultsKeywordSearches) lernieResults)
479479
let forkAliasMap = mkForkAliasMap forkAliases
480-
let outputResult = buildResult includeAll additionalSourceUnits filteredProjects' licenseSourceUnits forkAliases
480+
let outputResult = buildResult includeAll additionalSourceUnits filteredProjects' licenseSourceUnits forkAliasMap
481481

482482
scanUnits <-
483483
case (keywordSearchResultsFound, checkForEmptyUpload includeAll projectScans filteredProjects' additionalSourceUnits licenseSourceUnits) of
@@ -617,8 +617,8 @@ instance Diag.ToDiagnostic AnalyzeError where
617617
]
618618
Errata (Just "Only keyword search results found") [] (Just body)
619619

620-
buildResult :: Flag IncludeAll -> [SourceUnit] -> [ProjectResult] -> Maybe LicenseSourceUnit -> [ForkAlias] -> Aeson.Value
621-
buildResult includeAll srcUnits projects licenseSourceUnits forkAliases =
620+
buildResult :: Flag IncludeAll -> [SourceUnit] -> [ProjectResult] -> Maybe LicenseSourceUnit -> Map.Map Locator Locator -> Aeson.Value
621+
buildResult includeAll srcUnits projects licenseSourceUnits forkAliasMap =
622622
Aeson.object
623623
[ "projects" .= map (buildProject forkAliasMap) projects
624624
, "sourceUnits" .= mergedUnits
@@ -629,7 +629,6 @@ buildResult includeAll srcUnits projects licenseSourceUnits forkAliases =
629629
Just licenseUnits -> do
630630
NE.toList $ mergeSourceAndLicenseUnits finalSourceUnits licenseUnits
631631
scannedUnits = map (Srclib.projectToSourceUnit (fromFlag IncludeAll includeAll)) projects
632-
forkAliasMap = mkForkAliasMap forkAliases
633632
finalSourceUnits = map (translateSourceUnitLocators forkAliasMap) (srcUnits ++ scannedUnits)
634633

635634
-- | Create a fork alias map from a list of fork aliases.

0 commit comments

Comments
 (0)