yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
Xwite
2023-03-25 11:53:10 +08:00
parent 7c3aab712f
commit 4ad7e6f989
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/help/JsExtensions.kt
+2 -2
View File
@@ -173,7 +173,7 @@ interface JsExtensions : JsEncodeUtils {
*/ */
fun importScript(path: String): String { fun importScript(path: String): String {
val result = when { val result = when {
path.startsWith("http") -> cacheFile(path) ?: "" path.startsWith("http") -> cacheFile(path)
path.isUri() -> Uri.parse(path).readText(appCtx) path.isUri() -> Uri.parse(path).readText(appCtx)
path.startsWith("/storage") -> FileUtils.readText(path) path.startsWith("/storage") -> FileUtils.readText(path)
else -> readTxtFile(path) else -> readTxtFile(path)
@@ -187,7 +187,7 @@ interface JsExtensions : JsEncodeUtils {
* @param urlStr 网络文件的链接 * @param urlStr 网络文件的链接
* @return 返回缓存后的文件内容 * @return 返回缓存后的文件内容
*/ */
fun cacheFile(urlStr: String): String? { fun cacheFile(urlStr: String): String {
return cacheFile(urlStr, 0) return cacheFile(urlStr, 0)
} }
app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt
+3 -1
View File
@@ -24,7 +24,9 @@ class FileAssociationViewModel(application: Application) : BaseAssociationViewMo
val fileDoc = FileDoc.fromUri(uri, false) val fileDoc = FileDoc.fromUri(uri, false)
fileName = fileDoc.name fileName = fileDoc.name
if (fileName.matches(AppPattern.archiveFileRegex)) { if (fileName.matches(AppPattern.archiveFileRegex)) {
ArchiveUtils.deCompress(fileDoc).forEach { ArchiveUtils.deCompress(fileDoc, ArchiveUtils.TEMP_PATH) {
it.matches(bookFileRegex)
}.forEach {
dispatch(FileDoc.fromFile(it)) dispatch(FileDoc.fromFile(it))
} }
} else { } else {