diff --git a/app/src/main/java/io/legado/app/data/entities/Book.kt b/app/src/main/java/io/legado/app/data/entities/Book.kt index c1018e466..372d1271e 100644 --- a/app/src/main/java/io/legado/app/data/entities/Book.kt +++ b/app/src/main/java/io/legado/app/data/entities/Book.kt @@ -2,7 +2,6 @@ package io.legado.app.data.entities import android.os.Parcelable import androidx.room.* -import io.legado.app.constant.AppLog import io.legado.app.constant.AppPattern import io.legado.app.constant.BookType import io.legado.app.data.appDb @@ -144,15 +143,7 @@ data class Book( } override fun putVariable(key: String, value: String?) { - if (value != null) { - if (value.length > 1000) { - AppLog.put("${name}设置变量长度超过1000,设置失败") - return - } - variableMap[key] = value - } else { - variableMap.remove(key) - } + super.putVariable(key, value) variable = GSON.toJson(variableMap) } diff --git a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt index c28f04763..9aab338e0 100644 --- a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt @@ -7,7 +7,6 @@ import androidx.room.Ignore import androidx.room.Index import com.github.liuyueyi.quick.transfer.ChineseUtils import io.legado.app.R -import io.legado.app.constant.AppLog import io.legado.app.constant.AppPattern import io.legado.app.help.config.AppConfig import io.legado.app.model.analyzeRule.AnalyzeUrl @@ -56,15 +55,7 @@ data class BookChapter( } override fun putVariable(key: String, value: String?) { - if (value != null) { - if (value.length > 1000) { - AppLog.put("${title}设置变量长度超过1000,设置失败") - return - } - variableMap[key] = value - } else { - variableMap.remove(key) - } + super.putVariable(key, value) variable = GSON.toJson(variableMap) } diff --git a/app/src/main/java/io/legado/app/data/entities/RssArticle.kt b/app/src/main/java/io/legado/app/data/entities/RssArticle.kt index d238c97d5..948671e14 100644 --- a/app/src/main/java/io/legado/app/data/entities/RssArticle.kt +++ b/app/src/main/java/io/legado/app/data/entities/RssArticle.kt @@ -2,7 +2,6 @@ package io.legado.app.data.entities import androidx.room.Entity import androidx.room.Ignore -import io.legado.app.constant.AppLog import io.legado.app.model.analyzeRule.RuleDataInterface import io.legado.app.utils.GSON import io.legado.app.utils.fromJsonObject @@ -42,15 +41,7 @@ data class RssArticle( } override fun putVariable(key: String, value: String?) { - if (value != null) { - if (value.length > 1000) { - AppLog.put("${title}设置变量长度超过1000,设置失败") - return - } - variableMap[key] = value - } else { - variableMap.remove(key) - } + super.putVariable(key, value) variable = GSON.toJson(variableMap) } diff --git a/app/src/main/java/io/legado/app/data/entities/RssStar.kt b/app/src/main/java/io/legado/app/data/entities/RssStar.kt index 2fd76bc86..51aa5f44f 100644 --- a/app/src/main/java/io/legado/app/data/entities/RssStar.kt +++ b/app/src/main/java/io/legado/app/data/entities/RssStar.kt @@ -2,7 +2,6 @@ package io.legado.app.data.entities import androidx.room.Entity import androidx.room.Ignore -import io.legado.app.constant.AppLog import io.legado.app.model.analyzeRule.RuleDataInterface import io.legado.app.utils.GSON import io.legado.app.utils.fromJsonObject @@ -34,15 +33,7 @@ data class RssStar( } override fun putVariable(key: String, value: String?) { - if (value != null) { - if (value.length > 1000) { - AppLog.put("${title}设置变量长度超过1000,设置失败") - return - } - variableMap[key] = value - } else { - variableMap.remove(key) - } + super.putVariable(key, value) variable = GSON.toJson(variableMap) } diff --git a/app/src/main/java/io/legado/app/data/entities/SearchBook.kt b/app/src/main/java/io/legado/app/data/entities/SearchBook.kt index f995a66da..853acbbfd 100644 --- a/app/src/main/java/io/legado/app/data/entities/SearchBook.kt +++ b/app/src/main/java/io/legado/app/data/entities/SearchBook.kt @@ -64,11 +64,7 @@ data class SearchBook( } override fun putVariable(key: String, value: String?) { - if (value != null) { - variableMap[key] = value - } else { - variableMap.remove(key) - } + super.putVariable(key, value) variable = GSON.toJson(variableMap) } diff --git a/app/src/main/java/io/legado/app/help/DirectLinkUpload.kt b/app/src/main/java/io/legado/app/help/DirectLinkUpload.kt index 14c91a1e6..ccdc1c7d8 100644 --- a/app/src/main/java/io/legado/app/help/DirectLinkUpload.kt +++ b/app/src/main/java/io/legado/app/help/DirectLinkUpload.kt @@ -3,7 +3,6 @@ package io.legado.app.help import io.legado.app.model.NoStackTraceException import io.legado.app.model.analyzeRule.AnalyzeRule import io.legado.app.model.analyzeRule.AnalyzeUrl -import io.legado.app.model.analyzeRule.RuleData import io.legado.app.utils.jsonPath import io.legado.app.utils.readString import splitties.init.appCtx @@ -27,7 +26,7 @@ object DirectLinkUpload { } val analyzeUrl = AnalyzeUrl(url) val res = analyzeUrl.upload(fileName, file, contentType) - val analyzeRule = AnalyzeRule(RuleData()).setContent(res.body, res.url) + val analyzeRule = AnalyzeRule().setContent(res.body, res.url) val downloadUrl = analyzeRule.getString(downloadUrlRule) if (downloadUrl.isBlank()) { throw NoStackTraceException("上传失败,${res.body}") diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/RuleData.kt b/app/src/main/java/io/legado/app/model/analyzeRule/RuleData.kt index 373ff92cf..5d84d58fd 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/RuleData.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/RuleData.kt @@ -1,23 +1,9 @@ package io.legado.app.model.analyzeRule -import io.legado.app.constant.AppLog - class RuleData : RuleDataInterface { override val variableMap by lazy { hashMapOf() } - override fun putVariable(key: String, value: String?) { - if (value != null) { - if (value.length > 1000) { - AppLog.put("设置变量长度超过1000,设置失败") - return - } - variableMap[key] = value - } else { - variableMap.remove(key) - } - } - } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/RuleDataInterface.kt b/app/src/main/java/io/legado/app/model/analyzeRule/RuleDataInterface.kt index 8b87f949b..29dc9fb98 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/RuleDataInterface.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/RuleDataInterface.kt @@ -4,7 +4,13 @@ interface RuleDataInterface { val variableMap: HashMap - fun putVariable(key: String, value: String?) + fun putVariable(key: String, value: String?) { + if (value == null) { + variableMap.remove(key) + } else if (value.length < 1000) { + variableMap[key] = value + } + } fun getVariable(key: String): String? { return variableMap[key]