Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions os/src/Path.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,18 @@ object PathChunk extends PathChunkMacros {
}
}.reverse
private[os] def segmentsFromStringLiteralValidation(literal: String): Array[String] = {
val stringSegments = segmentsFromString(literal)
val validSegmnts = reduceUps(validLiteralSegments(stringSegments))
val sanitizedLiteral = validSegmnts.mkString("/")
if (validSegmnts.isEmpty) throw InvalidSegment(
literal,
s"Literal path sequence [$literal] doesn't affect path being formed, please remove it"
)
if (literal != sanitizedLiteral) throw NonCanonicalLiteral(literal, sanitizedLiteral)
stringSegments
if (literal == ".") Array.empty
else {
val stringSegments = segmentsFromString(literal)
val validSegments = reduceUps(validLiteralSegments(stringSegments))
val sanitizedLiteral = validSegments.mkString("/")
if (validSegments.isEmpty) throw InvalidSegment(
literal,
s"Literal path sequence [$literal] doesn't affect path being formed, please remove it"
)
if (literal != sanitizedLiteral) throw NonCanonicalLiteral(literal, sanitizedLiteral)
stringSegments
}
}
private def validLiteralSegments(segments: Array[String]): Array[String] = {
val AllowedLiteralSegment = ".."
Expand Down
5 changes: 3 additions & 2 deletions os/test/src/PathTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ object PathTests extends TestSuite {
assert(root / "hello" / ".." / "world" == root / "hello" / os.up / "world")
assert(root / "hello" / "../world" == root / "hello" / os.up / "world")
}
test("literal [.]") {
assert(root / "." == root)
}

test("Compile errors") {

Expand Down Expand Up @@ -122,13 +125,11 @@ object PathTests extends TestSuite {
compileError("""root / "//foo/" """).check("", nonCanonicalLiteral("//foo/", "foo"))

compileError(""" rel / "src" / "" """).check("", removeLiteralErr(""))
compileError(""" rel / "src" / "." """).check("", removeLiteralErr("."))

compileError(""" root / "src/" """).check("", nonCanonicalLiteral("src/", "src"))
compileError(""" root / "src/." """).check("", nonCanonicalLiteral("src/.", "src"))

compileError(""" root / "" """).check("", removeLiteralErr(""))
compileError(""" root / "." """).check("", removeLiteralErr("."))

}
}
Expand Down
Loading