diff --git a/app/src/main/java/io/legado/app/help/JsExtensions.kt b/app/src/main/java/io/legado/app/help/JsExtensions.kt index 87c01ef57..7ac1261e9 100644 --- a/app/src/main/java/io/legado/app/help/JsExtensions.kt +++ b/app/src/main/java/io/legado/app/help/JsExtensions.kt @@ -173,7 +173,7 @@ interface JsExtensions : JsEncodeUtils { */ fun importScript(path: String): String { val result = when { - path.startsWith("http") -> cacheFile(path) ?: "" + path.startsWith("http") -> cacheFile(path) path.isUri() -> Uri.parse(path).readText(appCtx) path.startsWith("/storage") -> FileUtils.readText(path) else -> readTxtFile(path) @@ -187,7 +187,7 @@ interface JsExtensions : JsEncodeUtils { * @param urlStr 网络文件的链接 * @return 返回缓存后的文件内容 */ - fun cacheFile(urlStr: String): String? { + fun cacheFile(urlStr: String): String { return cacheFile(urlStr, 0) } diff --git a/app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt b/app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt index dc3a9b7f3..e9b3c47a2 100644 --- a/app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt @@ -24,7 +24,9 @@ class FileAssociationViewModel(application: Application) : BaseAssociationViewMo val fileDoc = FileDoc.fromUri(uri, false) fileName = fileDoc.name if (fileName.matches(AppPattern.archiveFileRegex)) { - ArchiveUtils.deCompress(fileDoc).forEach { + ArchiveUtils.deCompress(fileDoc, ArchiveUtils.TEMP_PATH) { + it.matches(bookFileRegex) + }.forEach { dispatch(FileDoc.fromFile(it)) } } else {