dorkbox/Utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed FileChannel usage

Browse Source
This commit is contained in:
Robinson 2022-03-07 22:19:14 +01:00
parent 8cc7b2070c
commit 6e5313aa24
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
1 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/dorkbox/util/FileUtil.kt
View File

@ -30,7 +30,6 @@ import java.io.InputStream
import java.io.PrintWriter
import java.io.RandomAccessFile
import java.io.Reader
import java.nio.channels.FileChannel
import java.nio.charset.StandardCharsets
import java.nio.file.DirectoryIteratorException
import java.nio.file.FileVisitResult
@ -637,26 +636,13 @@ object FileUtil {
if (DEBUG) {
System.err.println("Copying file: '$`in`' --> '$out'")
}
var sourceChannel: FileChannel? = null
var destinationChannel: FileChannel? = null
try {
sourceChannel = FileInputStream(normalizedIn).channel
destinationChannel = FileOutputStream(normalizedout).channel
if (sourceChannel.size() == 0L) {
System.err.println("Source size is ZERO: $normalizedIn")
FileInputStream(normalizedIn).bufferedReader().use { reader ->
FileOutputStream(normalizedout, false).bufferedWriter().use { writer ->
reader.transferTo(writer)
}
}
sourceChannel.transferTo(0, sourceChannel.size(), destinationChannel)
} finally {
try {
sourceChannel?.close()
} catch (ignored: Exception) {
}
try {
destinationChannel?.close()
} catch (ignored: Exception) {
}
}
out.setLastModified(`in`.lastModified())
return out
}
@ -665,33 +651,16 @@ object FileUtil {
* Copies the contents of file two onto the END of file one.
*/
fun concatFiles(one: File, two: File): File {
val normalizedOne = normalize(one)!!.absolutePath
val normalizedTwo = normalize(two)!!.absolutePath
if (DEBUG) {
System.err.println("Concat'ing file: '$one' --> '$two'")
}
var channelOne: FileChannel? = null
var channelTwo: FileChannel? = null
try {
// open it in append mode
channelOne = FileOutputStream(normalizedOne, true).channel
channelTwo = FileInputStream(normalizedTwo).channel
var size = two.length()
while (size > 0) {
size -= channelOne.transferFrom(channelTwo, 0, size)
}
} catch (ignored: Exception) {
ignored.printStackTrace()
} finally {
try {
channelOne?.close()
} catch (ignored: Exception) {
}
try {
channelTwo?.close()
} catch (ignored: Exception) {
FileOutputStream(one, true).bufferedWriter().use { writer ->
FileInputStream(two).bufferedReader().use { reader ->
reader.transferTo(writer)
}
}
one.setLastModified(System.currentTimeMillis())
return one
}