feat: 优化代码

app/src/main/java/io/legado/app/model/localBook/LocalBook.kt

@@ -6,12 +6,19 @@ import io.legado.app.App
 import io.legado.app.data.entities.Book
 import io.legado.app.help.BookHelp
 import io.legado.app.utils.FileUtils
+import io.legado.app.utils.isContentPath
+import java.io.File
 
 
 object LocalBook {
 
-    fun importFile(doc: DocumentFile) {
+    fun importFile(path: String) {
-        doc.name?.let { fileName ->
+        val fileName = if (path.isContentPath()) {
+            val doc = DocumentFile.fromSingleUri(App.INSTANCE, Uri.parse(path))
+            doc?.name ?: ""
+        } else {
+            File(path).name
+        }
         val str = fileName.substringBeforeLast(".")
         val authorIndex = str.indexOf("作者")
         var name: String
@@ -30,14 +37,13 @@ object LocalBook {
             name = (name.substring(smhStart + 1, smhEnd))
         }
         val book = Book(
-                bookUrl = doc.uri.toString(),
+            bookUrl = path,
             name = name,
             author = author,
             originName = fileName
         )
         App.db.bookDao().insert(book)
     }
-    }
 
     fun deleteBook(book: Book, deleteOriginal: Boolean) {
         kotlin.runCatching {
@@ -47,8 +53,12 @@ object LocalBook {
             }
 
             if (deleteOriginal) {
+                if (book.bookUrl.isContentPath()) {
                     val uri = Uri.parse(book.bookUrl)
                     DocumentFile.fromSingleUri(App.INSTANCE, uri)?.delete()
+                } else {
+                    FileUtils.deleteFile(book.bookUrl)
+                }
             }
         }
     }

app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt

@@ -11,10 +11,8 @@ class ImportBookViewModel(application: Application) : BaseViewModel(application)
 
     fun addToBookshelf(uriList: HashSet<String>, finally: () -> Unit) {
         execute {
-            uriList.forEach { uriStr ->
+            uriList.forEach {
-                DocumentFile.fromSingleUri(context, Uri.parse(uriStr))?.let { doc ->
+                LocalBook.importFile(it)
-                    LocalBook.importFile(doc)
-                }
             }
         }.onFinally {
             finally.invoke()