Download format preference

2024-02-28 14:28:59 +02:00
parent f6de1b02d7
commit dba36838d4
44 changed files with 131 additions and 82 deletions
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -277,6 +277,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isDownloadsWiFiOnly: Boolean
 		get() = prefs.getBoolean(KEY_DOWNLOADS_WIFI, false)

+	val preferredDownloadFormat: DownloadFormat
+		get() = prefs.getEnumValue(KEY_DOWNLOADS_FORMAT, DownloadFormat.AUTOMATIC)
+
 	var isSuggestionsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_SUGGESTIONS, false)
 		set(value) = prefs.edit { putBoolean(KEY_SUGGESTIONS, value) }
@@ -552,6 +555,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_MAL = "mal"
 		const val KEY_KITSU = "kitsu"
 		const val KEY_DOWNLOADS_WIFI = "downloads_wifi"
+		const val KEY_DOWNLOADS_FORMAT = "downloads_format"
 		const val KEY_ALL_FAVOURITES_VISIBLE = "all_favourites_visible"
 		const val KEY_DOH = "doh"
 		const val KEY_EXIT_CONFIRM = "exit_confirm"
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/DownloadFormat.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/DownloadFormat.kt
@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.core.prefs
+
+enum class DownloadFormat {
+
+	AUTOMATIC,
+	SINGLE_CBZ,
+	MULTIPLE_CBZ,
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt
@@ -91,6 +91,7 @@ class DownloadWorker @AssistedInject constructor(
 	private val localMangaRepository: LocalMangaRepository,
 	private val mangaDataRepository: MangaDataRepository,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val settings: AppSettings,
 	@LocalStorageChanges private val localStorageChanges: MutableSharedFlow<LocalManga?>,
 	notificationFactoryFactory: DownloadNotificationFactory.Factory,
 ) : CoroutineWorker(appContext, params) {
@@ -182,7 +183,7 @@ class DownloadWorker @AssistedInject constructor(
 				}
 				val repo = mangaRepositoryFactory.create(manga.source)
 				val mangaDetails = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
-				output = LocalMangaOutput.getOrCreate(destination, mangaDetails)
+				output = LocalMangaOutput.getOrCreate(destination, mangaDetails, settings.preferredDownloadFormat)
 				val coverUrl = mangaDetails.largeCoverUrl.ifNullOrEmpty { mangaDetails.coverUrl }
 				if (coverUrl.isNotEmpty()) {
 					downloadFile(coverUrl, destination, repo.source).let { file ->
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt
@@ -4,7 +4,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import okhttp3.internal.format
 import okio.Closeable
+import org.koitharu.kotatsu.core.prefs.DownloadFormat
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.local.data.input.LocalMangaInput
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -35,22 +37,32 @@ sealed class LocalMangaOutput(
 		const val SUFFIX_TMP = ".tmp"
 		private val mutex = Mutex()

-		suspend fun getOrCreate(root: File, manga: Manga): LocalMangaOutput = withContext(Dispatchers.IO) {
-			val preferSingleCbz = manga.chapters.let {
-				it != null && it.size <= 3
+		suspend fun getOrCreate(
+			root: File,
+			manga: Manga,
+			format: DownloadFormat,
+		): LocalMangaOutput = withContext(Dispatchers.IO) {
+			val targetFormat = if (format == DownloadFormat.AUTOMATIC) {
+				if (manga.chapters.let { it != null && it.size <= 3 }) {
+					DownloadFormat.SINGLE_CBZ
+				} else {
+					DownloadFormat.MULTIPLE_CBZ
+				}
+			} else {
+				format
 			}
-			checkNotNull(getImpl(root, manga, onlyIfExists = false, preferSingleCbz))
+			checkNotNull(getImpl(root, manga, onlyIfExists = false, format = targetFormat))
 		}

 		suspend fun get(root: File, manga: Manga): LocalMangaOutput? = withContext(Dispatchers.IO) {
-			getImpl(root, manga, onlyIfExists = true, preferSingleCbz = false)
+			getImpl(root, manga, onlyIfExists = true, format = DownloadFormat.AUTOMATIC)
 		}

 		private suspend fun getImpl(
 			root: File,
 			manga: Manga,
 			onlyIfExists: Boolean,
-			preferSingleCbz: Boolean,
+			format: DownloadFormat,
 		): LocalMangaOutput? {
 			mutex.withLock {
 				var i = 0
@@ -75,10 +87,10 @@ sealed class LocalMangaOutput(
 							continue
 						}

-						!onlyIfExists -> if (preferSingleCbz) {
-							LocalMangaZipOutput(zip, manga)
-						} else {
-							LocalMangaDirOutput(dir, manga)
+						!onlyIfExists -> when (format) {
+							DownloadFormat.AUTOMATIC -> null
+							DownloadFormat.SINGLE_CBZ -> LocalMangaZipOutput(zip, manga)
+							DownloadFormat.MULTIPLE_CBZ -> LocalMangaDirOutput(dir, manga)
 						}

 						else -> null
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt
@@ -54,7 +54,7 @@ class AppearanceSettingsFragment :
 			}
 			summaryProvider = Preference.SummaryProvider<ActivityListPreference> {
 				val locale = AppCompatDelegate.getApplicationLocales().get(0)
-				locale?.getDisplayName(locale)?.toTitleCase(locale) ?: getString(R.string.automatic)
+				locale?.getDisplayName(locale)?.toTitleCase(locale) ?: getString(R.string.follow_system)
 			}
 			setDefaultValueCompat("")
 		}
@@ -105,7 +105,7 @@ class AppearanceSettingsFragment :
 			.sortedWithSafe(LocaleComparator())
 		preference.entries = Array(locales.size + 1) { i ->
 			if (i == 0) {
-				getString(R.string.automatic)
+				getString(R.string.follow_system)
 			} else {
 				val lc = locales[i - 1]
 				lc.getDisplayName(lc).toTitleCase(lc)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.documentfile.provider.DocumentFile
+import androidx.preference.ListPreference
 import androidx.preference.Preference
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
@@ -15,13 +16,17 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.DownloadFormat
+import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.resolveFile
+import org.koitharu.kotatsu.core.util.ext.setDefaultValueCompat
 import org.koitharu.kotatsu.core.util.ext.tryLaunch
 import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 import org.koitharu.kotatsu.local.data.LocalStorageManager
+import org.koitharu.kotatsu.parsers.util.names
 import org.koitharu.kotatsu.settings.storage.MangaDirectorySelectDialog
 import org.koitharu.kotatsu.settings.storage.directories.MangaDirectoriesActivity
 import org.koitharu.kotatsu.settings.utils.DozeHelper
@@ -46,6 +51,10 @@ class DownloadsSettingsFragment :

 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.pref_downloads)
+		findPreference<ListPreference>(AppSettings.KEY_DOWNLOADS_FORMAT)?.run {
+			entryValues = DownloadFormat.entries.names()
+			setDefaultValueCompat(DownloadFormat.AUTOMATIC.name)
+		}
 		dozeHelper.updatePreference()
 	}

--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -37,7 +37,7 @@
    <string name="manga_downloading_">جاري التنزيل…</string>
    <string name="create_shortcut">انشاء اختصار…</string>
    <string name="theme">مظهر</string>
-    <string name="automatic">حسب النظام</string>
+    <string name="follow_system">حسب النظام</string>
    <string name="share_s">شارك %s</string>
    <string name="processing_">في طور معالجة…</string>
    <string name="updated">محدث</string>
@@ -338,4 +338,4 @@
    <string name="folder_with_images_import_description">يمكنك اختيار مكان في الذاكرة يحتوي على أرشيفات أو صور. سيتم التعرف على كل أرشيف (أو مجلد فرعي) على أنه فصل.</string>
    <string name="speed">السرعة</string>
    <string name="restore_backup_description">استيراد نسخة احتياطية تم إنشاؤها لبيانات المستخدم.</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -45,7 +45,7 @@
    <string name="theme">Тэма</string>
    <string name="light">Светлая</string>
    <string name="dark">Цёмная</string>
-    <string name="automatic">Як у сістэме</string>
+    <string name="follow_system">Як у сістэме</string>
    <string name="pages">Старонкi</string>
    <string name="clear">Ачысціць</string>
    <string name="text_clear_history_prompt">Вы ўпэўненыя, што жадаеце ачысціць гісторыю\?</string>
@@ -593,4 +593,4 @@
    <string name="default_page_save_dir">Каталог захавання старонкі па змаўчанні</string>
    <string name="remove_from_history">Выдаліць з гісторыі</string>
    <string name="pages_saving">Захаванне старонак</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -64,7 +64,7 @@
    <string name="theme">থিম</string>
    <string name="light">আলো</string>
    <string name="dark">আঁধার</string>
-    <string name="automatic">সিস্টেম অনুযায়ী</string>
+    <string name="follow_system">সিস্টেম অনুযায়ী</string>
    <string name="pages">পৃষ্ঠাগুলি</string>
    <string name="webtoon">ওয়েবটুন</string>
    <string name="read_mode">পড়ার মোড</string>
@@ -159,4 +159,4 @@
    <string name="suggestion_manga">পরামর্শ: %s</string>
    <string name="text_empty_holder_primary">এখানে খালি…</string>
    <string name="done">সম্পন্ন</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -33,7 +33,7 @@
    <string name="theme">Téma</string>
    <string name="light">Světlé</string>
    <string name="dark">Tmavé</string>
-    <string name="automatic">Následovat systém</string>
+    <string name="follow_system">Následovat systém</string>
    <string name="remove">Odstranit</string>
    <string name="_s_deleted_from_local_storage">\"%s\" smazáno z místního uložiště</string>
    <string name="share_image">Sdílet obrázek</string>
@@ -444,4 +444,4 @@
    <string name="clear_source_cookies_summary">Vyčistit cookies pouze pro specifikované domény. Ve většině případech bude neplatná autorizace</string>
    <string name="download_option_manual_selection">Vyberte kapitoly manuálně</string>
    <string name="description">Popis</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -4,7 +4,7 @@
    <string name="text_clear_history_prompt">Gesamten Leseverlauf unwiderruflich löschen\?</string>
    <string name="theme">Design</string>
    <string name="pages">Seiten</string>
-    <string name="automatic">Wie System</string>
+    <string name="follow_system">Wie System</string>
    <string name="dark">Dunkel</string>
    <string name="light">Hell</string>
    <string name="filter">Filter</string>
@@ -580,4 +580,4 @@
    <string name="two_pages">Zwei Seiten</string>
    <string name="next_chapter">Nächstes Kapitel</string>
    <string name="prev_page">Vorherige Seite</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -31,7 +31,7 @@
    <string name="by_rating">Βαθμολογία</string>
    <string name="filter">Φίλτρο</string>
    <string name="dark">Σκοτεινό</string>
-    <string name="automatic">Όπως στο σύστημα</string>
+    <string name="follow_system">Όπως στο σύστημα</string>
    <string name="clear">Εκκαθάριση</string>
    <string name="text_clear_history_prompt">Να διαγράψετε μόνιμα όλο το ιστορικό ανάγνωσης;</string>
    <string name="remove">Διαγραφή</string>
@@ -556,4 +556,4 @@
    <string name="appwidget_recent_description">Τα πρόσφατα διαβασμένα manga σου</string>
    <string name="clear_cookies_summary">Μπορεί να βοηθήσει σε περίπτωση κάποιων προβλημάτων. Όλες οι εξουσιοδοτήσεις θα ανακληθούν</string>
    <string name="category_hidden_done">Αυτή η κατηγορία αποκρύφτηκε από την αρχική οθόνη και είναι προσβάσιμη μέσω του Μενού → Διαχείριση κατηγοριών</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -45,7 +45,7 @@
    <string name="theme">Tema</string>
    <string name="light">Claro</string>
    <string name="dark">Oscuro</string>
-    <string name="automatic">De acuerdo al sistema</string>
+    <string name="follow_system">De acuerdo al sistema</string>
    <string name="pages">Páginas</string>
    <string name="clear">Limpiar</string>
    <string name="text_clear_history_prompt">Borrar todo el historial de lectura de forma permanente\?</string>
@@ -593,4 +593,4 @@
    <string name="remove_from_history">Eliminar del historial</string>
    <string name="pages_saving">Guardar páginas</string>
    <string name="default_page_save_dir">Directorio predeterminado para guardar páginas</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -168,7 +168,7 @@
    <string name="scale_mode">skaala mood</string>
    <string name="advanced">Täiustatud</string>
    <string name="only_using_wifi">Ainult Wi-Fi-l</string>
-    <string name="automatic">Jälgne süsteemile</string>
+    <string name="follow_system">Jälgne süsteemile</string>
    <string name="sync_settings">Sünkroniseeri seadeid</string>
    <string name="black_dark_theme">Must</string>
    <string name="text_history_holder_primary">Mis sa loed näidatakse siin</string>
@@ -439,4 +439,4 @@
    <string name="downloads_resumed">Allalaadimised on jätkanud</string>
    <string name="invert_colors">Värvide ümberpööramine</string>
    <string name="proxy">Puhverserver</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -14,7 +14,7 @@
    <string name="internal_storage">حافظه ی درونی</string>
    <string name="right_to_left">راست به چپ</string>
    <string name="reader_mode_hint">پیکربندی انتخاب شده برای این مانگا بخاطر خواهد ماند</string>
-    <string name="automatic">تم سیستم</string>
+    <string name="follow_system">تم سیستم</string>
    <string name="pages">صفحات</string>
    <string name="clear">پاکسازی</string>
    <string name="domain">دامنه</string>
@@ -255,4 +255,4 @@
    <string name="notifications_enable">فعال کردن اعلان ها</string>
    <string name="bookmark_remove">حذف نشانه</string>
    <string name="bookmarks">نشانه ها</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -137,7 +137,7 @@
 	<string name="text_clear_history_prompt">Haluatko todella tyhjentää koko lukuhistoriasi\?</string>
 	<string name="clear">Tyhjennä</string>
 	<string name="pages">Sivut</string>
-	<string name="automatic">Automaattinen</string>
+	<string name="follow_system">Automaattinen</string>
 	<string name="dark">Tumma</string>
 	<string name="light">Vaalea</string>
 	<string name="theme">Teema</string>
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -7,7 +7,7 @@
    <string name="filter">Pansala</string>
    <string name="theme">Tema</string>
    <string name="dark">Madilim</string>
-    <string name="automatic">Sundan ang sistema</string>
+    <string name="follow_system">Sundan ang sistema</string>
    <string name="error_occurred">May nangyaring error</string>
    <string name="network_error">Error sa network</string>
    <string name="details">Mga detalye</string>
@@ -593,4 +593,4 @@
    <string name="check_for_new_chapters_disabled">Naka-disable ang pagsuri para sa mga bagong kabanata</string>
    <string name="reading_time_estimation">Ipakita ang tinantyang oras ng pagbabasa</string>
    <string name="reading_time_estimation_summary">Maaaring hindi tumpak ang halaga ng pagtatantya ng oras</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -134,7 +134,7 @@
    <string name="text_clear_history_prompt">Effacer définitivement l\'historique de lecture \?</string>
    <string name="clear">Effacer</string>
    <string name="pages">Pages</string>
-    <string name="automatic">Suivre le système</string>
+    <string name="follow_system">Suivre le système</string>
    <string name="dark">Sombre</string>
    <string name="light">Clair</string>
    <string name="theme">Thème</string>
@@ -593,4 +593,4 @@
    <string name="show_labels_in_navbar">Afficher les étiquettes dans la barre de navigation</string>
    <string name="pages_saving">Sauvegarder les pages</string>
    <string name="default_webtoon_zoom_out">Zoom webtoon par défaut</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -61,7 +61,7 @@
    <string name="list">सूची</string>
    <string name="filter">फिल्टर</string>
    <string name="theme">थीम</string>
-    <string name="automatic">फोन जैसा</string>
+    <string name="follow_system">फोन जैसा</string>
    <string name="pages">पन्ने</string>
    <string name="no_description">कोई विवरण नहीं है</string>
    <string name="updates">अपडेट</string>
@@ -128,4 +128,4 @@
    <string name="done">होगाया</string>
    <string name="dont_check">जाँच मत करो</string>
    <string name="enter_password">पासवर्ड दर्ज करें</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -32,7 +32,7 @@
    <string name="by_rating">Értékelés</string>
    <string name="filter">Szűrő</string>
    <string name="light">Fényes</string>
-    <string name="automatic">Rendszer alapján</string>
+    <string name="follow_system">Rendszer alapján</string>
    <string name="clear">Törlés</string>
    <string name="text_clear_history_prompt">Véglegesen törli az összes olvasási előzményt?</string>
    <string name="remove">Eltávolítás</string>
@@ -60,4 +60,4 @@
    <string name="_s_deleted_from_local_storage">%s törölve lett a helyi tárhelyből</string>
    <string name="page_saved">Mentve</string>
    <string name="delete">Törlés</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -42,7 +42,7 @@
    <string name="theme">Tema</string>
    <string name="light">Terang</string>
    <string name="dark">Gelap</string>
-    <string name="automatic">Ikuti sistem</string>
+    <string name="follow_system">Ikuti sistem</string>
    <string name="pages">Halaman</string>
    <string name="clear">Bersihkan</string>
    <string name="remove">Hapus</string>
@@ -581,4 +581,4 @@
    <string name="config_reset_confirm">Kembalikan pengaturan ke bawaan? Tindakan ini tidak bisa dibatalkan.</string>
    <string name="use_two_pages_landscape">Gunakan tata letak dua halaman pada orientasi landscape (beta)</string>
    <string name="email_password_enter_hint">Masukkan email dan sandi untuk melanjutkan</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -9,7 +9,7 @@
    <string name="page_saved">Pagina salvata correttamente</string>
    <string name="save_page">Salva la pagina</string>
    <string name="pages">Pagine</string>
-    <string name="automatic">Automatico</string>
+    <string name="follow_system">Automatico</string>
    <string name="dark">Scuro</string>
    <string name="light">Chiaro</string>
    <string name="theme">Tema</string>
@@ -561,4 +561,4 @@
    <string name="category_hidden_done">Questa categoria è stata nascosta dalla schermata principale ed è accessibile tramite Menù → Gestisci categorie</string>
    <string name="approximate_remaining_time">Tempo rimanente approssimativo</string>
    <string name="remaining_time_pattern">%1$s %2$s</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -38,7 +38,7 @@
    <string name="newest">最新</string>
    <string name="by_rating">評価</string>
    <string name="sort_order">並べ替え</string>
-    <string name="automatic">システムに従う</string>
+    <string name="follow_system">システムに従う</string>
    <string name="clear">消去</string>
    <string name="text_clear_history_prompt">すべての履歴を永久に消去しますか？</string>
    <string name="remove">削除</string>
@@ -483,4 +483,4 @@
    <string name="reader_zoom_buttons_summary">右下にズームコントロールボタンを表示するかどうか</string>
    <string name="reader_zoom_buttons">ズームボタンを表示</string>
    <string name="zoom_out">ズームアウト</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -48,7 +48,7 @@
    <string name="theme">Кейіп</string>
    <string name="dark">Қараңғы</string>
    <string name="light">Ақшыл</string>
-    <string name="automatic">Жүйедегідей</string>
+    <string name="follow_system">Жүйедегідей</string>
    <string name="pages">Беттер</string>
    <string name="clear">Тазалау</string>
    <string name="remove">Жою</string>
@@ -520,4 +520,4 @@
    <string name="no_manga_sources_catalog_text">Әзірге мына жерде қолжетімді дереккөз жоқ. Жаңарту күтіңіз</string>
    <string name="available_d">Қолжетімді: %1$d</string>
    <string name="content_type_other">Басқа</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -62,7 +62,7 @@
    <string name="processing_">처리중…</string>
    <string name="updated">최근 업데이트 순</string>
    <string name="newest">최근 발간 순</string>
-    <string name="automatic">시스템 설정</string>
+    <string name="follow_system">시스템 설정</string>
    <string name="delete">지우기</string>
    <string name="text_file_sizes">바이트|kB|MB|GB|TB</string>
    <string name="clear_pages_cache">페이지 캐시 지우기</string>
@@ -352,4 +352,4 @@
    <string name="reset">초기화</string>
    <string name="text_unsaved_changes_prompt">저장되지 않은 변경 사항을 저장하거나 삭제하시겠습니까\?</string>
    <string name="manga_error_description_pattern">오류 세부정보:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. &lt;a href=%2$s&gt;웹 브라우저에서 만화를 열어&lt;/a&gt; 소스에서 사용할 수 있는지 확인하세요&lt;br&gt;2. &lt;a href=kotatsu://about&gt;최신 버전의 Kotatsu&lt;/a&gt;&lt;br&gt;를 사용하고 있는지 확인하세요.3. 사용 가능한 경우 개발자에게 오류 보고서를 보냅니다.</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -45,7 +45,7 @@
    <string name="filter">Tapis</string>
    <string name="light">Terang</string>
    <string name="dark">Gelap</string>
-    <string name="automatic">Ikut sistem</string>
+    <string name="follow_system">Ikut sistem</string>
    <string name="pages">Muka surat</string>
    <string name="clear">Kosongkan</string>
    <string name="text_clear_history_prompt">Kosongkan semua sejarah pembacaan selama-lamanya?</string>
@@ -314,4 +314,4 @@
    <string name="error_corrupted_file">Data tidak sah dikembalikan atau fail rosak</string>
    <string name="on_device">Pada peranti</string>
    <string name="directories">Panduan</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -137,7 +137,7 @@
 	<string name="remove">Fjern</string>
 	<string name="clear">Tøm</string>
 	<string name="pages">Sider</string>
-	<string name="automatic">Følg systemet</string>
+	<string name="follow_system">Følg systemet</string>
 	<string name="dark">Mørk</string>
 	<string name="light">Lys</string>
 	<string name="by_name">Navn</string>
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -34,7 +34,7 @@
    <string name="sort_order">क्रमबद्ध क्रम</string>
    <string name="theme">थीम</string>
    <string name="light">उज्यालो</string>
-    <string name="automatic">सिस्टम पालना गर्नुहोस्</string>
+    <string name="follow_system">सिस्टम पालना गर्नुहोस्</string>
    <string name="computing_">कम्प्युटिङ…</string>
    <string name="favourites">मनपर्ने</string>
    <string name="details">विवरण</string>
@@ -231,4 +231,4 @@
    <string name="manga_error_description_pattern">त्रुटि विवरण:&lt;br&gt; &lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt; 1. &lt;a href=%2$s&gt;वेब ब्राउजरमा मंगा खोल्ने&lt;/a&gt; प्रयास गर्नुहोस् कि यो यसको स्रोतमा उपलब्ध छ&lt;br&gt; 2. निश्चित गर्नुहोस् कि तपाइँ &lt;a href=kotatsu://about&gt;Kotatsu को नवीनतम संस्करण&lt;/a&gt; प्रयोग गर्दै हुनुहुन्छ&lt;br&gt; 3. यदि यो उपलब्ध छ भने, विकासकर्ताहरूलाई त्रुटि रिपोर्ट पठाउनुहोस्।</string>
    <string name="suggestions_excluded_genres">जानरा अलग गर्नु</string>
    <string name="suggestions_updating">सुझावहरू अपडेट गर्दै</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -100,7 +100,7 @@
    <string name="by_name">Namn</string>
    <string name="updated">Oppdatert</string>
    <string name="theme">Vising</string>
-    <string name="automatic">Lyd systemet</string>
+    <string name="follow_system">Lyd systemet</string>
    <string name="dark">Mørk</string>
    <string name="text_local_holder_primary">Hent noko først</string>
    <string name="not_available">Ikkje tilgjengeleg</string>
@@ -404,4 +404,4 @@
    <string name="downloads_paused">Stansa hentingane</string>
    <string name="sync_auth_hint">Du kan logge inn på ein konto du alt har, eller lage ein ny ein</string>
    <string name="invalid_value_message">Ugild verdi</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -174,7 +174,7 @@
    <string name="notifications_settings">Ustawienia powiadomień</string>
    <string name="remote_sources">Zewnętrzne źródła</string>
    <string name="theme">Motyw</string>
-    <string name="automatic">Systemowy</string>
+    <string name="follow_system">Systemowy</string>
    <string name="clear_pages_cache">Wyczyść pamięć podręczną stron</string>
    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
    <string name="grid_size">Wielkość siatki</string>
@@ -486,4 +486,4 @@
    <string name="reader_zoom_buttons_summary">Określa, czy wyświetlać elementy sterujące powiększeniem w prawym dolnym rogu</string>
    <string name="keep_screen_on">Pozostaw ekran włączony</string>
    <string name="keep_screen_on_summary">Nie wyłączaj ekranu podczas czytania mangi</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -188,7 +188,7 @@
    <string name="various_languages">Vários idiomas</string>
    <string name="text_clear_history_prompt">Limpar todo o histórico de leitura permanentemente\?</string>
    <string name="operation_not_supported">Esta operação não é suportada</string>
-    <string name="automatic">Automático (segue o sistema)</string>
+    <string name="follow_system">Automático (segue o sistema)</string>
    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d de %2$d em</string>
    <string name="webtoon">Webtoon</string>
    <string name="switch_pages">Alternar páginas</string>
@@ -584,4 +584,4 @@
    <string name="default_webtoon_zoom_out">Diminuir zoom padrão do webtoon</string>
    <string name="fullscreen_mode">Modo de tela cheia</string>
    <string name="reader_fullscreen_summary">Ocultar a barra de status e navegação</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -34,7 +34,7 @@
    <string name="sort_order">Ordem de classificação</string>
    <string name="filter">Filtro</string>
    <string name="dark">Escuro</string>
-    <string name="automatic">Siga o sistema</string>
+    <string name="follow_system">Siga o sistema</string>
    <string name="pages">Páginas</string>
    <string name="clear">Limpar</string>
    <string name="text_clear_history_prompt">Limpar todo o histórico de leitura permanentemente\?</string>
@@ -588,4 +588,4 @@
    <string name="check_for_new_chapters_disabled">A verificação de novos capítulos está desativada</string>
    <string name="reading_time_estimation">Mostrar tempo estimado de leitura</string>
    <string name="reading_time_estimation_summary">O valor do tempo estimado pode ser impreciso</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -45,7 +45,7 @@
    <string name="theme">Тема</string>
    <string name="light">Светлая</string>
    <string name="dark">Тёмная</string>
-    <string name="automatic">Как в системе</string>
+    <string name="follow_system">Как в системе</string>
    <string name="pages">Страницы</string>
    <string name="clear">Очистить</string>
    <string name="text_clear_history_prompt">Очистить всю историю чтения полностью\?</string>
@@ -593,4 +593,4 @@
    <string name="remove_from_history">Убрать из истории</string>
    <string name="show_labels_in_navbar">Показывать подписи на панели навигации</string>
    <string name="default_page_save_dir">Папка для сохранений по умолчанию</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -85,7 +85,7 @@
    <string name="newest">Најновије</string>
    <string name="light">Светла</string>
    <string name="dark">Мрачна</string>
-    <string name="automatic">Прати систем</string>
+    <string name="follow_system">Прати систем</string>
    <string name="filter">Филтер</string>
    <string name="theme">Тема</string>
    <string name="pages">Странице</string>
@@ -588,4 +588,4 @@
    <string name="reading_time_estimation_summary">Вредност процене времена може бити нетачна</string>
    <string name="check_for_new_chapters_disabled">Провера нових поглавља је искључена</string>
    <string name="fullscreen_mode">Режим целог екрана</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -39,7 +39,7 @@
 	<string name="manga_downloading_">Laddar ned…</string>
 	<string name="processing_">Behandlar…</string>
 	<string name="theme">Tema</string>
-	<string name="automatic">Systemtema</string>
+	<string name="follow_system">Systemtema</string>
 	<string name="remove">Ta bort</string>
 	<string name="text_file_sizes">B|kB|MB|GB|TB</string>
 	<string name="add_new_category">Ny kategori</string>
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
    <string name="light">สว่าง</string>
-    <string name="automatic">ตั้งค่าตามเครื่อง</string>
+    <string name="follow_system">ตั้งค่าตามเครื่อง</string>
    <string name="text_clear_history_prompt">จะเคลียร์ประวัติการอ่านทั้งหมดแบบถาวรใช่ไหม\?</string>
    <string name="remove">ลบ</string>
    <string name="_s_deleted_from_local_storage">\"%s\" ได้ถูกลบจากที่จัดเก็บในเครื่องแล้ว</string>
@@ -402,4 +402,4 @@
    <string name="resume">ดำเนินการต่อ</string>
    <string name="paused">หยุดชั่วคราว</string>
    <string name="pause">หยุด</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -37,7 +37,7 @@
    <string name="theme">Tema</string>
    <string name="light">Açık</string>
    <string name="dark">Koyu</string>
-    <string name="automatic">Sistemle uyumlu</string>
+    <string name="follow_system">Sistemle uyumlu</string>
    <string name="pages">Sayfalar</string>
    <string name="clear">Temizle</string>
    <string name="text_clear_history_prompt">Tüm okuma geçmişi kalıcı olarak silinsin mi\?</string>
@@ -593,4 +593,4 @@
    <string name="ask_for_dest_dir_every_time">Her seferinde hedef dizini sor</string>
    <string name="default_page_save_dir">Öntanımlı sayfa kaydetme dizini</string>
    <string name="remove_from_history">Geçmişten kaldır</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -191,7 +191,7 @@
    <string name="manga_downloading_">Завантаження…</string>
    <string name="clear">Очистити</string>
    <string name="downloads">Завантаження</string>
-    <string name="automatic">Як в системі</string>
+    <string name="follow_system">Як в системі</string>
    <string name="chapter_is_missing">Розділ відсутній</string>
    <string name="genres">Жанри</string>
    <string name="system_default">За умовчанням</string>
@@ -593,4 +593,4 @@
    <string name="remove_from_history">Видалити з історії</string>
    <string name="show_labels_in_navbar">Показувати мітки на панелі навігації</string>
    <string name="default_page_save_dir">Директорія збереження сторінки за замовчуванням</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -201,7 +201,7 @@
    <string name="sort_order">Sắp xếp theo</string>
    <string name="dark">Tối</string>
    <string name="light">Sáng</string>
-    <string name="automatic">Theo hệ thống</string>
+    <string name="follow_system">Theo hệ thống</string>
    <string name="_s_deleted_from_local_storage">\"%s\" đã bị xoá khỏi bộ nhớ cục bộ</string>
    <string name="share_image">Chia sẻ hình ảnh</string>
    <string name="page_saved">Đã lưu</string>
@@ -448,4 +448,4 @@
    <string name="color_white">Trắng</string>
    <string name="status_planned">Đã lên kế hoạch</string>
    <string name="color_black">Đen</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -74,7 +74,7 @@
    <string name="theme">主题</string>
    <string name="dark">深色</string>
    <string name="light">浅色</string>
-    <string name="automatic">跟随系统</string>
+    <string name="follow_system">跟随系统</string>
    <string name="pages">页面</string>
    <string name="clear">清除</string>
    <string name="text_clear_history_prompt">确定永久清除所有阅读历史吗?</string>
@@ -593,4 +593,4 @@
    <string name="pages_saving">图片保存</string>
    <string name="default_page_save_dir">图片默认保存目录</string>
    <string name="remove_from_history">删除阅读历史</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -236,7 +236,7 @@
    <string name="by_rating">評分</string>
    <string name="sort_order">排列順序</string>
    <string name="dark">深色</string>
-    <string name="automatic">跟隨系統</string>
+    <string name="follow_system">跟隨系統</string>
    <string name="pages">頁數</string>
    <string name="_import">匯入</string>
    <string name="no_description">沒有描述</string>
@@ -564,4 +564,4 @@
    <string name="enhanced_colors_summary">減少色帶，但可能會影響效能</string>
    <string name="approximate_remaining_time">大約剩餘時間</string>
    <string name="remaining_time_pattern">%1$s %2$s</string>
-</resources>
+</resources>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string-array name="themes" translatable="false">
-		<item>@string/automatic</item>
+		<item>@string/follow_system</item>
 		<item>@string/light</item>
 		<item>@string/dark</item>
 	</string-array>
@@ -82,4 +82,9 @@
 		<item>@string/chapters</item>
 		<item>@string/pages</item>
 	</string-array>
+	<string-array name="download_formats" translatable="false">
+		<item>@string/automatic</item>
+		<item>@string/single_cbz_file</item>
+		<item>@string/multiple_cbz_files</item>
+	</string-array>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,7 +48,7 @@
    <string name="light">Light</string>
    <string name="dark">Dark</string>
    <!-- Should be as abstract as possible -->
-	<string name="automatic">Follow system</string>
+	<string name="follow_system">Follow system</string>
    <string name="pages">Pages</string>
    <string name="clear">Clear</string>
    <string name="text_clear_history_prompt">Clear all reading history permanently?</string>
@@ -599,4 +599,8 @@
    <string name="default_page_save_dir">Default page save directory</string>
    <string name="remove_from_history">Remove from history</string>
 	<string name="location">Location</string>
+	<string name="preferred_download_format">Preferred download format</string>
+	<string name="automatic">Automatic</string>
+	<string name="single_cbz_file">Single CBZ file</string>
+	<string name="multiple_cbz_files">Multiple CBZ files</string>
 </resources>
--- a/app/src/main/res/xml/pref_downloads.xml
+++ b/app/src/main/res/xml/pref_downloads.xml
@@ -13,6 +13,12 @@
 		android:persistent="false"
 		android:title="@string/manga_save_location" />

+	<ListPreference
+		android:entries="@array/download_formats"
+		android:key="downloads_format"
+		android:title="@string/preferred_download_format"
+		app:useSimpleSummaryProvider="true" />
+
 	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:key="downloads_wifi"