From eddef060ea12ba986c2f82d179537a2e67b1077f Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 14 Mar 2023 23:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/info/BookInfoViewModel.kt     |  2 +-
 .../main/java/io/legado/app/utils/UrlUtil.kt  | 25 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
index 3172cc89f..2d50c6811 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
@@ -241,7 +241,7 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
             webFiles.clear()
             val fileName = "${book.name} 作者：${book.author}"
             book.downloadUrls!!.map {
-                val mFileName = "${fileName}.${LocalBook.parseFileSuffix(it)}"
+                val mFileName = UrlUtil.getFileName(it) ?: fileName
                 val isSupportedFile = AppPattern.bookFileRegex.matches(mFileName)
                 val isSupportDecompress = AppPattern.archiveFileRegex.matches(mFileName)
                 WebFile(it, mFileName, isSupportedFile, isSupportDecompress)
diff --git a/app/src/main/java/io/legado/app/utils/UrlUtil.kt b/app/src/main/java/io/legado/app/utils/UrlUtil.kt
index bb2eef359..aabe87dae 100644
--- a/app/src/main/java/io/legado/app/utils/UrlUtil.kt
+++ b/app/src/main/java/io/legado/app/utils/UrlUtil.kt
@@ -29,9 +29,12 @@ object UrlUtil {
             .replace("|", "%7C")
     }
 
-    fun getFileName(fileUrl: String): String {
-        var fileName = ""
-        try {
+    /**
+     * 根据url获取文件名
+     */
+    fun getFileName(fileUrl: String): String? {
+        return kotlin.runCatching {
+            var fileName = ""
             val url = URL(fileUrl)
             val conn: HttpURLConnection = url.openConnection() as HttpURLConnection
             conn.requestMethod = "GET"
@@ -46,23 +49,19 @@ object UrlUtil {
                         fileName.toByteArray(StandardCharsets.ISO_8859_1),
                         StandardCharsets.UTF_8
                     )
-            }
-
-            // 方法二
-            var newUrl: String? = conn.url.file
-            if (newUrl == null || newUrl.isEmpty()) {
+            } else {
+                // 方法二
+                var newUrl: String = conn.url.file
                 newUrl = URLDecoder.decode(newUrl, "UTF-8")
                 var pos = newUrl.indexOf('?')
                 if (pos > 0) {
                     newUrl = newUrl.substring(0, pos)
                 }
-                pos = newUrl!!.lastIndexOf('/')
+                pos = newUrl.lastIndexOf('/')
                 fileName = newUrl.substring(pos + 1)
             }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        return fileName
+            fileName
+        }.getOrNull()
     }
 
     fun getSuffix(url: String, default: String): String {