diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt index 996b83fc..05991082 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt @@ -32,6 +32,7 @@ import suwayomi.tachidesk.manga.model.table.SourceTable import suwayomi.tachidesk.manga.model.table.toDataClass import java.io.ByteArrayOutputStream import java.io.InputStream +import java.util.concurrent.TimeUnit object ProtoBackupExport : ProtoBackupBase() { suspend fun createBackup(flags: BackupFlags): InputStream { @@ -68,7 +69,7 @@ object ProtoBackupExport : ProtoBackupBase() { mangaRow[MangaTable.genre]?.split(", ") ?: emptyList(), MangaStatus.valueOf(mangaRow[MangaTable.status]).value, mangaRow[MangaTable.thumbnail_url], - mangaRow[MangaTable.inLibraryAt], + TimeUnit.SECONDS.toMillis(mangaRow[MangaTable.inLibraryAt]), 0, // not supported in Tachidesk ) @@ -84,7 +85,7 @@ object ProtoBackupExport : ProtoBackupBase() { it.read, it.bookmarked, it.lastPageRead, - it.fetchedAt, + TimeUnit.SECONDS.toMillis(it.fetchedAt), it.uploadDate, it.chapterNumber, chapters.size - it.index, diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt index 965a54e5..125ac59c 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt @@ -34,6 +34,7 @@ import suwayomi.tachidesk.manga.model.table.MangaTable import java.io.InputStream import java.lang.Integer.max import java.util.Date +import java.util.concurrent.TimeUnit object ProtoBackupImport : ProtoBackupBase() { private val logger = KotlinLogging.logger {} @@ -149,7 +150,7 @@ object ProtoBackupImport : ProtoBackupBase() { it[inLibrary] = manga.favorite - it[inLibraryAt] = manga.date_added + it[inLibraryAt] = TimeUnit.MILLISECONDS.toSeconds(manga.date_added) }.value // insert chapter data @@ -169,7 +170,7 @@ object ProtoBackupImport : ProtoBackupBase() { it[lastPageRead] = chapter.last_page_read 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[inLibrary] = manga.favorite || dbManga[inLibrary] + + it[inLibraryAt] = TimeUnit.MILLISECONDS.toSeconds(manga.date_added) } // merge chapter data