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

优化

Browse Source
This commit is contained in:
Horis
2023-09-02 12:29:45 +08:00
parent 5b69647abb
commit a83207d594
9 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/service/ExportBookService.kt
+36 -38
View File
@@ -93,7 +93,6 @@ class ExportBookService : BaseService() {
)
private val groupKey = "${appCtx.packageName}.exportBook"
private val handler = buildMainHandler()
private val waitExportBooks = linkedMapOf<String, ExportConfig>()
private var exportJob: Job? = null
private var notificationContentText = appCtx.getString(R.string.service_starting)
@@ -111,6 +110,8 @@ class ExportBookService : BaseService() {
epubScope = intent.getStringExtra("epubScope")
)
waitExportBooks[bookUrl] = exportConfig
exportMsg[bookUrl] = getString(R.string.export_wait)
postEvent(EventBus.EXPORT_BOOK, bookUrl)
export()
}
}.onFailure {
@@ -163,47 +164,44 @@ class ExportBookService : BaseService() {
if (exportJob?.isActive == true) {
return
}
val entry = waitExportBooks.firstNotNullOfOrNull { it }
if (entry == null) {
notificationContentText = "导出完成"
upExportNotification()
return
}
val bookUrl = entry.key
val exportConfig = entry.value
if (exportProgress.contains(bookUrl)) return
exportProgress[bookUrl] = 0
waitExportBooks.remove(bookUrl)
exportJob = lifecycleScope.launch(IO) {
val book = appDb.bookDao.getBook(bookUrl)
try {
book ?: throw NoStackTraceException("获取${bookUrl}书籍出错")
notificationContentText = getString(
R.string.export_book_notification_content,
book.name,
waitExportBooks.size
)
upExportNotification()
if (exportConfig.type == "epub") {
if (exportConfig.epubScope.isNullOrBlank()) {
exportEPUB(exportConfig.path, book)
while (true) {
val (bookUrl, exportConfig) = waitExportBooks.entries.firstOrNull() ?: let {
notificationContentText = "导出完成"
upExportNotification()
return@launch
}
exportProgress[bookUrl] = 0
waitExportBooks.remove(bookUrl)
val book = appDb.bookDao.getBook(bookUrl)
try {
book ?: throw NoStackTraceException("获取${bookUrl}书籍出错")
notificationContentText = getString(
R.string.export_book_notification_content,
book.name,
waitExportBooks.size
)
upExportNotification()
if (exportConfig.type == "epub") {
if (exportConfig.epubScope.isNullOrBlank()) {
exportEPUB(exportConfig.path, book)
} else {
CustomExporter(
paresScope(exportConfig.epubScope),
exportConfig.epubSize
).export(exportConfig.path, book)
}
} else {
CustomExporter(paresScope(exportConfig.epubScope), exportConfig.epubSize)
.export(exportConfig.path, book)
export(exportConfig.path, book)
}
} else {
export(exportConfig.path, book)
exportMsg[book.bookUrl] = getString(R.string.export_success)
} catch (e: Throwable) {
exportMsg[bookUrl] = e.localizedMessage ?: "ERROR"
AppLog.put("导出书籍<${book?.name ?: bookUrl}>出错", e)
} finally {
exportProgress.remove(bookUrl)
postEvent(EventBus.EXPORT_BOOK, bookUrl)
}
exportMsg[book.bookUrl] = getString(R.string.export_success)
} catch (e: Throwable) {
exportMsg[bookUrl] = e.localizedMessage ?: "ERROR"
AppLog.put("导出书籍<${book?.name ?: bookUrl}>出错", e)
} finally {
exportProgress.remove(bookUrl)
postEvent(EventBus.EXPORT_BOOK, bookUrl)
}
handler.post {
export()
}
}
}
app/src/main/res/values-es-rES/strings.xml
+1
View File
@@ -1127,4 +1127,5 @@
<string name="export_md">导出(MD)</string>
<string name="change_source_delay">换源间隔</string>
<string name="open_book_info_by_click_title">点击书名打开详情</string>
<string name="export_wait">等待导出</string>
</resources>
app/src/main/res/values-ja-rJP/strings.xml
+1
View File
@@ -1130,4 +1130,5 @@
<string name="export_md">导出(MD)</string>
<string name="change_source_delay">换源间隔</string>
<string name="open_book_info_by_click_title">点击书名打开详情</string>
<string name="export_wait">等待导出</string>
</resources>
app/src/main/res/values-pt-rBR/strings.xml
+1
View File
@@ -1130,4 +1130,5 @@
<string name="export_md">导出(MD)</string>
<string name="change_source_delay">换源间隔</string>
<string name="open_book_info_by_click_title">点击书名打开详情</string>
<string name="export_wait">等待导出</string>
</resources>
app/src/main/res/values-vi/strings.xml
+1
View File
@@ -1126,4 +1126,5 @@ Còn </string>
<string name="export_md">导出(MD)</string>
<string name="change_source_delay">换源间隔</string>
<string name="open_book_info_by_click_title">点击书名打开详情</string>
<string name="export_wait">等待导出</string>
</resources>
app/src/main/res/values-zh-rHK/strings.xml
+1
View File
@@ -1127,4 +1127,5 @@
<string name="export_md">导出(MD)</string>
<string name="change_source_delay">换源间隔</string>
<string name="open_book_info_by_click_title">点击书名打开详情</string>
<string name="export_wait">等待导出</string>
</resources>
app/src/main/res/values-zh-rTW/strings.xml
+1
View File
@@ -1129,4 +1129,5 @@
<string name="export_md">导出(MD)</string>
<string name="change_source_delay">换源间隔</string>
<string name="open_book_info_by_click_title">点击书名打开详情</string>
<string name="export_wait">等待导出</string>
</resources>
app/src/main/res/values-zh/strings.xml
+1
View File
@@ -1129,4 +1129,5 @@
<string name="export_md">导出(MD)</string>
<string name="change_source_delay">换源间隔</string>
<string name="open_book_info_by_click_title">点击书名打开详情</string>
<string name="export_wait">等待导出</string>
</resources>
app/src/main/res/values/strings.xml
+1
View File
@@ -1130,4 +1130,5 @@
<string name="export_md">导出(MD)</string>
<string name="change_source_delay">换源间隔</string>
<string name="open_book_info_by_click_title">点击书名打开详情</string>
<string name="export_wait">等待导出</string>
</resources>