temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-03 19:04:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

use correct conversion units

Browse Source
This commit is contained in:
Aria Moradi
2021-10-10 21:31:38 +03:30
parent e57e71629e
commit e8c4159678
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt
View File

@@ -32,6 +32,7 @@ import suwayomi.tachidesk.manga.model.table.SourceTable
import suwayomi.tachidesk.manga.model.table.toDataClass import suwayomi.tachidesk.manga.model.table.toDataClass
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.InputStream import java.io.InputStream
import java.util.concurrent.TimeUnit
object ProtoBackupExport : ProtoBackupBase() { object ProtoBackupExport : ProtoBackupBase() {
suspend fun createBackup(flags: BackupFlags): InputStream { suspend fun createBackup(flags: BackupFlags): InputStream {
@@ -68,7 +69,7 @@ object ProtoBackupExport : ProtoBackupBase() {
mangaRow[MangaTable.genre]?.split(", ") ?: emptyList(), mangaRow[MangaTable.genre]?.split(", ") ?: emptyList(),
MangaStatus.valueOf(mangaRow[MangaTable.status]).value, MangaStatus.valueOf(mangaRow[MangaTable.status]).value,
mangaRow[MangaTable.thumbnail_url], mangaRow[MangaTable.thumbnail_url],
mangaRow[MangaTable.inLibraryAt], TimeUnit.SECONDS.toMillis(mangaRow[MangaTable.inLibraryAt]),
0, // not supported in Tachidesk 0, // not supported in Tachidesk
) )
@@ -84,7 +85,7 @@ object ProtoBackupExport : ProtoBackupBase() {
it.read, it.read,
it.bookmarked, it.bookmarked,
it.lastPageRead, it.lastPageRead,
it.fetchedAt, TimeUnit.SECONDS.toMillis(it.fetchedAt),
it.uploadDate, it.uploadDate,
it.chapterNumber, it.chapterNumber,
chapters.size - it.index, chapters.size - it.index,

7
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt
View File

@@ -34,6 +34,7 @@ import suwayomi.tachidesk.manga.model.table.MangaTable
import java.io.InputStream import java.io.InputStream
import java.lang.Integer.max import java.lang.Integer.max
import java.util.Date import java.util.Date
import java.util.concurrent.TimeUnit
object ProtoBackupImport : ProtoBackupBase() { object ProtoBackupImport : ProtoBackupBase() {
private val logger = KotlinLogging.logger {} private val logger = KotlinLogging.logger {}
@@ -149,7 +150,7 @@ object ProtoBackupImport : ProtoBackupBase() {
it[inLibrary] = manga.favorite it[inLibrary] = manga.favorite
it[inLibraryAt] = manga.date_added it[inLibraryAt] = TimeUnit.MILLISECONDS.toSeconds(manga.date_added)
}.value }.value
// insert chapter data // insert chapter data
@@ -169,7 +170,7 @@ object ProtoBackupImport : ProtoBackupBase() {
it[lastPageRead] = chapter.last_page_read it[lastPageRead] = chapter.last_page_read
it[isBookmarked] = chapter.bookmark it[isBookmarked] = chapter.bookmark
it[fetchedAt] = chapter.date_fetch it[fetchedAt] = TimeUnit.MILLISECONDS.toSeconds(chapter.date_fetch)
} }
} }
@@ -194,6 +195,8 @@ object ProtoBackupImport : ProtoBackupBase() {
it[initialized] = dbManga[initialized] || manga.description != null it[initialized] = dbManga[initialized] || manga.description != null
it[inLibrary] = manga.favorite || dbManga[inLibrary] it[inLibrary] = manga.favorite || dbManga[inLibrary]
it[inLibraryAt] = TimeUnit.MILLISECONDS.toSeconds(manga.date_added)
} }
// merge chapter data // merge chapter data