From 19dc3d869e39c688ecc516d05c8a7c84b977a3a5 Mon Sep 17 00:00:00 2001 From: lecaros Date: Thu, 15 Apr 2021 10:17:48 -0500 Subject: [PATCH] refactor exportFileAs --- .../googleapiwrapper/drive/AbstractDriveServiceWrapper.kt | 6 +++--- .../googleapiwrapper/drive/IDriveServiceWrapper.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/merkenlabs/googleapiwrapper/drive/AbstractDriveServiceWrapper.kt b/src/main/kotlin/com/merkenlabs/googleapiwrapper/drive/AbstractDriveServiceWrapper.kt index d200f90..175ab13 100644 --- a/src/main/kotlin/com/merkenlabs/googleapiwrapper/drive/AbstractDriveServiceWrapper.kt +++ b/src/main/kotlin/com/merkenlabs/googleapiwrapper/drive/AbstractDriveServiceWrapper.kt @@ -34,12 +34,12 @@ abstract class AbstractDriveServiceWrapper : IDriveServiceWrapper { return copyFileToFile(originFile, newFile) } - override fun exportFileAs(fileId: String, fileMimeType: String): java.io.File { + override fun exportFileAs(fileId: String, fileMimeType: String, fileName: String?): java.io.File { val outputStream = ByteArrayOutputStream() getDriveService().files().export(fileId, fileMimeType) .executeMediaAndDownloadTo(outputStream) - writeToFileSystem(fileId, outputStream) - return java.io.File(fileId) + writeToFileSystem(fileName?:fileId, outputStream) + return java.io.File(fileName?:fileId) } private fun writeToFileSystem(fileId: String, outputStream: ByteArrayOutputStream) { diff --git a/src/main/kotlin/com/merkenlabs/googleapiwrapper/drive/IDriveServiceWrapper.kt b/src/main/kotlin/com/merkenlabs/googleapiwrapper/drive/IDriveServiceWrapper.kt index 4a48647..759e1de 100644 --- a/src/main/kotlin/com/merkenlabs/googleapiwrapper/drive/IDriveServiceWrapper.kt +++ b/src/main/kotlin/com/merkenlabs/googleapiwrapper/drive/IDriveServiceWrapper.kt @@ -20,6 +20,6 @@ interface IDriveServiceWrapper { * Returns the new File. **/ fun copyFile(originFile: File, destinationFolderId: String): File? - fun exportFileAs(fileId: String, fileMimeType: String): FSFile + fun exportFileAs(fileId: String, fileMimeType: String, fileName: String?): FSFile fun getFileFromUrl(url: String): File? }