Use project import to open older projects

Steve Salas · Steve Salas · commit e79907602be2 · 2018-10-17T19:32:49.000-04:00
diff --git a/codepulse/src/main/scala/com/secdec/codepulse/data/model/ProjectData.scala b/codepulse/src/main/scala/com/secdec/codepulse/data/model/ProjectData.scala
@@ -37,7 +37,7 @@ trait ProjectDataProvider {
 object ProjectDataProvider {
 	lazy val DefaultStorageDir = {
 		val basePath = com.secdec.codepulse.paths.appData
-		val dir = new java.io.File(basePath, "projects")
+		val dir = new java.io.File(basePath, "project-data")
 		dir.mkdirs
 		dir
 	}
diff --git a/codepulse/src/main/scala/com/secdec/codepulse/dependencycheck/DependencyCheckReporter.scala b/codepulse/src/main/scala/com/secdec/codepulse/dependencycheck/DependencyCheckReporter.scala
@@ -43,7 +43,7 @@ object DependencyCheckReporter {
 		val treeNodeData = project.treeNodeData
 		import treeNodeData.ExtendedTreeNodeData
 
-		val reportFolder = paths.appData / "dependency-check" / "projects" / project.id.num.toString
+		val reportFolder = paths.appData / "owasp-dependency-check" / "projects" / project.id.num.toString
 		val xmlReportFile = reportFolder / "dependency-check-report.xml"
 		val htmlReportFile = reportFolder / "dependency-check-report.html"
 		if (!xmlReportFile.exists || !htmlReportFile.exists) ???
diff --git a/codepulse/src/main/scala/com/secdec/codepulse/dependencycheck/Settings.scala b/codepulse/src/main/scala/com/secdec/codepulse/dependencycheck/Settings.scala
@@ -78,7 +78,7 @@ case class ScanSettings(
 )
 
 object ScanSettings {
-	def apply(app: File, appName: String, identifier: String, reportFormat: ReportFormat = ReportFormat.All): ScanSettings = ScanSettings(app, appName, paths.appData / "dependency-check" / "projects" / identifier, reportFormat)
+	def apply(app: File, appName: String, identifier: String, reportFormat: ReportFormat = ReportFormat.All): ScanSettings = ScanSettings(app, appName, paths.appData / "owasp-dependency-check" / "projects" / identifier, reportFormat)
 	def createFromProject(identifier: String, app: File): ScanSettings = {
 		val project = projectDataProvider getProject ProjectId(identifier.toInt)
 		val name = project.metadata.name

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ trait ProjectDataProvider {`
`37`	`37`	`object ProjectDataProvider {`
`38`	`38`	`lazy val DefaultStorageDir = {`
`39`	`39`	`val basePath = com.secdec.codepulse.paths.appData`
`40`		`- val dir = new java.io.File(basePath, "projects")`
	`40`	`+ val dir = new java.io.File(basePath, "project-data")`
`41`	`41`	`dir.mkdirs`
`42`	`42`	`dir`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ case class ScanSettings(`
`78`	`78`	`)`
`79`	`79`
`80`	`80`	`object ScanSettings {`
`81`		`- def apply(app: File, appName: String, identifier: String, reportFormat: ReportFormat = ReportFormat.All): ScanSettings = ScanSettings(app, appName, paths.appData / "dependency-check" / "projects" / identifier, reportFormat)`
	`81`	`+ def apply(app: File, appName: String, identifier: String, reportFormat: ReportFormat = ReportFormat.All): ScanSettings = ScanSettings(app, appName, paths.appData / "owasp-dependency-check" / "projects" / identifier, reportFormat)`
`82`	`82`	`def createFromProject(identifier: String, app: File): ScanSettings = {`
`83`	`83`	`val project = projectDataProvider getProject ProjectId(identifier.toInt)`
`84`	`84`	`val name = project.metadata.name`