From 0d1f594028d1cdb376234d5726e73cacbb403ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0est=C3=A1k=20V=C3=ADt?= Date: Thu, 21 Jan 2016 12:07:16 +0100 Subject: [PATCH] Fine-tuned subproject names --- app/controllers/ProjectsWithReports.scala | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/ProjectsWithReports.scala b/app/controllers/ProjectsWithReports.scala index caf553c..a81b3f2 100644 --- a/app/controllers/ProjectsWithReports.scala +++ b/app/controllers/ProjectsWithReports.scala @@ -26,9 +26,9 @@ final case class ReportInfo( 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 removeMess = removeLeadingMess andThen removeTrailingMess val subProjectOption = Some(removeMess(theRest)).filter(_ != "") - subProjectOption.fold(baseName)(baseName+"/"+_) unfriendlyName -> ReportInfo( projectId = baseName, fullId = unfriendlyName, projectName = projects.projectMap(baseName), - subprojectNameOption = subProjectOption + subprojectNameOption = subProjectOption.orElse(Some("root project")) ) }.toMap reportsMap ++ reportsMap.values.map(r => r.projectId -> ReportInfo(projectId = r.projectId, fullId = r.projectId, subprojectNameOption = None, projectName = r.projectName))