Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make backing up read manga optional

Browse Source
This commit is contained in:
Jobobby04 2021-05-14 13:47:36 -04:00
parent ab0f5d107f
commit 65f66630cf
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt
View File

@ -34,7 +34,9 @@ class BackupCreateService : Service() {
// SY --> // SY -->
internal const val BACKUP_CUSTOM_INFO = 0x10 internal const val BACKUP_CUSTOM_INFO = 0x10
internal const val BACKUP_CUSTOM_INFO_MASK = 0x10 internal const val BACKUP_CUSTOM_INFO_MASK = 0x10
internal const val BACKUP_ALL = 0x1F internal const val BACKUP_READ_MANGA = 0x20
internal const val BACKUP_READ_MANGA_MASK = 0x20
internal const val BACKUP_ALL = 0x3F
// SY <-- // SY <--
/** /**

8
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
View File

@ -12,6 +12,8 @@ import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CUST
import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CUSTOM_INFO_MASK import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CUSTOM_INFO_MASK
import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY
import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_MASK import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_MASK
import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_READ_MANGA
import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_READ_MANGA_MASK
import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK
import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK_MASK import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK_MASK
import eu.kanade.tachiyomi.data.backup.full.models.Backup import eu.kanade.tachiyomi.data.backup.full.models.Backup
@ -64,7 +66,11 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
var backup: Backup? = null var backup: Backup? = null
databaseHelper.inTransaction { databaseHelper.inTransaction {
val databaseManga = getFavoriteManga() /* SY --> */ + getReadManga() + getMergedManga().filterNot { it.source == MERGED_SOURCE_ID } /* SY <-- */ val databaseManga = getFavoriteManga() /* SY --> */ + if (flags and BACKUP_READ_MANGA_MASK == BACKUP_READ_MANGA) {
getReadManga()
} else {
emptyList()
} + getMergedManga() /* SY <-- */
backup = Backup( backup = Backup(
backupManga(databaseManga, flags), backupManga(databaseManga, flags),

2
app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
View File

@ -115,7 +115,7 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
// SY <-- // SY <--
databaseHelper.inTransaction { databaseHelper.inTransaction {
val mangas = getFavoriteManga()/* SY --> */.filterNot { it.source == MERGED_SOURCE_ID } + getMergedManga().filterNot { it.source == MERGED_SOURCE_ID } /* SY <-- */ val mangas = getFavoriteManga()/* SY --> */.filterNot { it.source == MERGED_SOURCE_ID } + getMergedManga() /* SY <-- */
val extensions: MutableSet<String> = mutableSetOf() val extensions: MutableSet<String> = mutableSetOf()

6
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
View File

@ -278,7 +278,8 @@ class SettingsBackupController : SettingsController() {
R.string.track, R.string.track,
R.string.history, R.string.history,
// SY --> // SY -->
R.string.custom_manga_info R.string.custom_manga_info,
R.string.all_read_manga
// SY <-- // SY <--
) )
.map { activity.getString(it) } .map { activity.getString(it) }
@ -289,7 +290,7 @@ class SettingsBackupController : SettingsController() {
.listItemsMultiChoice( .listItemsMultiChoice(
items = options, items = options,
disabledIndices = intArrayOf(0), disabledIndices = intArrayOf(0),
initialSelection = intArrayOf(0, 1, 2, 3, 4 /* SY --> */, 5 /* SY <-- */) initialSelection = intArrayOf(0, 1, 2, 3, 4 /* SY --> */, 5, 6 /* SY <-- */)
) { _, positions, _ -> ) { _, positions, _ ->
var flags = 0 var flags = 0
for (i in 1 until positions.size) { for (i in 1 until positions.size) {
@ -300,6 +301,7 @@ class SettingsBackupController : SettingsController() {
4 -> flags = flags or BackupCreateService.BACKUP_HISTORY 4 -> flags = flags or BackupCreateService.BACKUP_HISTORY
// SY --> // SY -->
5 -> flags = flags or BackupCreateService.BACKUP_CUSTOM_INFO 5 -> flags = flags or BackupCreateService.BACKUP_CUSTOM_INFO
6 -> flags = flags or BackupCreateService.BACKUP_READ_MANGA
// SY <-- // SY <--
} }
} }

1
app/src/main/res/values/strings_sy.xml
View File

@ -202,6 +202,7 @@
<!-- Backup settings --> <!-- Backup settings -->
<string name="custom_manga_info">Custom manga info</string> <string name="custom_manga_info">Custom manga info</string>
<string name="all_read_manga">All read manga</string>
<!-- Download settings --> <!-- Download settings -->
<string name="save_chapter_as_cbz">Save Chapters as CBZ</string> <string name="save_chapter_as_cbz">Save Chapters as CBZ</string>