Merge pull request #4 from Archinamon/feature/add_unsafe_ops

Archinamon · web-flow · commit de8fcea4f2c1 · 2021-10-03T20:40:10.000+03:00
added unsafe getParent option; move separator value to common
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "me.archinamon"
-version = "1.3.1"
+version = "1.3.2"
 
 val isRunningInIde: Boolean = System.getProperty("idea.active")
     ?.toBoolean() == true
diff --git a/src/commonMain/kotlin/File.common.kt b/src/commonMain/kotlin/File.common.kt
@@ -25,6 +25,8 @@ expect class File(pathname: String) {
     fun delete(): Boolean
 }
 
+expect val filePathSeparator: Char
+
 val File.nameWithoutExtension: String
     get() = getName().substringBeforeLast(".")
 
@@ -43,6 +45,13 @@ fun File.deleteRecursively(): Boolean = walkBottomUp()
         (it.delete() || !it.exists()) && res
     }
 
+fun File.getParentFileUnsafe(): File {
+    return getParentFile()
+        ?: getAbsolutePath()
+            .substringBeforeLast(filePathSeparator)
+            .run(::File)
+}
+
 fun File.validate() = run {
     print("Validating $nameWithoutExtension file...")
 
diff --git a/src/commonTest/kotlin/FileTests.kt b/src/commonTest/kotlin/FileTests.kt
@@ -4,6 +4,8 @@ import kotlin.test.*
 
 class FileTests {
 
+    private val localSeparator = '/'
+
     @Test
     fun testNonexistentRootFile() {
         val testFile = File("testNonexistentRootFile.txt")
@@ -17,6 +19,18 @@ class FileTests {
         assertEquals("testNonexistentRootFile", testFile.nameWithoutExtension)
     }
 
+    @Test
+    fun testExistentRootFile() {
+        val testFile = File("testFileRoot/testExistentRootFile.txt")
+        println(testFile.getAbsolutePath())
+
+        assertFalse(testFile.exists(), "file should not exist")
+        assertFalse(testFile.getParentFile()?.exists() == true, "file should not have parent file")
+        assertNotNull(testFile.getParentFileUnsafe(), "file should not have parent file")
+
+        assertEquals("testFileRoot", testFile.getParentFileUnsafe().getName(), "couldn't get parent file name")
+    }
+
     @Test
     fun testFileCreateAndDelete() {
         val testFolder = File("build/testNewDirectoryCreation")
@@ -70,4 +84,51 @@ class FileTests {
         assertEquals("gradle-wrapper.properties", listedFileNames[1])
         assertEquals("gradle-wrapper.properties", listedFiles[1].getName())
     }
+
+    @Test
+    fun testFileCopyMethod() {
+        val testFile = File("gradle/wrapper/gradle-wrapper.properties")
+        val testDestFolder = File("build/testCopyFolder")
+        val testDestFile = File("build/testCopyFolder/gradle-wrapper.properties")
+
+        assertTrue(testFile.exists(), "file have to exist")
+        assertFalse(testDestFolder.exists(), "folder shouldn't be created yet")
+
+        testDestFolder.mkdirs()
+        assertTrue(testDestFolder.exists(), "now folder have to exists")
+
+        assertFalse(testDestFile.exists(), "file should not exists yet")
+        testFile.copyTo(testDestFile, overwrite = false)
+        assertTrue(testDestFile.exists(), "file have to exist after coping")
+
+        assertTrue(testDestFile.delete(), "failed to cleanup test file")
+        assertTrue(testDestFolder.delete(), "failed to cleanup directory")
+    }
+
+    @Test
+    fun testFileMoveMethod() {
+        val testFolder = File("build/testMoveFolder")
+        val testDestFolder = File("build/testMoveFolder2")
+        val testFile = File("build/testMoveFolder/test_move_file.properties")
+        val testDestFile = File("build/testMoveFolder2/test_move_file.properties")
+
+        assertFalse(testFile.exists(), "file have not to exist")
+        assertFalse(testFolder.exists(), "folder shouldn't be created yet")
+        assertFalse(testDestFolder.exists(), "folder shouldn't be created yet")
+
+        assertTrue(testFolder.mkdirs() && testFolder.exists(), "now folder1 have to exists")
+        assertTrue(testDestFolder.mkdirs() && testDestFolder.exists(), "now folder2 have to exists")
+
+        assertTrue(testFile.createNewFile(), "file should be created")
+        testFile.writeText("moving=true")
+
+        testFile.moveTo(testDestFile, overwrite = false)
+        assertTrue(testDestFile.exists(), "file have to exist after coping")
+        assertEquals("moving=true", testDestFile.readText(), "moved file should have the same content")
+        assertFalse(testFile.exists(), "file should not exists on previous place after moving")
+
+        assertTrue(testFolder.delete(), "failed to cleanup test file")
+        assertTrue(testDestFile.delete(), "failed to cleanup test file")
+        assertTrue(testDestFolder.delete(), "failed to cleanup directory")
+    }
 }
diff --git a/src/jsMain/kotlin/File.kt b/src/jsMain/kotlin/File.kt
@@ -15,8 +15,8 @@ actual class File constructor(jsfile: JsFile) {
     actual fun getParent(): String? {
         return when {
             !exists() -> null
-            "/" in innerFile.name -> innerFile.name
-                .split("/")
+            filePathSeparator in innerFile.name -> innerFile.name
+                .split(filePathSeparator)
                 .let { if (it.size > 1) it[it.lastIndex - 1] else it.last() }
             else -> innerFile.name
         }
@@ -79,6 +79,8 @@ actual class File constructor(jsfile: JsFile) {
     }
 }
 
+actual val filePathSeparator by lazy { '/' }
+
 actual val File.mimeType: String
     get() = innerFile.type
 
diff --git a/src/jvmMain/kotlin/File.kt b/src/jvmMain/kotlin/File.kt
@@ -8,6 +8,8 @@ import kotlin.io.writeBytes as kWriteBytes
 
 actual typealias File = java.io.File
 
+actual val filePathSeparator by lazy { File.separatorChar }
+
 actual val File.mimeType: String
     get() = URLConnection.guessContentTypeFromName(name)
 
diff --git a/src/mingwX64Main/kotlin/File.kt b/src/mingwX64Main/kotlin/File.kt
@@ -7,23 +7,21 @@ import platform.windows.*
 private const val EPOCH_DIFF = 11644473600000
 
 
-actual class File actual constructor(
-    private val pathname: String
-) {
-    private val fileSeparator
-        get() = if (Platform.osFamily == OsFamily.WINDOWS) "\\" else "/"
+actual class File actual constructor(pathname: String) {
+
+    private val pathname: String = pathname.replace('/', filePathSeparator)
 
     actual fun getParent(): String? {
-        return if (exists()) getAbsolutePath().substringBeforeLast(fileSeparator) else null
+        return if (exists()) getAbsolutePath().substringBeforeLast(filePathSeparator) else null
     }
 
     actual fun getParentFile(): File? {
         return getParent()?.run(::File)
     }
 
     actual fun getName(): String {
-        return if (fileSeparator in pathname) {
-            pathname.split(fileSeparator).last(String::isNotBlank)
+        return if (filePathSeparator in pathname) {
+            pathname.split(filePathSeparator).last(String::isNotBlank)
         } else {
             pathname
         }
@@ -104,7 +102,7 @@ actual class File actual constructor(
     }
 
     actual fun getAbsolutePath(): String {
-        return if (pathname.startsWith(fileSeparator) || pathname.getOrNull(1) == ':') {
+        return if (pathname.startsWith(filePathSeparator) || pathname.getOrNull(1) == ':') {
             pathname
         } else {
             memScoped {
@@ -119,7 +117,7 @@ actual class File actual constructor(
                     retryBuf.toKString()
                 } else {
                     buf.toKString()
-                } + fileSeparator + pathname
+                } + filePathSeparator + pathname
             }
         }
     }
@@ -169,10 +167,10 @@ actual class File actual constructor(
         if (isFile()) return emptyArray()
 
         val findData = alloc<WIN32_FIND_DATAA>()
-        val searchPath = if (pathname.endsWith(fileSeparator)) {
+        val searchPath = if (pathname.endsWith(filePathSeparator)) {
             pathname
         } else {
-            "$pathname${fileSeparator}"
+            "$pathname${filePathSeparator}"
         } + "*"
         val find = FindFirstFileA(searchPath, findData.ptr)
         if (find == INVALID_HANDLE_VALUE) {
@@ -197,8 +195,8 @@ actual class File actual constructor(
     actual fun listFiles(): Array<File> {
         if (isFile()) return emptyArray()
         val thisPath = getAbsolutePath().let { path ->
-            if (!path.endsWith(fileSeparator)) {
-                path + fileSeparator
+            if (!path.endsWith(filePathSeparator)) {
+                path + filePathSeparator
             } else path
         }
         return list()
@@ -268,6 +266,8 @@ actual class File actual constructor(
     }
 }
 
+actual val filePathSeparator by lazy { if (Platform.osFamily == OsFamily.WINDOWS) '\\' else '/' }
+
 actual val File.mimeType: String
     get() = ""
 
diff --git a/src/posixMain/kotlin/File.kt b/src/posixMain/kotlin/File.kt
@@ -45,34 +45,31 @@ actual class File actual constructor(
     private val pathname: String
 ) {
 
-    private val fileSeparator
-        get() = if (Platform.osFamily == OsFamily.WINDOWS) "\\" else "/"
-
     internal val modeRead = "r"
     private val modeAppend = "a"
     private val modeRewrite = "w"
 
     actual fun getParent(): String? {
-        return if (exists()) getAbsolutePath().substringBeforeLast(fileSeparator) else  null
+        return if (exists()) getAbsolutePath().substringBeforeLast(filePathSeparator) else null
     }
 
     actual fun getParentFile(): File? {
         return getParent()?.run(::File)
     }
 
     actual fun getName(): String {
-        return if (fileSeparator in pathname) {
-            pathname.split(fileSeparator).last(String::isNotBlank)
+        return if (filePathSeparator in pathname) {
+            pathname.split(filePathSeparator).last(String::isNotBlank)
         } else {
             pathname
         }
     }
 
     actual fun getAbsolutePath(): String {
-        return if (!pathname.startsWith(fileSeparator)) {
+        return if (!pathname.startsWith(filePathSeparator)) {
             memScoped {
                 getcwd(allocArray(FILENAME_MAX), FILENAME_MAX.convert())
-                    ?.toKString() + fileSeparator + pathname
+                    ?.toKString() + filePathSeparator + pathname
             }
         } else pathname
     }
@@ -156,8 +153,8 @@ actual class File actual constructor(
 
     actual fun listFiles(): Array<File> {
         val thisPath = getAbsolutePath().let { path ->
-            if (!path.endsWith(fileSeparator)) {
-                path + fileSeparator
+            if (!path.endsWith(filePathSeparator)) {
+                path + filePathSeparator
             } else path
         }
         return list()
@@ -227,6 +224,8 @@ internal expect fun readdir(dir: CPointer<out CPointed>): CPointer<dirent>?
 
 internal expect fun closedir(dir: CPointer<out CPointed>): Int
 
+actual val filePathSeparator by lazy { if (Platform.osFamily == OsFamily.WINDOWS) '\\' else '/' }
+
 //todo determine mimeType on file extension; see jdk mappings
 actual val File.mimeType: String
     get() = ""

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`group = "me.archinamon"`
`9`		`-version = "1.3.1"`
	`9`	`+version = "1.3.2"`
`10`	`10`
`11`	`11`	`val isRunningInIde: Boolean = System.getProperty("idea.active")`
`12`	`12`	`?.toBoolean() == true`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ actual class File constructor(jsfile: JsFile) {`
`15`	`15`	`actual fun getParent(): String? {`
`16`	`16`	`return when {`
`17`	`17`	`!exists() -> null`
`18`		`- "/" in innerFile.name -> innerFile.name`
`19`		`- .split("/")`
	`18`	`+ filePathSeparator in innerFile.name -> innerFile.name`
	`19`	`+ .split(filePathSeparator)`
`20`	`20`	`.let { if (it.size > 1) it[it.lastIndex - 1] else it.last() }`
`21`	`21`	`else -> innerFile.name`
`22`	`22`	`}`
`@@ -79,6 +79,8 @@ actual class File constructor(jsfile: JsFile) {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
	`82`	`+actual val filePathSeparator by lazy { '/' }`
	`83`	`+`
`82`	`84`	`actual val File.mimeType: String`
`83`	`85`	`get() = innerFile.type`
`84`	`86`