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

Breaking: make copyTo return target file instead of its size.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-01-26 19:56:57 +03:00
parent 8d02467e6d
commit 4296b7f882
3 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/io/ReadWrite.kt
+2 -2
View File
@@ -99,13 +99,13 @@ public fun Reader.readText(): String {
}
/**
* Copies this reader to the given [out] writer, returning the number of bytes copied.
* Copies this reader to the given [out] writer, returning the number of characters copied.
*
* **Note** it is the caller's responsibility to close both of these resources.
*
* @param out writer to write to.
* @param bufferSize size of character buffer to use in process.
* @return number of bytes copies.
* @return number of characters copied.
*/
public fun Reader.copyTo(out: Writer, bufferSize: Int = DEFAULT_BUFFER_SIZE): Long {
var charsCopied: Long = 0
libraries/stdlib/src/kotlin/io/files/Utils.kt
+12 -11
View File
@@ -159,7 +159,7 @@ private fun File.toRelativeStringOrNull(base: File): String? {
/**
* Copies this file to the given output [target], returning the number of bytes copied.
* Copies this file to the given [target] file.
*
* If some directories on a way to the [target] are missing, then they will be created.
* If the [target] file already exists, this function will fail unless [overwrite] argument is set to `true`.
@@ -171,12 +171,12 @@ private fun File.toRelativeStringOrNull(base: File): String? {
*
* @param overwrite `true` if destination overwrite is allowed.
* @param bufferSize the buffer size to use when copying.
* @return the number of bytes copied or zero if the copied file was a directory.
* @return the [target] file.
* @throws NoSuchFileException if the source file doesn't exist.
* @throws FileAlreadyExistsException if the destination file already exists and 'rewrite' argument is set to `false`.
* @throws IOException if any errors occur while copying.
*/
public fun File.copyTo(target: File, overwrite: Boolean = false, bufferSize: Int = DEFAULT_BUFFER_SIZE): Long {
public fun File.copyTo(target: File, overwrite: Boolean = false, bufferSize: Int = DEFAULT_BUFFER_SIZE): File {
if (!this.exists()) {
throw NoSuchFileException(file = this, reason = "The source file doesn't exist")
}
@@ -194,16 +194,17 @@ public fun File.copyTo(target: File, overwrite: Boolean = false, bufferSize: Int
if (this.isDirectory) {
if (!target.mkdirs())
throw FileSystemException(file = this, other = target, reason = "Failed to create target directory")
return 0
}
} else {
target.parentFile?.mkdirs()
target.parentFile?.mkdirs()
return this.inputStream().use { input ->
target.outputStream().use { output ->
input.copyTo(output, bufferSize)
this.inputStream().use { input ->
target.outputStream().use { output ->
input.copyTo(output, bufferSize)
}
}
}
return target
}
/**
@@ -280,7 +281,7 @@ public fun File.copyRecursively(target: File,
if (src.isDirectory) {
dstFile.mkdirs()
} else {
if (src.copyTo(dstFile, overwrite) != src.length()) {
if (src.copyTo(dstFile, overwrite).length() != src.length()) {
if (onError(src, IOException("src.length() != dst.length()")) == OnErrorAction.TERMINATE)
return false
}