优化
This commit is contained in:
@@ -22,6 +22,7 @@ import javax.script.SimpleBindings
|
|||||||
object LocalBook {
|
object LocalBook {
|
||||||
|
|
||||||
private val nameAuthorPatterns = arrayOf(
|
private val nameAuthorPatterns = arrayOf(
|
||||||
|
Pattern.compile("(.*?)《([^《》]+)》.*?作者:(.*)"),
|
||||||
Pattern.compile("(.*?)《([^《》]+)》(.*)"),
|
Pattern.compile("(.*?)《([^《》]+)》(.*)"),
|
||||||
Pattern.compile("(^)(.+) 作者:(.+)$"),
|
Pattern.compile("(^)(.+) 作者:(.+)$"),
|
||||||
Pattern.compile("(^)(.+) by (.+)$")
|
Pattern.compile("(^)(.+) by (.+)$")
|
||||||
|
|||||||
@@ -31,9 +31,8 @@ class FileAssociationViewModel(application: Application) : BaseAssociationViewMo
|
|||||||
} else {
|
} else {
|
||||||
DocumentFile.fromSingleUri(context, uri)?.readText(context)
|
DocumentFile.fromSingleUri(context, uri)?.readText(context)
|
||||||
} ?: throw NoStackTraceException("文件不存在")
|
} ?: throw NoStackTraceException("文件不存在")
|
||||||
if (content.isJson()) {
|
|
||||||
//暂时根据文件内容判断属于什么
|
|
||||||
when {
|
when {
|
||||||
|
content.isJson() -> when {
|
||||||
content.contains("bookSourceUrl") ->
|
content.contains("bookSourceUrl") ->
|
||||||
importBookSourceLive.postValue(content)
|
importBookSourceLive.postValue(content)
|
||||||
content.contains("sourceUrl") ->
|
content.contains("sourceUrl") ->
|
||||||
@@ -48,11 +47,13 @@ class FileAssociationViewModel(application: Application) : BaseAssociationViewMo
|
|||||||
importHttpTTS(content, finally)
|
importHttpTTS(content, finally)
|
||||||
else -> errorLiveData.postValue("格式不对")
|
else -> errorLiveData.postValue("格式不对")
|
||||||
}
|
}
|
||||||
} else if (uri.toString().matches(bookFileRegex)) {
|
uri.toString().matches(bookFileRegex) -> {
|
||||||
importBookLiveData.postValue(uri)
|
importBookLiveData.postValue(uri)
|
||||||
} else {
|
}
|
||||||
|
else -> {
|
||||||
throw NoStackTraceException("暂未支持的本地书籍格式(TXT/UMD/EPUB)")
|
throw NoStackTraceException("暂未支持的本地书籍格式(TXT/UMD/EPUB)")
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
onLineImportLive.postValue(uri)
|
onLineImportLive.postValue(uri)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user