azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare root of FilePathComponents according to case-sensitivity rules of current file system.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-12-04 16:31:31 +03:00
parent 4f2887df64
commit 061803d7b1
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt
+5
View File
@@ -91,6 +91,11 @@ public data class FilePathComponents(public val rootName: String, public val fil
*/
public fun size(): Int = fileList.size
/**
* [File] representing root of the path (for example, `/` or `C:` or empty for relative paths).
*/
public val root: File = File(rootName)
/**
* Returns a sub-path of the path, starting with the directory at the specified [beginIndex] and up
* to the specified [endIndex].
libraries/stdlib/src/kotlin/io/files/Utils.kt
+4 -5
View File
@@ -131,7 +131,7 @@ private fun File.relativeToOrNull(base: File): String? {
// Check roots
val thisComponents = this.filePathComponents().normalize()
val baseComponents = base.filePathComponents().normalize()
if (thisComponents.rootName != baseComponents.rootName) {
if (thisComponents.root != baseComponents.root) {
return null
}
@@ -333,7 +333,7 @@ public fun File.listFiles(filter: (file: File) -> Boolean): Array<File>? = listF
public fun File.startsWith(other: File): Boolean {
val components = filePathComponents()
val otherComponents = other.filePathComponents()
if (components.rootName != otherComponents.rootName && otherComponents.rootName != "")
if (components.root != otherComponents.root && otherComponents.rootName != "")
return false
return if (components.size() < otherComponents.size()) false
else components.fileList.subList(0, otherComponents.size()).equals(otherComponents.fileList)
@@ -360,7 +360,7 @@ public fun File.startsWith(other: String): Boolean = startsWith(File(other))
public fun File.endsWith(other: File): Boolean {
val components = filePathComponents()
val otherComponents = other.filePathComponents()
if (components.rootName != otherComponents.rootName && otherComponents.rootName != "")
if (components.root != otherComponents.root && otherComponents.rootName != "")
return false
val shift = components.size() - otherComponents.size()
return if (shift < 0) false
@@ -436,8 +436,7 @@ public fun File.resolve(relative: String): File = resolve(File(relative))
public fun File.resolveSibling(relative: File): File {
val components = filePathComponents()
val parentSubPath = if (components.size() == 0) File("..") else components.subPath(0, components.size() - 1)
val rootName = components.rootName
return File(rootName).resolve(parentSubPath).resolve(relative)
return components.root.resolve(parentSubPath).resolve(relative)
}
/**