From e527b7fb5d2c3e63acb1efdbbb9c1bb2738c9126 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Sat, 25 Mar 2023 11:36:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(js/java.cacheFile):=20=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E6=97=B6=E4=BF=9D=E5=AD=98=E7=B1=BB=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/help/jsHelp.md                   | 5 ++---
 app/src/main/java/io/legado/app/help/JsExtensions.kt | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/assets/help/jsHelp.md b/app/src/main/assets/help/jsHelp.md
index 7b313c079..7ae78076b 100644
--- a/app/src/main/assets/help/jsHelp.md
+++ b/app/src/main/assets/help/jsHelp.md
@@ -124,7 +124,7 @@ eval(String(java.cacheFile(url)))
 删除缓存文件
 cache.delete(java.md5Encode16(url))
 ```
-* 获取网络压缩文件里面指定路径的数据 *可替换Zip Rar 7Z Archive
+* 获取网络压缩文件里面指定路径的数据 *可替换Zip Rar 7Z
 ```
 java.get*StringContent(url: String, path: String): String
 
@@ -167,8 +167,7 @@ java.androidId()
 * 文件
 >  所有对于文件的读写删操作都是相对路径,只能操作阅读缓存/android/data/{package}/cache/内的文件
 ```
-//文件下载,content为十六进制字符串,url用于生成文件名，返回文件路径
-downloadFile(content: String, url: String): String
+//文件下载 url用于生成文件名，返回文件路径
 downloadFile(url: String): String
 //文件解压,zipPath为压缩文件路径，返回解压路径
 unArchiveFile(zipPath: String): String
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 01015d7c0..87c01ef57 100644
--- a/app/src/main/java/io/legado/app/help/JsExtensions.kt
+++ b/app/src/main/java/io/legado/app/help/JsExtensions.kt
@@ -198,7 +198,7 @@ interface JsExtensions : JsEncodeUtils {
     fun cacheFile(urlStr: String, saveTime: Int): String {
         val key = md5Encode16(urlStr)
         val cahcePath = CacheManager.get(key)
-        return if (cache.isNullOrBlank()) {
+        return if (cahcePath.isNullOrBlank()) {
             val path = downloadFile(urlStr)
             log("首次下载 $urlStr >> $path")
             CacheManager.put(key, path, saveTime)