CHANGELOG.md

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

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/DownloadFileChannelRequestCallFactory.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.bot.Ktor.base
 
-import dev.inmo.micro_utils.coroutines.*
+import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
 import dev.inmo.tgbotapi.bot.Ktor.KtorCallFactory
 import dev.inmo.tgbotapi.requests.DownloadFileStream
 import dev.inmo.tgbotapi.requests.abstracts.Request
@@ -25,16 +25,13 @@ object DownloadFileChannelRequestCallFactory : KtorCallFactory {
         val fullUrl = urlsKeeper.createFileLinkUrl(it.filePath)
 
         ByteReadChannelAllocator {
-            val scope = CoroutineScope(currentCoroutineContext() + SupervisorJob())
+            val scope = CoroutineScope(coroutineContext)
             val outChannel = ByteChannel()
-            scope.launch {
+            scope.launchSafelyWithoutExceptions {
-                runCatchingSafely {
+                client.get<HttpStatement>(fullUrl).execute { httpResponse ->
-                    client.get<HttpStatement>(fullUrl).execute { httpResponse ->
+                    val channel: ByteReadChannel = httpResponse.receive()
-                        val channel: ByteReadChannel = httpResponse.receive()
+                    channel.copyAndClose(outChannel)
-                        channel.copyAndClose(outChannel)
-                    }
                 }
-                scope.cancel()
             }
             outChannel
         } as T

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.fileName
+    val filename: String = file.storageFileInfo.fileName
 ) : InputFile() {
-    override val fileId: String = file.generateCustomName()
+    override val fileId: String = file.storageFileInfo.generateCustomName()
 }
 
 @Suppress("NOTHING_TO_INLINE", "unused")

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

@@ -1,8 +1,6 @@
 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
@@ -15,7 +13,6 @@ 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
 ) {
@@ -28,35 +25,18 @@ data class StorageFileInfo(
 /**
  * Contains info about file, which potentially can be sent to telegram system.
  *
- * @param fileName Filename
+ * @param storageFileInfo Information about this file
  * @param inputSource Lambda which able to allocate [Input] for uploading/manipulating data
  *
  * @see StorageFileInfo
  * @see asStorageFile
  */
 data class StorageFile(
-    val fileName: String,
+    val storageFileInfo: StorageFileInfo,
     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")
@@ -64,7 +44,7 @@ inline fun StorageFile(
     fileName: String,
     bytes: ByteArray
 ) = StorageFile(
-    fileName
+    StorageFileInfo(fileName)
 ) {
     ByteReadPacket(bytes)
 }
@@ -74,8 +54,8 @@ suspend inline fun StorageFile(
     fileName: String,
     byteReadChannel: ByteReadChannel
 ) = StorageFile(
-    fileName,
+    StorageFileInfo(fileName),
-    inputSource = byteReadChannel.asInput().let { { it } }
+    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(
-    file.name
+    StorageFileInfo(file.name)
 ) {
     file.inputStream().asInput()
 }