YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix：importScript相对路径错误

Browse Source
This commit is contained in:
Xwite
2022-03-31 14:13:56 +08:00
parent 9abd54b6b5
commit 417836eeae
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/help/JsExtensions.kt
+10 -11
View File
@@ -133,26 +133,25 @@ interface JsExtensions {
* 可从网络，本地文件(阅读私有缓存目录和书籍保存位置支持相对路径)导入JavaScript脚本 * 可从网络，本地文件(阅读私有缓存目录和书籍保存位置支持相对路径)导入JavaScript脚本
*/ */
fun importScript(path: String): String { fun importScript(path: String): String {
var result: String = "" val result = when {
when { path.startsWith("http") -> cacheFile(path) ?: ""
path.startsWith("http") -> result = cacheFile(path) ?: "" path.isContentScheme() -> DocumentUtils.readText(appCtx, Uri.parse(path))
path.isContentScheme() -> result = DocumentUtils.readText(appCtx, Uri.parse(path)) path.startsWith("/storage") -> FileUtils.readText(path)
path.startsWith("/storage") -> result = FileUtils.readText(path)
else -> { else -> {
//相对路径
val jsPath = if (path.startsWith("/")) path else "/" + path
//先找书籍保存目录下有没有 //先找书籍保存目录下有没有
val publicStoragePath = AppConfig.defaultBookTreeUri val publicStoragePath = AppConfig.defaultBookTreeUri
val jsString = publicStoragePath?.let { val jsString = publicStoragePath?.let {
val jsPath = if (path.startsWith("/")) path else "/" + path if (it.isContentScheme()) {
val filePathString = it + jsPath val fileUri = Uri.parse(it + URLEncoder.encode(jsPath, "UTF-8"))
val fileUri = Uri.parse(filePathString)
if (fileUri.isContentScheme()) {
DocumentUtils.readText(appCtx, fileUri) DocumentUtils.readText(appCtx, fileUri)
} else { } else {
FileUtils.readText(fileUri.path!!) FileUtils.readText(it + jsPath)
} }
} }
//私有目录 //私有目录
result = if (jsString.isNullOrBlank()) readTxtFile(path) else jsString if (jsString.isNullOrBlank()) readTxtFile(path) else jsString
} }
} }
if (result.isBlank()) throw NoStackTraceException("${path} 内容获取失败或者为空") if (result.isBlank()) throw NoStackTraceException("${path} 内容获取失败或者为空")