deprecate StorageFileInfo

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * `Core`:
     * Fixes in `mention` creation
+    * Deprecate `StorageFileInfo`
 
 ## 0.38.12
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFile.kt

@@ -61,9 +61,9 @@ object InputFileSerializer : KSerializer<InputFile> {
 @Serializable(InputFileSerializer::class)
 data class MultipartFile (
     val file: StorageFile,
-    val filename: String = file.storageFileInfo.fileName
+    val filename: String = file.fileName
 ) : InputFile() {
-    override val fileId: String = file.storageFileInfo.generateCustomName()
+    override val fileId: String = file.generateCustomName()
 }
 
 @Suppress("NOTHING_TO_INLINE", "unused")

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt

@@ -1,6 +1,8 @@
 package dev.inmo.tgbotapi.utils
 
 import com.benasher44.uuid.uuid4
+import dev.inmo.micro_utils.common.MPPFile
+import dev.inmo.micro_utils.common.filename
 import io.ktor.utils.io.*
 import io.ktor.utils.io.core.ByteReadPacket
 import io.ktor.utils.io.core.Input
@@ -13,6 +15,7 @@ import kotlinx.serialization.Serializable
  * @param fileName This filename will be used in telegram system as name of file
  */
 @Serializable
+@Deprecated("Will be removed soon")
 data class StorageFileInfo(
     val fileName: String
 ) {
@@ -25,18 +28,35 @@ data class StorageFileInfo(
 /**
  * Contains info about file, which potentially can be sent to telegram system.
  *
- * @param storageFileInfo Information about this file
+ * @param fileName Filename
  * @param inputSource Lambda which able to allocate [Input] for uploading/manipulating data
  *
  * @see StorageFileInfo
  * @see asStorageFile
  */
 data class StorageFile(
-    val storageFileInfo: StorageFileInfo,
+    val fileName: String,
     private val inputSource: () -> Input
 ) {
     val input: Input
         get() = inputSource()
+    @Deprecated("This field will be removed soon. Use fileName instead of StorageFileInfo")
+    val storageFileInfo: StorageFileInfo
+        get() = StorageFileInfo(fileName)
+
+    /**
+     * This methods is required for random generation of name for keeping warranties about unique file name
+     */
+    fun generateCustomName() = "${uuid4()}.${fileName.fileExtension}"
+
+    @Deprecated("This constructor will be removed soon. Use constructor with fileName instead of StorageFileInfo")
+    constructor(
+        storageFileInfo: StorageFileInfo,
+        inputSource: () -> Input
+    ) : this(
+        storageFileInfo.fileName,
+        inputSource
+    )
 }
 
 @Suppress("NOTHING_TO_INLINE")
@@ -44,7 +64,7 @@ inline fun StorageFile(
     fileName: String,
     bytes: ByteArray
 ) = StorageFile(
-    StorageFileInfo(fileName)
+    fileName
 ) {
     ByteReadPacket(bytes)
 }
@@ -54,8 +74,8 @@ suspend inline fun StorageFile(
     fileName: String,
     byteReadChannel: ByteReadChannel
 ) = StorageFile(
-    StorageFileInfo(fileName),
+    fileName,
-    byteReadChannel.asInput().let { { it } }
+    inputSource = byteReadChannel.asInput().let { { it } }
 )
 
 @Suppress("NOTHING_TO_INLINE", "unused")

tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/StorageFileFactory.kt

@@ -7,7 +7,7 @@ import java.nio.file.Files
 fun StorageFile(
     file: File
 ) = StorageFile(
-    StorageFileInfo(file.name)
+    file.name
 ) {
     file.inputStream().asInput()
 }