Optimize

LittleMengBot · Apr 8, 2023 · d094fca · d094fca
1 parent f484fef
commit d094fca
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 27 deletions.
diff --git a/src/main/kotlin/command/download/GifDownload.kt b/src/main/kotlin/command/download/GifDownload.kt
@@ -10,7 +10,6 @@ import com.github.kotlintelegrambot.entities.Update
 import com.github.kotlintelegrambot.entities.files.Animation
 import com.github.kotlintelegrambot.entities.files.Document
 import dsl.edit
-import dsl.execListener
 import dsl.replyToText
 import file.FileUtils
 import mu.KotlinLogging
@@ -99,29 +98,51 @@ fun getAnimationCommand(bot: Bot, update: Update) {
 
 fun toGif(tempByteArray: ByteArray, suffix: String): ByteArray? {
     val vFile = FileUtils.convertToTemp(tempByteArray, "gif", suffix)
-    val ffmpegStatus = Runtime.getRuntime().exec(
-        "${configCache!!.ffmpeg_path} -i " +
-                "${vFile.absolutePath} ${vFile.absolutePath}.gif"
-    ).execListener()!!
-    return if (ffmpegStatus.contains("Invalid")) {
+    val ffmpegPath = configCache!!.ffmpeg_path // FFmpeg 路径
+
+    // 转换文件为 GIF 格式
+    val gifFile = convertFileToGif(vFile, ffmpegPath)
+    if (gifFile == null || !gifFile.exists()) {
         vFile.delete()
-        null
-    } else {
-        val ret = File("${vFile.absolutePath}.gif")
-        val size = ret.length()
-        try {
-            if (size < 20971520) {
-                Files.readAllBytes(ret.toPath())
-            } else {
-                null
-            }
-        } catch (e: IOException) {
-            logger.error(e.toString())
-            null
-        } finally {
-            ret.delete()
-            vFile.delete()
+        return null
+    }
+
+    // 读取 GIF 文件内容
+    val gifData = readFile(gifFile)
+    gifFile.delete()
+    vFile.delete()
+
+    return gifData
+}
+
+private fun convertFileToGif(sourceFile: File, ffmpegPath: String): File? {
+    val gifFile = File(sourceFile.absolutePath + ".gif")
+    val cmd = "$ffmpegPath -i ${sourceFile.absolutePath} ${gifFile.absolutePath}"
+
+    try {
+        val process = Runtime.getRuntime().exec(cmd)
+        process.waitFor()
+        if (process.exitValue() != 0) {
+            return null
         }
+        return gifFile
+    } catch (e: IOException) {
+        logger.error("Failed to execute FFmpeg: ${e.message}")
+        return null
+    } catch (e: InterruptedException) {
+        logger.error("FFmpeg execution interrupted: ${e.message}")
+        return null
     }
 }
 
+private fun readFile(file: File): ByteArray? {
+    if (!file.exists() || !file.isFile || file.length() > 20971520) {
+        return null
+    }
+    return try {
+        Files.readAllBytes(file.toPath())
+    } catch (e: IOException) {
+        logger.error("Failed to read file: ${e.message}")
+        null
+    }
+}
diff --git a/src/main/kotlin/command/download/VideoDownload.kt b/src/main/kotlin/command/download/VideoDownload.kt
@@ -42,7 +42,7 @@ fun downloadVideo(videoUrl: String): String? {
                 videoByte = re.findAll(it).toList()[0].value.split(" ")[0].toInt()
                 // 判断视频是否小于20MB，20971520 = 20 * 20 * 1024
                 if (videoByte < 20971520) {
-                    println("video < 20MB")
+                    logger.info("video < 20MB")
                     val tempFile = File.createTempFile("video", "")
                     Runtime.getRuntime().exec(
                         "${configCache!!.youget_path} --no-caption " +

diff --git a/src/main/kotlin/command/net/ShotCommand.kt b/src/main/kotlin/command/net/ShotCommand.kt
@@ -38,7 +38,7 @@ suspend fun shotWeb(url: String, w: Int, h: Int): ByteArray? {
 }
 
 fun checkUrl(url: String?): Boolean {
-    return url?.matches("[a-zA-z]+://[^\\s]*".toRegex()) ?: false
+    return url?.matches("[a-zA-z]+://\\S*".toRegex()) ?: false
 }
 
 suspend fun shotCommand(bot: Bot, update: Update, args: List<String>) {
@@ -100,7 +100,7 @@ suspend fun shotCommand(bot: Bot, update: Update, args: List<String>) {
             replyMarkup = deleteButton(message.from!!.id)
         ).fold({}, {
             it.exception?.printStackTrace()
-            println(it.errorBody)
+            logger.error(it.errorBody.toString())
         })
         bot.deleteMessage(chatId = ChatId.fromId(message.chat.id), messageId = editMessageId)
         StatusLock.freeze(lockCode)

diff --git a/src/main/kotlin/command/rawtext/LunarCommand.kt b/src/main/kotlin/command/rawtext/LunarCommand.kt
@@ -34,7 +34,6 @@ object LunarCommand {
     }
 
     fun lunarHandler(bot: Bot, update: Update) {
-//        println(lunarInfo())
         bot.sendMessage(
             chatId = ChatId.fromId(update.message!!.chat.id),
             text = lunarInfo(),

diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
@@ -29,8 +29,11 @@ import io.ktor.server.routing.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import mu.KotlinLogging
 import kotlin.system.exitProcess
 
+private val logger = KotlinLogging.logger {}
+
 // ANTI WINDOWS AND FUCK MICROSOFT
 fun init(): Boolean {
     return EnvironmentStatus.check()
@@ -101,7 +104,7 @@ fun main() {
             callbackQuery { CoroutineScope(Dispatchers.IO).launch { callbackMethod(bot, this@callbackQuery.update) } }
 
             telegramError {
-                println(error.getErrorMessage())
+                logger.error(error.getErrorMessage())
             }
         }
     }