refactor exportFileAs

lecaros · Apr 15, 2021 · 19dc3d8 · 19dc3d8
1 parent d72696e
commit 19dc3d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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?
 }