github-mirrors/odc-analyzer
1
0
Fork 0
mirror of https://github.com/ysoftdevs/odc-analyzer.git synced 2026-03-24 10:02:00 +01:00
Code Issues 2 Packages Projects Releases Wiki Activity

When exporting all dependencies, export filenames when no reliable identifier is available

Browse Source
This commit is contained in:
Šesták Vít
2017-02-28 16:57:06 +01:00
parent cf6e1925f7
commit 6402edeb47
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/Statistics.scala
View File

@@ -5,7 +5,7 @@ import com.google.inject.Inject
import com.google.inject.name.Named import com.google.inject.name.Named
import com.ysoft.odc.Confidence.Confidence import com.ysoft.odc.Confidence.Confidence
import com.ysoft.odc.statistics.{LibDepStatistics, TagStatistics} import com.ysoft.odc.statistics.{LibDepStatistics, TagStatistics}
import com.ysoft.odc.{ArtifactFile, ArtifactItem, Hashes} import com.ysoft.odc._
import controllers.DependencyCheckReportsParser.ResultWithSelection import controllers.DependencyCheckReportsParser.ResultWithSelection
import controllers.api.{ApiConfig, ApiController} import controllers.api.{ApiConfig, ApiController}
import models.LibraryTag import models.LibraryTag
@@ -27,7 +27,18 @@ final case class GroupedDependencyIdentifier(hashes: Hashes, identifiers: Seq[Id
object GroupedDependencyIdentifier{ object GroupedDependencyIdentifier{
def fromGroupedDependency(groupedDependency: GroupedDependency): GroupedDependencyIdentifier = GroupedDependencyIdentifier( def fromGroupedDependency(groupedDependency: GroupedDependency): GroupedDependencyIdentifier = GroupedDependencyIdentifier(
hashes = groupedDependency.hashes, hashes = groupedDependency.hashes,
identifiers = groupedDependency.identifiers.toIndexedSeq.sortBy(_.name) identifiers = {
val identifiers = groupedDependency.identifiers.toIndexedSeq.sortBy(_.name)
def fileNameIdentifiers = groupedDependency.fileNames.toIndexedSeq.sorted.map(filename => Identifier(
identifierType = "file",
name = filename,
confidence = Confidence.Highest,
url = ""
))
if(identifiers.exists(_.confidence >= Confidence.Medium)) identifiers
else fileNameIdentifiers ++ identifiers // If we don't know any reliable identifier, add filenames
}
) )
} }