mirror of
https://github.com/gedoor/legado.git
synced 2024-07-04 23:36:56 +08:00
Compare commits
6 Commits
97f9618275
...
59b9ea8af9
Author | SHA1 | Date | |
---|---|---|---|
|
59b9ea8af9 | ||
|
72ff30b1ea | ||
|
b30ef00307 | ||
|
0cfd6ea46d | ||
|
96c76d74ba | ||
|
6a1fea2f1b |
|
@ -27,6 +27,7 @@ import io.legado.app.help.book.BookHelp
|
||||||
import io.legado.app.help.book.ContentProcessor
|
import io.legado.app.help.book.ContentProcessor
|
||||||
import io.legado.app.help.book.getExportFileName
|
import io.legado.app.help.book.getExportFileName
|
||||||
import io.legado.app.help.book.isLocal
|
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.help.config.AppConfig
|
||||||
import io.legado.app.model.localBook.LocalBook
|
import io.legado.app.model.localBook.LocalBook
|
||||||
import io.legado.app.ui.book.cache.CacheActivity
|
import io.legado.app.ui.book.cache.CacheActivity
|
||||||
|
@ -57,6 +58,7 @@ import kotlinx.coroutines.coroutineScope
|
||||||
import kotlinx.coroutines.ensureActive
|
import kotlinx.coroutines.ensureActive
|
||||||
import kotlinx.coroutines.flow.collectIndexed
|
import kotlinx.coroutines.flow.collectIndexed
|
||||||
import kotlinx.coroutines.flow.flow
|
import kotlinx.coroutines.flow.flow
|
||||||
|
import kotlinx.coroutines.isActive
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.ag2s.epublib.domain.Author
|
import me.ag2s.epublib.domain.Author
|
||||||
import me.ag2s.epublib.domain.Date
|
import me.ag2s.epublib.domain.Date
|
||||||
|
@ -121,7 +123,10 @@ class ExportBookService : BaseService() {
|
||||||
toastOnUi(it.localizedMessage)
|
toastOnUi(it.localizedMessage)
|
||||||
}
|
}
|
||||||
|
|
||||||
IntentAction.stop -> stopSelf()
|
IntentAction.stop -> {
|
||||||
|
notificationManager.cancel(NotificationId.ExportBook)
|
||||||
|
stopSelf()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return super.onStartCommand(intent, flags, startId)
|
return super.onStartCommand(intent, flags, startId)
|
||||||
}
|
}
|
||||||
|
@ -130,6 +135,9 @@ class ExportBookService : BaseService() {
|
||||||
super.onDestroy()
|
super.onDestroy()
|
||||||
exportProgress.clear()
|
exportProgress.clear()
|
||||||
exportMsg.clear()
|
exportMsg.clear()
|
||||||
|
waitExportBooks.keys.forEach {
|
||||||
|
postEvent(EventBus.EXPORT_BOOK, it)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressLint("MissingPermission")
|
@SuppressLint("MissingPermission")
|
||||||
|
@ -168,7 +176,7 @@ class ExportBookService : BaseService() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
exportJob = lifecycleScope.launch(IO) {
|
exportJob = lifecycleScope.launch(IO) {
|
||||||
while (true) {
|
while (isActive) {
|
||||||
val (bookUrl, exportConfig) = waitExportBooks.entries.firstOrNull() ?: let {
|
val (bookUrl, exportConfig) = waitExportBooks.entries.firstOrNull() ?: let {
|
||||||
notificationContentText = "导出完成"
|
notificationContentText = "导出完成"
|
||||||
upExportNotification(true)
|
upExportNotification(true)
|
||||||
|
@ -200,6 +208,7 @@ class ExportBookService : BaseService() {
|
||||||
}
|
}
|
||||||
exportMsg[book.bookUrl] = getString(R.string.export_success)
|
exportMsg[book.bookUrl] = getString(R.string.export_success)
|
||||||
} catch (e: Throwable) {
|
} catch (e: Throwable) {
|
||||||
|
ensureActive()
|
||||||
exportMsg[bookUrl] = e.localizedMessage ?: "ERROR"
|
exportMsg[bookUrl] = e.localizedMessage ?: "ERROR"
|
||||||
AppLog.put("导出书籍<${book?.name ?: bookUrl}>出错", e)
|
AppLog.put("导出书籍<${book?.name ?: bookUrl}>出错", e)
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -211,10 +220,7 @@ class ExportBookService : BaseService() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun refreshChapterList(book: Book) {
|
private fun refreshChapterList(book: Book) {
|
||||||
if (!book.isLocal) {
|
if (!book.isLocal || !book.isLocalModified()) {
|
||||||
return
|
|
||||||
}
|
|
||||||
if (LocalBook.getLastModified(book).getOrDefault(0L) < book.latestChapterTime) {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
kotlin.runCatching {
|
kotlin.runCatching {
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@vitejs/plugin-vue": "^5.0.4",
|
"@vitejs/plugin-vue": "^5.0.4",
|
||||||
"eslint": "^8.40.0",
|
"eslint": "^9.3.0",
|
||||||
"eslint-config-prettier": "^9.1.0",
|
"eslint-config-prettier": "^9.1.0",
|
||||||
"eslint-plugin-prettier": "^5.0.0",
|
"eslint-plugin-prettier": "^5.0.0",
|
||||||
"eslint-plugin-vue": "^9.12.0",
|
"eslint-plugin-vue": "^9.12.0",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user