Fix stripPath

machadoit · machadoit · commit 65aed292d6e3 · 2015-11-10T15:30:42.000Z
diff --git a/src/main/scala/codacy/dockerApi/utils/FileHelper.scala b/src/main/scala/codacy/dockerApi/utils/FileHelper.scala
@@ -27,13 +27,8 @@ object FileHelper {
   }
 
   def stripPath(filename: String, prefix: String): String = {
-
-    val FilenameRegex = s""".*$prefix/*(.*)""".r
-
-    filename match {
-      case FilenameRegex(res) => res;
-      case _ => filename
-    }
+    filename.stripPrefix(prefix)
+      .stripPrefix("/")
   }
 
   def listAllFiles(path: String): Seq[File] = {

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,8 @@ object FileHelper {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`def stripPath(filename: String, prefix: String): String = {`
`30`		`-`
`31`		`- val FilenameRegex = s""".$prefix/(.*)""".r`
`32`		`-`
`33`		`- filename match {`
`34`		`- case FilenameRegex(res) => res;`
`35`		`- case _ => filename`
`36`		`- }`
	`30`	`+ filename.stripPrefix(prefix)`
	`31`	`+ .stripPrefix("/")`
`37`	`32`	`}`
`38`	`33`
`39`	`34`	`def listAllFiles(path: String): Seq[File] = {`