From f861b3621f8c5908b4ad29047ea3fac652dda3b9 Mon Sep 17 00:00:00 2001 From: rebelonion <87634197+rebelonion@users.noreply.github.com> Date: Tue, 16 Jan 2024 15:00:21 -0600 Subject: [PATCH] universal storage name --- .../ani/dantotsu/media/anime/SelectorDialogFragment.kt | 2 +- .../java/ani/dantotsu/media/manga/MangaReadFragment.kt | 6 +++--- .../media/manga/mangareader/MangaReaderActivity.kt | 4 ++-- .../java/ani/dantotsu/media/novel/NovelReadFragment.kt | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt b/app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt index 896c523e..4c22fd47 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt @@ -279,7 +279,7 @@ class SelectorDialogFragment : BottomSheetDialogFragment() { if (video != null) { Helper.startAnimeDownloadService( requireActivity(), - media!!.nameMAL ?: media!!.nameRomaji, + media!!.mainName(), episode.number, video, null, diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt index 047e1387..3153bb6a 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt @@ -447,7 +447,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener { // Create a download task val downloadTask = MangaDownloaderService.DownloadTask( - title = media.nameMAL ?: media.nameRomaji, + title = media.mainName(), chapter = chapter.title!!, imageData = images, sourceMedia = media, @@ -489,7 +489,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener { fun onMangaChapterRemoveDownloadClick(i: String) { downloadManager.removeDownload( DownloadedType( - media.nameMAL ?: media.nameRomaji, + media.mainName(), i, DownloadedType.Type.MANGA ) @@ -507,7 +507,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener { // Remove the download from the manager and update the UI downloadManager.removeDownload( DownloadedType( - media.nameMAL ?: media.nameRomaji, + media.mainName(), i, DownloadedType.Type.MANGA ) diff --git a/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt b/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt index 0ac53e1e..fe1c597b 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt @@ -361,7 +361,7 @@ class MangaReaderActivity : AppCompatActivity() { model.loadMangaChapterImages( chapter, media.selected!!, - media.nameMAL ?: media.nameRomaji + media.mainName() ) } } @@ -841,7 +841,7 @@ class MangaReaderActivity : AppCompatActivity() { model.loadMangaChapterImages( chapters[chaptersArr.getOrNull(currentChapterIndex + 1) ?: return@launch]!!, media.selected!!, - media.nameMAL ?: media.nameRomaji, + media.mainName(), false ) loading = false diff --git a/app/src/main/java/ani/dantotsu/media/novel/NovelReadFragment.kt b/app/src/main/java/ani/dantotsu/media/novel/NovelReadFragment.kt index fe6ba960..0c654c16 100644 --- a/app/src/main/java/ani/dantotsu/media/novel/NovelReadFragment.kt +++ b/app/src/main/java/ani/dantotsu/media/novel/NovelReadFragment.kt @@ -67,7 +67,7 @@ class NovelReadFragment : Fragment(), override fun downloadTrigger(novelDownloadPackage: NovelDownloadPackage) { Log.e("downloadTrigger", novelDownloadPackage.link) val downloadTask = NovelDownloaderService.DownloadTask( - title = media.nameMAL ?: media.nameRomaji, + title = media.mainName(), chapter = novelDownloadPackage.novelName, downloadLink = novelDownloadPackage.link, originalLink = novelDownloadPackage.originalLink, @@ -93,7 +93,7 @@ class NovelReadFragment : Fragment(), val downloadsManager = Injekt.get() if (downloadsManager.queryDownload( DownloadedType( - media.nameMAL ?: media.nameRomaji, + media.mainName(), novel.name, DownloadedType.Type.NOVEL ) @@ -101,7 +101,7 @@ class NovelReadFragment : Fragment(), ) { val file = File( context?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), - "${DownloadsManager.novelLocation}/${media.nameMAL ?: media.nameRomaji}/${novel.name}/0.epub" + "${DownloadsManager.novelLocation}/${media.mainName()}/${novel.name}/0.epub" ) if (!file.exists()) return false val fileUri = FileProvider.getUriForFile( @@ -125,7 +125,7 @@ class NovelReadFragment : Fragment(), val downloadsManager = Injekt.get() return downloadsManager.queryDownload( DownloadedType( - media.nameMAL ?: media.nameRomaji, + media.mainName(), novel.name, DownloadedType.Type.NOVEL ) @@ -136,7 +136,7 @@ class NovelReadFragment : Fragment(), val downloadsManager = Injekt.get() downloadsManager.removeDownload( DownloadedType( - media.nameMAL ?: media.nameRomaji, + media.mainName(), novel.name, DownloadedType.Type.NOVEL )