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

Fine-tuned subproject names

Browse Source
This commit is contained in:
Šesták Vít
2016-01-21 12:07:16 +01:00
parent c63f0ab7ec
commit 0d1f594028
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/ProjectsWithReports.scala
View File

@@ -26,9 +26,9 @@ final case class ReportInfo(
object ProjectsWithReports{ object ProjectsWithReports{
private val RestMessBeginRegexp = """^/Report results-XML/""".r private val RestMessBeginRegexp = """^/Report results-XML(/|$)""".r
private val RestMessEndRegexp = """/(target/)?dependency-check-report\.xml$""".r private val RestMessEndRegexp = """(/|^)(target/)?dependency-check-report\.xml$""".r
} }
@@ -43,12 +43,11 @@ class ProjectsWithReports (val projects: Projects, val reports: Set[String]) {
val removeTrailingMess = RestMessEndRegexp.replaceAllIn(_: String, "") val removeTrailingMess = RestMessEndRegexp.replaceAllIn(_: String, "")
val removeMess = removeLeadingMess andThen removeTrailingMess val removeMess = removeLeadingMess andThen removeTrailingMess
val subProjectOption = Some(removeMess(theRest)).filter(_ != "") val subProjectOption = Some(removeMess(theRest)).filter(_ != "")
subProjectOption.fold(baseName)(baseName+"/"+_)
unfriendlyName -> ReportInfo( unfriendlyName -> ReportInfo(
projectId = baseName, projectId = baseName,
fullId = unfriendlyName, fullId = unfriendlyName,
projectName = projects.projectMap(baseName), projectName = projects.projectMap(baseName),
subprojectNameOption = subProjectOption subprojectNameOption = subProjectOption.orElse(Some("root project"))
) )
}.toMap }.toMap
reportsMap ++ reportsMap.values.map(r => r.projectId -> ReportInfo(projectId = r.projectId, fullId = r.projectId, subprojectNameOption = None, projectName = r.projectName)) reportsMap ++ reportsMap.values.map(r => r.projectId -> ReportInfo(projectId = r.projectId, fullId = r.projectId, subprojectNameOption = None, projectName = r.projectName))