gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-07-06 23:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Xwite 2022-01-23 16:54:45 +08:00 committed by GitHub
commit 6cdc15b43c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/assets/web/rssSource/index.html
View File

@ -107,7 +107,7 @@
placeholder="是否加载url (启用: true 关闭: false (可选,默认true))"></textarea>
</div>
<div>
<div>启用JS :</div>
<div>启用JS　:</div>
<textarea rows="1" id="enableJs" class="base" title="enableJs"
placeholder="是否启用Js (启用: true 关闭: false (可选,默认true))"></textarea>
</div>
@ -148,6 +148,11 @@
<textarea rows="1" id="customOrder" class="base" title="customOrder"
placeholder="整数: 0~N (可选,默认0) | 数字越小越靠前"></textarea>
</div>
<div>
<div>单URL　:</div>
<textarea rows="1" id="singleUrl" class="base" title="singleUrl"
placeholder="启用: true 关闭: false (可选,false)"></textarea>
</div>
</div>
</div>
<div class="menu">

5
app/src/main/assets/web/rssSource/index.js
View File

@ -76,15 +76,16 @@ function rule2json() {
let RuleJSON = Container();
// 转换base
Object.keys(RuleJSON).forEach(key => {
RuleJSON[key] = $('#' + key).value;
RuleJSON[key] = $('#' + key).value;
});
//类型转换
RuleJSON.lastUpdateTime = new Date().getTime();
RuleJSON.customOrder = RuleJSON.customOrder == '' ? 0 : parseInt(RuleJSON.customOrder);
RuleJSON.articleStyle = RuleJSON.articleStyle == '' ? 0 : parseInt(RuleJSON.articleStyle);
RuleJSON.enabled = RuleJSON.enabled == '' || String(RuleJSON.enabled).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true';
RuleJSON.loadWithBaseUrl = RuleJSON.loadWithBaseUrl == '' || String(RuleJSON.loadWithBaseUrl).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true';
RuleJSON.enableJs = RuleJSON.enableJs == '' || String(RuleJSON.enableJs).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true';
RuleJSON.loadWithBaseUrl = RuleJSON.loadWithBaseUrl == '' || String(RuleJSON.loadWithBaseUrl).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true';
RuleJSON.singleUrl = RuleJSON.singleUrl == '' || String(RuleJSON.singleUrl).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true';
return RuleJSON;
}
// 将源对象填充到源表单

6
app/src/main/java/io/legado/app/data/entities/BookSource.kt
View File

@ -118,18 +118,20 @@ data class BookSource(
fun getContentRule() = ruleContent ?: ContentRule()
fun addGroup(group: String) {
fun addGroup(group: String): BookSource {
bookSourceGroup?.splitNotBlank(AppPattern.splitGroupRegex)?.toHashSet()?.let {
it.add(group)
bookSourceGroup = TextUtils.join(",", it)
}
return this
}
fun removeGroup(group: String) {
fun removeGroup(group: String): BookSource {
bookSourceGroup?.splitNotBlank(AppPattern.splitGroupRegex)?.toHashSet()?.let {
it.remove(group)
bookSourceGroup = TextUtils.join(",", it)
}
return this
}
fun equal(source: BookSource) =

9
app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt
View File

@ -3,7 +3,6 @@ package io.legado.app.ui.book.source.manage
import android.app.Application
import android.text.TextUtils
import io.legado.app.base.BaseViewModel
import io.legado.app.constant.AppPattern
import io.legado.app.data.appDb
import io.legado.app.data.entities.BookSource
import io.legado.app.utils.*
@ -92,23 +91,19 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
fun selectionAddToGroups(sources: List<BookSource>, groups: String) {
execute {
val list = arrayListOf<BookSource>()
sources.forEach { source ->
source.addGroup(groups)
list.add(source)
}
appDb.bookSourceDao.update(*list.toTypedArray())
appDb.bookSourceDao.update(*sources.toTypedArray())
}
}
fun selectionRemoveFromGroups(sources: List<BookSource>, groups: String) {
execute {
val list = arrayListOf<BookSource>()
sources.forEach { source ->
source.removeGroup(groups)
list.add(source)
}
appDb.bookSourceDao.update(*list.toTypedArray())
appDb.bookSourceDao.update(*sources.toTypedArray())
}
}