Merge pull request square#863 from square/jwilson.1230.one_platform_file

Combine Platform.kt and -Platform.kt
sneha1702 · Dec 31, 2020 · 7027351 · 7027351
2 parents d9d97ad + c8e75f5
commit 7027351
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 118 deletions.
diff --git a/okio/src/commonMain/kotlin/okio/-Platform.kt b/okio/src/commonMain/kotlin/okio/-Platform.kt
@@ -16,6 +16,14 @@
 
 package okio
 
+@ExperimentalFilesystem
+internal expect val PLATFORM_FILESYSTEM: Filesystem
+
+@ExperimentalFilesystem
+internal expect val PLATFORM_TEMPORARY_DIRECTORY: Path
+
+internal expect val DIRECTORY_SEPARATOR: String
+
 internal expect fun ByteArray.toUtf8String(): String
 
 internal expect fun String.asUtf8ToByteArray(): ByteArray

diff --git a/okio/src/commonMain/kotlin/okio/-Util.kt b/okio/src/commonMain/kotlin/okio/-Util.kt
@@ -161,3 +161,45 @@ internal fun Long.toHexString(): String {
 
   return String(result, i, result.size - i)
 }
+
+internal inline fun <S : Source, T> S.use(block: (S) -> T): T {
+  var result: T? = null
+  var thrown: Throwable? = null
+
+  try {
+    result = block(this)
+  } catch (t: Throwable) {
+    thrown = t
+  }
+
+  try {
+    close()
+  } catch (t: Throwable) {
+    if (thrown == null) thrown = t
+    else thrown.addSuppressed(t)
+  }
+
+  if (thrown != null) throw thrown
+  return result!!
+}
+
+internal inline fun <S : Sink, T> S.use(block: (S) -> T): T {
+  var result: T? = null
+  var thrown: Throwable? = null
+
+  try {
+    result = block(this)
+  } catch (t: Throwable) {
+    thrown = t
+  }
+
+  try {
+    close()
+  } catch (t: Throwable) {
+    if (thrown == null) thrown = t
+    else thrown.addSuppressed(t)
+  }
+
+  if (thrown != null) throw thrown
+  return result!!
+}
diff --git a/okio/src/commonMain/kotlin/okio/Platform.kt b/okio/src/commonMain/kotlin/okio/Platform.kt
diff --git a/okio/src/commonMain/kotlin/okio/common.kt b/okio/src/commonMain/kotlin/okio/common.kt
diff --git a/okio/src/jsMain/kotlin/okio/Platform.kt → okio/src/jsMain/kotlin/okio/-Platform.kt b/okio/src/jsMain/kotlin/okio/Platform.kt → okio/src/jsMain/kotlin/okio/-Platform.kt
diff --git a/okio/src/jvmMain/kotlin/okio/-Platform.kt b/okio/src/jvmMain/kotlin/okio/-Platform.kt
@@ -17,6 +17,26 @@
 @file:JvmName("-Platform")
 package okio
 
+import okio.Path.Companion.toPath
+import java.io.File
+
+@ExperimentalFilesystem
+internal actual val PLATFORM_FILESYSTEM: Filesystem
+  get() {
+    try {
+      Class.forName("java.nio.file.Files")
+      return NioSystemFilesystem()
+    } catch (e: ClassNotFoundException) {
+      return JvmSystemFilesystem()
+    }
+  }
+
+@ExperimentalFilesystem
+internal actual val PLATFORM_TEMPORARY_DIRECTORY: Path
+  get() = System.getProperty("java.io.tmpdir").toPath()
+
+internal actual val DIRECTORY_SEPARATOR = File.separator
+
 internal actual fun ByteArray.toUtf8String(): String = String(this, Charsets.UTF_8)
 
 internal actual fun String.asUtf8ToByteArray(): ByteArray = toByteArray(Charsets.UTF_8)

diff --git a/okio/src/jvmMain/kotlin/okio/Platform.kt b/okio/src/jvmMain/kotlin/okio/Platform.kt
diff --git a/.../src/mingwX64Main/kotlin/okio/Platform.kt → ...src/mingwX64Main/kotlin/okio/-Platform.kt b/.../src/mingwX64Main/kotlin/okio/Platform.kt → ...src/mingwX64Main/kotlin/okio/-Platform.kt
diff --git a/okio/src/nativeMain/kotlin/okio/Platform.kt → okio/src/nativeMain/kotlin/okio/-Platform.kt b/okio/src/nativeMain/kotlin/okio/Platform.kt → okio/src/nativeMain/kotlin/okio/-Platform.kt
diff --git a/okio/src/unixMain/kotlin/okio/Platform.kt → okio/src/unixMain/kotlin/okio/-Platform.kt b/okio/src/unixMain/kotlin/okio/Platform.kt → okio/src/unixMain/kotlin/okio/-Platform.kt