Compare commits

...

6 Commits

Author SHA1 Message Date
dependabot[bot]
2e0588c234
Merge 9130452f06 into 72ff30b1ea 2024-05-31 22:54:32 +08:00
Horis
72ff30b1ea 优化 2024-05-31 19:04:36 +08:00
Horis
b30ef00307 优化 2024-05-31 18:53:02 +08:00
Horis
0cfd6ea46d 优化 2024-05-31 17:53:53 +08:00
Horis
96c76d74ba 优化 2024-05-31 17:51:28 +08:00
dependabot[bot]
9130452f06
Bump unplugin-vue-components from 0.26.0 to 0.27.0 in /modules/web
Bumps [unplugin-vue-components](https://github.com/unplugin/unplugin-vue-components) from 0.26.0 to 0.27.0.
- [Release notes](https://github.com/unplugin/unplugin-vue-components/releases)
- [Commits](https://github.com/unplugin/unplugin-vue-components/compare/v0.26.0...v0.27.0)

---
updated-dependencies:
- dependency-name: unplugin-vue-components
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-06 04:25:02 +00:00
2 changed files with 13 additions and 7 deletions

View File

@ -27,6 +27,7 @@ import io.legado.app.help.book.BookHelp
import io.legado.app.help.book.ContentProcessor
import io.legado.app.help.book.getExportFileName
import io.legado.app.help.book.isLocal
import io.legado.app.help.book.isLocalModified
import io.legado.app.help.config.AppConfig
import io.legado.app.model.localBook.LocalBook
import io.legado.app.ui.book.cache.CacheActivity
@ -57,6 +58,7 @@ import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.ensureActive
import kotlinx.coroutines.flow.collectIndexed
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import me.ag2s.epublib.domain.Author
import me.ag2s.epublib.domain.Date
@ -121,7 +123,10 @@ class ExportBookService : BaseService() {
toastOnUi(it.localizedMessage)
}
IntentAction.stop -> stopSelf()
IntentAction.stop -> {
notificationManager.cancel(NotificationId.ExportBook)
stopSelf()
}
}
return super.onStartCommand(intent, flags, startId)
}
@ -130,6 +135,9 @@ class ExportBookService : BaseService() {
super.onDestroy()
exportProgress.clear()
exportMsg.clear()
waitExportBooks.keys.forEach {
postEvent(EventBus.EXPORT_BOOK, it)
}
}
@SuppressLint("MissingPermission")
@ -168,7 +176,7 @@ class ExportBookService : BaseService() {
return
}
exportJob = lifecycleScope.launch(IO) {
while (true) {
while (isActive) {
val (bookUrl, exportConfig) = waitExportBooks.entries.firstOrNull() ?: let {
notificationContentText = "导出完成"
upExportNotification(true)
@ -200,6 +208,7 @@ class ExportBookService : BaseService() {
}
exportMsg[book.bookUrl] = getString(R.string.export_success)
} catch (e: Throwable) {
ensureActive()
exportMsg[bookUrl] = e.localizedMessage ?: "ERROR"
AppLog.put("导出书籍<${book?.name ?: bookUrl}>出错", e)
} finally {
@ -211,10 +220,7 @@ class ExportBookService : BaseService() {
}
private fun refreshChapterList(book: Book) {
if (!book.isLocal) {
return
}
if (LocalBook.getLastModified(book).getOrDefault(0L) < book.latestChapterTime) {
if (!book.isLocal || !book.isLocalModified()) {
return
}
kotlin.runCatching {

View File

@ -35,7 +35,7 @@
"sass": "^1.62.1",
"unplugin-auto-import": "^0.17.5",
"unplugin-icons": "^0.18.5",
"unplugin-vue-components": "^0.26.0",
"unplugin-vue-components": "^0.27.0",
"vite": "^5.1.3"
}
}