chore: merge name adapters

2026-01-21 16:33:56 +00:00 · 2024-03-27 09:08:13 -04:00
parent 1ad6e7685d
commit fa182a24dc
17 changed files with 196 additions and 201 deletions
--- a/app/src/main/java/ani/dantotsu/media/MediaNameAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaNameAdapter.kt
@@ -0,0 +1,146 @@
+package ani.dantotsu.media
+
+import java.util.Locale
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
+object MediaNameAdapter {
+
+    private const val REGEX_ITEM = "[\\s:.\\-]*(\\d+\\.?\\d*)[\\s:.\\-]*"
+    private const val REGEX_PART_NUMBER = "(?<!part\\s)\\b(\\d+)\\b"
+    private const val REGEX_EPISODE =
+        "(episode|episodio|ep|e)${REGEX_ITEM}\\(?\\s*(sub|subbed|dub|dubbed)*\\s*\\)?\\s*"
+    private const val REGEX_SEASON = "(season|s)[\\s:.\\-]*(\\d+)[\\s:.\\-]*"
+    private const val REGEX_SUBDUB = "^(soft)?[\\s-]*(sub|dub|mixed)(bed|s)?\\s*$"
+    private const val REGEX_CHAPTER = "(chapter|chap|ch|c)${REGEX_ITEM}"
+
+    fun setSubDub(text: String, typeToSetTo: SubDubType): String? {
+        val subdubPattern: Pattern = Pattern.compile(REGEX_SUBDUB, Pattern.CASE_INSENSITIVE)
+        val subdubMatcher: Matcher = subdubPattern.matcher(text)
+
+        return if (subdubMatcher.find()) {
+            val soft = subdubMatcher.group(1)
+            val subdub = subdubMatcher.group(2)
+            val bed = subdubMatcher.group(3) ?: ""
+
+            val toggled = when (typeToSetTo) {
+                SubDubType.SUB -> "sub"
+                SubDubType.DUB -> "dub"
+                SubDubType.NULL -> ""
+            }
+            val toggledCasePreserved =
+                if (subdub?.get(0)?.isUpperCase() == true || soft?.get(0)
+                        ?.isUpperCase() == true
+                ) toggled.replaceFirstChar {
+                    if (it.isLowerCase()) it.titlecase(
+                        Locale.ROOT
+                    ) else it.toString()
+                } else toggled
+
+            subdubMatcher.replaceFirst(toggledCasePreserved + bed)
+        } else {
+            null
+        }
+    }
+
+    fun getSubDub(text: String): SubDubType {
+        val subdubPattern: Pattern = Pattern.compile(REGEX_SUBDUB, Pattern.CASE_INSENSITIVE)
+        val subdubMatcher: Matcher = subdubPattern.matcher(text)
+
+        return if (subdubMatcher.find()) {
+            val subdub = subdubMatcher.group(2)?.lowercase(Locale.ROOT)
+            when (subdub) {
+                "sub" -> SubDubType.SUB
+                "dub" -> SubDubType.DUB
+                else -> SubDubType.NULL
+            }
+        } else {
+            SubDubType.NULL
+        }
+    }
+
+    enum class SubDubType {
+        SUB, DUB, NULL
+    }
+
+    fun findSeasonNumber(text: String): Int? {
+        val seasonPattern: Pattern = Pattern.compile(REGEX_SEASON, Pattern.CASE_INSENSITIVE)
+        val seasonMatcher: Matcher = seasonPattern.matcher(text)
+
+        return if (seasonMatcher.find()) {
+            seasonMatcher.group(2)?.toInt()
+        } else {
+            null
+        }
+    }
+
+    fun findEpisodeNumber(text: String): Float? {
+        val episodePattern: Pattern = Pattern.compile(REGEX_EPISODE, Pattern.CASE_INSENSITIVE)
+        val episodeMatcher: Matcher = episodePattern.matcher(text)
+
+        return if (episodeMatcher.find()) {
+            if (episodeMatcher.group(2) != null) {
+                episodeMatcher.group(2)?.toFloat()
+            } else {
+                val failedEpisodeNumberPattern: Pattern =
+                    Pattern.compile(REGEX_PART_NUMBER, Pattern.CASE_INSENSITIVE)
+                val failedEpisodeNumberMatcher: Matcher =
+                    failedEpisodeNumberPattern.matcher(text)
+                if (failedEpisodeNumberMatcher.find()) {
+                    failedEpisodeNumberMatcher.group(1)?.toFloat()
+                } else {
+                    null
+                }
+            }
+        } else {
+            null
+        }
+    }
+
+    fun removeEpisodeNumber(text: String): String {
+        val regexPattern = Regex(REGEX_EPISODE, RegexOption.IGNORE_CASE)
+        val removedNumber = text.replace(regexPattern, "").ifEmpty {
+            text
+        }
+        val letterPattern = Regex("[a-zA-Z]")
+        return if (letterPattern.containsMatchIn(removedNumber)) {
+            removedNumber
+        } else {
+            text
+        }
+    }
+
+
+    fun removeEpisodeNumberCompletely(text: String): String {
+        val regexPattern = Regex(REGEX_EPISODE, RegexOption.IGNORE_CASE)
+        val removedNumber = text.replace(regexPattern, "")
+        return if (removedNumber.equals(text, true)) {  // if nothing was removed
+            val failedEpisodeNumberPattern =
+                Regex(REGEX_PART_NUMBER, RegexOption.IGNORE_CASE)
+            failedEpisodeNumberPattern.replace(removedNumber) { mr ->
+                mr.value.replaceFirst(mr.groupValues[1], "")
+            }
+        } else {
+            removedNumber
+        }
+    }
+
+    fun findChapterNumber(text: String): Float? {
+        val pattern: Pattern = Pattern.compile(REGEX_CHAPTER, Pattern.CASE_INSENSITIVE)
+        val matcher: Matcher = pattern.matcher(text)
+
+        return if (matcher.find()) {
+            matcher.group(2)?.toFloat()
+        } else {
+            val failedChapterNumberPattern: Pattern =
+                Pattern.compile(REGEX_PART_NUMBER, Pattern.CASE_INSENSITIVE)
+            val failedChapterNumberMatcher: Matcher =
+                failedChapterNumberPattern.matcher(text)
+            if (failedChapterNumberMatcher.find()) {
+                failedChapterNumberMatcher.group(1)?.toFloat()
+            } else {
+                null
+            }
+        }
+    }
+}
--- a/app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt
@@ -1,127 +0,0 @@
-package ani.dantotsu.media.anime
-
-import java.util.Locale
-import java.util.regex.Matcher
-import java.util.regex.Pattern
-
-class AnimeNameAdapter {
-    companion object {
-        const val episodeRegex =
-            "(episode|episodio|ep|e)[\\s:.\\-]*(\\d+\\.?\\d*)[\\s:.\\-]*\\(?\\s*(sub|subbed|dub|dubbed)*\\s*\\)?\\s*"
-        const val failedEpisodeNumberRegex =
-            "(?<!part\\s)\\b(\\d+)\\b"
-        const val seasonRegex = "(season|s)[\\s:.\\-]*(\\d+)[\\s:.\\-]*"
-        const val subdubRegex = "^(soft)?[\\s-]*(sub|dub|mixed)(bed|s)?\\s*$"
-
-        fun setSubDub(text: String, typeToSetTo: SubDubType): String? {
-            val subdubPattern: Pattern = Pattern.compile(subdubRegex, Pattern.CASE_INSENSITIVE)
-            val subdubMatcher: Matcher = subdubPattern.matcher(text)
-
-            return if (subdubMatcher.find()) {
-                val soft = subdubMatcher.group(1)
-                val subdub = subdubMatcher.group(2)
-                val bed = subdubMatcher.group(3) ?: ""
-
-                val toggled = when (typeToSetTo) {
-                    SubDubType.SUB -> "sub"
-                    SubDubType.DUB -> "dub"
-                    SubDubType.NULL -> ""
-                }
-                val toggledCasePreserved =
-                    if (subdub?.get(0)?.isUpperCase() == true || soft?.get(0)
-                            ?.isUpperCase() == true
-                    ) toggled.replaceFirstChar {
-                        if (it.isLowerCase()) it.titlecase(
-                            Locale.ROOT
-                        ) else it.toString()
-                    } else toggled
-
-                subdubMatcher.replaceFirst(toggledCasePreserved + bed)
-            } else {
-                null
-            }
-        }
-
-        fun getSubDub(text: String): SubDubType {
-            val subdubPattern: Pattern = Pattern.compile(subdubRegex, Pattern.CASE_INSENSITIVE)
-            val subdubMatcher: Matcher = subdubPattern.matcher(text)
-
-            return if (subdubMatcher.find()) {
-                val subdub = subdubMatcher.group(2)?.lowercase(Locale.ROOT)
-                when (subdub) {
-                    "sub" -> SubDubType.SUB
-                    "dub" -> SubDubType.DUB
-                    else -> SubDubType.NULL
-                }
-            } else {
-                SubDubType.NULL
-            }
-        }
-
-        enum class SubDubType {
-            SUB, DUB, NULL
-        }
-
-        fun findSeasonNumber(text: String): Int? {
-            val seasonPattern: Pattern = Pattern.compile(seasonRegex, Pattern.CASE_INSENSITIVE)
-            val seasonMatcher: Matcher = seasonPattern.matcher(text)
-
-            return if (seasonMatcher.find()) {
-                seasonMatcher.group(2)?.toInt()
-            } else {
-                null
-            }
-        }
-
-        fun findEpisodeNumber(text: String): Float? {
-            val episodePattern: Pattern = Pattern.compile(episodeRegex, Pattern.CASE_INSENSITIVE)
-            val episodeMatcher: Matcher = episodePattern.matcher(text)
-
-            return if (episodeMatcher.find()) {
-                if (episodeMatcher.group(2) != null) {
-                    episodeMatcher.group(2)?.toFloat()
-                } else {
-                    val failedEpisodeNumberPattern: Pattern =
-                        Pattern.compile(failedEpisodeNumberRegex, Pattern.CASE_INSENSITIVE)
-                    val failedEpisodeNumberMatcher: Matcher =
-                        failedEpisodeNumberPattern.matcher(text)
-                    if (failedEpisodeNumberMatcher.find()) {
-                        failedEpisodeNumberMatcher.group(1)?.toFloat()
-                    } else {
-                        null
-                    }
-                }
-            } else {
-                null
-            }
-        }
-
-        fun removeEpisodeNumber(text: String): String {
-            val regexPattern = Regex(episodeRegex, RegexOption.IGNORE_CASE)
-            val removedNumber = text.replace(regexPattern, "").ifEmpty {
-                text
-            }
-            val letterPattern = Regex("[a-zA-Z]")
-            return if (letterPattern.containsMatchIn(removedNumber)) {
-                removedNumber
-            } else {
-                text
-            }
-        }
-
-
-        fun removeEpisodeNumberCompletely(text: String): String {
-            val regexPattern = Regex(episodeRegex, RegexOption.IGNORE_CASE)
-            val removedNumber = text.replace(regexPattern, "")
-            return if (removedNumber.equals(text, true)) {  // if nothing was removed
-                val failedEpisodeNumberPattern =
-                    Regex(failedEpisodeNumberRegex, RegexOption.IGNORE_CASE)
-                failedEpisodeNumberPattern.replace(removedNumber) { mr ->
-                    mr.value.replaceFirst(mr.groupValues[1], "")
-                }
-            } else {
-                removedNumber
-            }
-        }
-    }
-}
--- a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt
@@ -26,6 +26,7 @@ import ani.dantotsu.isOnline
 import ani.dantotsu.loadImage
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.media.SourceSearchDialogFragment
 import ani.dantotsu.openSettings
 import ani.dantotsu.others.LanguageMapper
@@ -403,7 +404,7 @@ class AnimeWatchAdapter(
                    }
                    val ep = media.anime.episodes!![continueEp]!!

-                    val cleanedTitle = ep.title?.let { AnimeNameAdapter.removeEpisodeNumber(it) }
+                    val cleanedTitle = ep.title?.let { MediaNameAdapter.removeEpisodeNumber(it) }

                    binding.itemEpisodeImage.loadImage(
                        ep.thumb ?: FileUrl[media.banner ?: media.cover], 0
--- a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt
@@ -41,6 +41,7 @@ import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.media.MediaDetailsViewModel
 import ani.dantotsu.media.MediaType
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.notifications.subscription.SubscriptionHelper
 import ani.dantotsu.notifications.subscription.SubscriptionHelper.Companion.saveSubscription
@@ -224,7 +225,7 @@ class AnimeWatchFragment : Fragment() {
                            if (media.anime!!.kitsuEpisodes!!.containsKey(i)) {
                                episode.desc =
                                    media.anime!!.kitsuEpisodes!![i]?.desc ?: episode.desc
-                                episode.title = if (AnimeNameAdapter.removeEpisodeNumberCompletely(
+                                episode.title = if (MediaNameAdapter.removeEpisodeNumberCompletely(
                                        episode.title ?: ""
                                    ).isBlank()
                                ) media.anime!!.kitsuEpisodes!![i]?.title
--- a/app/src/main/java/ani/dantotsu/media/anime/EpisodeAdapters.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/EpisodeAdapters.kt
@@ -21,6 +21,7 @@ import ani.dantotsu.databinding.ItemEpisodeListBinding
 import ani.dantotsu.download.anime.AnimeDownloaderService
 import ani.dantotsu.download.video.Helper
 import ani.dantotsu.media.Media
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.setAnimation
 import ani.dantotsu.settings.saving.PrefManager
 import com.bumptech.glide.Glide
@@ -102,7 +103,7 @@ class EpisodeAdapter(
    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
        val ep = arr[position]
        val title = if (!ep.title.isNullOrEmpty() && ep.title != "null") {
-            ep.title?.let { AnimeNameAdapter.removeEpisodeNumber(it) }
+            ep.title?.let { MediaNameAdapter.removeEpisodeNumber(it) }
        } else {
            ep.number
        } ?: ""
--- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
@@ -113,6 +113,7 @@ import ani.dantotsu.isOnline
 import ani.dantotsu.logError
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsViewModel
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.media.SubtitleDownloader
 import ani.dantotsu.okHttpClient
 import ani.dantotsu.others.AniSkip
@@ -998,7 +999,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
        episodeTitleArr = arrayListOf()
        episodes.forEach {
            val episode = it.value
-            val cleanedTitle = AnimeNameAdapter.removeEpisodeNumberCompletely(episode.title ?: "")
+            val cleanedTitle = MediaNameAdapter.removeEpisodeNumberCompletely(episode.title ?: "")
            episodeTitleArr.add("Episode ${episode.number}${if (episode.filler) " [Filler]" else ""}${if (cleanedTitle.isNotBlank() && cleanedTitle != "null") ": $cleanedTitle" else ""}")
        }

--- a/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt
@@ -15,6 +15,7 @@ import ani.dantotsu.currContext
 import ani.dantotsu.databinding.ItemChapterListBinding
 import ani.dantotsu.databinding.ItemEpisodeCompactBinding
 import ani.dantotsu.media.Media
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.setAnimation
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -267,10 +268,10 @@ class MangaChapterAdapter(
                val binding = holder.binding
                setAnimation(fragment.requireContext(), holder.binding.root)
                val ep = arr[position]
-                val parsedNumber = MangaNameAdapter.findChapterNumber(ep.number)?.toInt()
+                val parsedNumber = MediaNameAdapter.findChapterNumber(ep.number)?.toInt()
                binding.itemEpisodeNumber.text = parsedNumber?.toString() ?: ep.number
                if (media.userProgress != null) {
-                    if ((MangaNameAdapter.findChapterNumber(ep.number)
+                    if ((MediaNameAdapter.findChapterNumber(ep.number)
                            ?: 9999f) <= media.userProgress!!.toFloat()
                    )
                        binding.itemEpisodeViewedCover.visibility = View.VISIBLE
@@ -279,7 +280,7 @@ class MangaChapterAdapter(
                        binding.itemEpisodeCont.setOnLongClickListener {
                            updateProgress(
                                media,
-                                MangaNameAdapter.findChapterNumber(ep.number).toString()
+                                MediaNameAdapter.findChapterNumber(ep.number).toString()
                            )
                            true
                        }
@@ -315,7 +316,7 @@ class MangaChapterAdapter(
                } else binding.itemChapterTitle.visibility = View.VISIBLE

                if (media.userProgress != null) {
-                    if ((MangaNameAdapter.findChapterNumber(ep.number)
+                    if ((MediaNameAdapter.findChapterNumber(ep.number)
                            ?: 9999f) <= media.userProgress!!.toFloat()
                    ) {
                        binding.itemEpisodeViewedCover.visibility = View.VISIBLE
@@ -326,7 +327,7 @@ class MangaChapterAdapter(
                        binding.root.setOnLongClickListener {
                            updateProgress(
                                media,
-                                MangaNameAdapter.findChapterNumber(ep.number).toString()
+                                MediaNameAdapter.findChapterNumber(ep.number).toString()
                            )
                            true
                        }
--- a/app/src/main/java/ani/dantotsu/media/manga/MangaNameAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/MangaNameAdapter.kt
@@ -1,29 +0,0 @@
-package ani.dantotsu.media.manga
-
-import java.util.regex.Matcher
-import java.util.regex.Pattern
-
-class MangaNameAdapter {
-    companion object {
-        private const val chapterRegex = "(chapter|chap|ch|c)[\\s:.\\-]*(\\d+\\.?\\d*)[\\s:.\\-]*"
-        private const val filedChapterNumberRegex = "(?<!part\\s)\\b(\\d+)\\b"
-        fun findChapterNumber(text: String): Float? {
-            val pattern: Pattern = Pattern.compile(chapterRegex, Pattern.CASE_INSENSITIVE)
-            val matcher: Matcher = pattern.matcher(text)
-
-            return if (matcher.find()) {
-                matcher.group(2)?.toFloat()
-            } else {
-                val failedChapterNumberPattern: Pattern =
-                    Pattern.compile(filedChapterNumberRegex, Pattern.CASE_INSENSITIVE)
-                val failedChapterNumberMatcher: Matcher =
-                    failedChapterNumberPattern.matcher(text)
-                if (failedChapterNumberMatcher.find()) {
-                    failedChapterNumberMatcher.group(1)?.toFloat()
-                } else {
-                    null
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt
@@ -26,6 +26,7 @@ import ani.dantotsu.isOnline
 import ani.dantotsu.loadImage
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.media.SourceSearchDialogFragment
 import ani.dantotsu.media.anime.handleProgress
 import ani.dantotsu.openSettings
@@ -385,8 +386,8 @@ class MangaReadAdapter(
                    )
                }

-                val startChapter = MangaNameAdapter.findChapterNumber(names[limit * (position)])
-                val endChapter = MangaNameAdapter.findChapterNumber(names[last - 1])
+                val startChapter = MediaNameAdapter.findChapterNumber(names[limit * (position)])
+                val endChapter = MediaNameAdapter.findChapterNumber(names[last - 1])
                val startChapterString = if (startChapter != null) {
                    "Ch.$startChapter"
                } else {
@@ -448,7 +449,7 @@ class MangaReadAdapter(
                    chapter.scanlator !in hiddenScanlators
                }
                val formattedChapters = filteredChapters.map {
-                    MangaNameAdapter.findChapterNumber(it)?.toInt()?.toString()
+                    MediaNameAdapter.findChapterNumber(it)?.toInt()?.toString()
                }
                if (formattedChapters.contains(continueEp)) {
                    continueEp = chapters[formattedChapters.indexOf(continueEp)]
--- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
@@ -41,6 +41,7 @@ import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.media.MediaDetailsViewModel
 import ani.dantotsu.media.MediaType
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.media.manga.mangareader.ChapterLoaderDialog
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.notifications.subscription.SubscriptionHelper
@@ -227,7 +228,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener {
        val chapters = media.manga?.chapters?.values?.toList()
        //filter by selected language
        val progressChapterIndex = (chapters?.indexOfFirst {
-            MangaNameAdapter.findChapterNumber(it.number)?.toInt() == selected
+            MediaNameAdapter.findChapterNumber(it.number)?.toInt() == selected
        } ?: 0) + 1

        if (progressChapterIndex < 0 || n < 1 || chapters == null) return
--- a/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt
@@ -57,9 +57,9 @@ import ani.dantotsu.logError
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsViewModel
 import ani.dantotsu.media.MediaSingleton
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.media.manga.MangaCache
 import ani.dantotsu.media.manga.MangaChapter
-import ani.dantotsu.media.manga.MangaNameAdapter
 import ani.dantotsu.others.ImageViewDialog
 import ani.dantotsu.parsers.HMangaSources
 import ani.dantotsu.parsers.MangaImage
@@ -180,7 +180,7 @@ class MangaReaderActivity : AppCompatActivity() {
        defaultSettings = loadReaderSettings("reader_settings") ?: defaultSettings

        onBackPressedDispatcher.addCallback(this) {
-            val chapter = (MangaNameAdapter.findChapterNumber(media.manga!!.selectedChapter!!)
+            val chapter = (MediaNameAdapter.findChapterNumber(media.manga!!.selectedChapter!!)
                ?.minus(1L) ?: 0).toString()
            if (chapter == "0.0" && PrefManager.getVal(PrefName.ChapterZeroReader)
                // Not asking individually or incognito
@@ -969,7 +969,7 @@ class MangaReaderActivity : AppCompatActivity() {
                        PrefManager.setCustomVal("${media.id}_save_progress", true)
                        updateProgress(
                            media,
-                            MangaNameAdapter.findChapterNumber(media.manga!!.selectedChapter!!)
+                            MediaNameAdapter.findChapterNumber(media.manga!!.selectedChapter!!)
                                .toString()
                        )
                        dialog.dismiss()
@@ -991,7 +991,7 @@ class MangaReaderActivity : AppCompatActivity() {
                )
                    updateProgress(
                        media,
-                        MangaNameAdapter.findChapterNumber(media.manga!!.selectedChapter!!)
+                        MediaNameAdapter.findChapterNumber(media.manga!!.selectedChapter!!)
                            .toString()
                    )
                runnable.run()
--- a/app/src/main/java/ani/dantotsu/notifications/subscription/SubscriptionHelper.kt
+++ b/app/src/main/java/ani/dantotsu/notifications/subscription/SubscriptionHelper.kt
@@ -3,13 +3,11 @@ package ani.dantotsu.notifications.subscription
 import ani.dantotsu.R
 import ani.dantotsu.currContext
 import ani.dantotsu.media.Media
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.media.Selected
-import ani.dantotsu.media.manga.MangaNameAdapter
 import ani.dantotsu.parsers.AnimeParser
 import ani.dantotsu.parsers.AnimeSources
 import ani.dantotsu.parsers.Episode
-import ani.dantotsu.parsers.HAnimeSources
-import ani.dantotsu.parsers.HMangaSources
 import ani.dantotsu.parsers.MangaChapter
 import ani.dantotsu.parsers.MangaParser
 import ani.dantotsu.parsers.MangaSources
@@ -105,7 +103,7 @@ class SubscriptionHelper {
            }

            return chp?.apply {
-                selected.latest = MangaNameAdapter.findChapterNumber(number) ?: 0f
+                selected.latest = MediaNameAdapter.findChapterNumber(number) ?: 0f
                saveSelected(id, selected)
            }
        }
--- a/app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt
@@ -3,7 +3,7 @@ package ani.dantotsu.parsers
 import android.content.Context
 import ani.dantotsu.FileUrl
 import ani.dantotsu.currContext
-import ani.dantotsu.media.anime.AnimeNameAdapter
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.media.manga.ImageData
 import ani.dantotsu.media.manga.MangaCache
 import ani.dantotsu.snackString
@@ -73,12 +73,12 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
                    configurableSource.getPreferenceKey(),
                    Context.MODE_PRIVATE
                )
-            sharedPreferences.all.filterValues { AnimeNameAdapter.getSubDub(it.toString()) != AnimeNameAdapter.Companion.SubDubType.NULL }
+            sharedPreferences.all.filterValues { MediaNameAdapter.getSubDub(it.toString()) != MediaNameAdapter.SubDubType.NULL }
                .forEach { value ->
-                    return when (AnimeNameAdapter.getSubDub(value.value.toString())) {
-                        AnimeNameAdapter.Companion.SubDubType.SUB -> false
-                        AnimeNameAdapter.Companion.SubDubType.DUB -> true
-                        AnimeNameAdapter.Companion.SubDubType.NULL -> false
+                    return when (MediaNameAdapter.getSubDub(value.value.toString())) {
+                        MediaNameAdapter.SubDubType.SUB -> false
+                        MediaNameAdapter.SubDubType.DUB -> true
+                        MediaNameAdapter.SubDubType.NULL -> false
                    }
                }
        }
@@ -92,8 +92,8 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
        val configurableSource = extension.sources[sourceLanguage] as? ConfigurableAnimeSource
            ?: return
        val type = when (setDub) {
-            true -> AnimeNameAdapter.Companion.SubDubType.DUB
-            false -> AnimeNameAdapter.Companion.SubDubType.SUB
+            true -> MediaNameAdapter.SubDubType.DUB
+            false -> MediaNameAdapter.SubDubType.SUB
        }
        currContext()?.let { context ->
            val sharedPreferences =
@@ -101,9 +101,9 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
                    configurableSource.getPreferenceKey(),
                    Context.MODE_PRIVATE
                )
-            sharedPreferences.all.filterValues { AnimeNameAdapter.getSubDub(it.toString()) != AnimeNameAdapter.Companion.SubDubType.NULL }
+            sharedPreferences.all.filterValues { MediaNameAdapter.getSubDub(it.toString()) != MediaNameAdapter.SubDubType.NULL }
                .forEach { value ->
-                    val setValue = AnimeNameAdapter.setSubDub(value.value.toString(), type)
+                    val setValue = MediaNameAdapter.setSubDub(value.value.toString(), type)
                    if (setValue != null) {
                        sharedPreferences.edit().putString(value.key, setValue).apply()
                    }
@@ -122,9 +122,9 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
                    Context.MODE_PRIVATE
                )
            sharedPreferences.all.filterValues {
-                AnimeNameAdapter.setSubDub(
+                MediaNameAdapter.setSubDub(
                    it.toString(),
-                    AnimeNameAdapter.Companion.SubDubType.NULL
+                    MediaNameAdapter.SubDubType.NULL
                ) != null
            }
                .forEach { _ -> return true }
@@ -150,7 +150,7 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
            val sortedEpisodes = if (res[0].episode_number == -1f) {
                // Find the number in the string and sort by that number
                val sortedByStringNumber = res.sortedBy {
-                    val matchResult = AnimeNameAdapter.findEpisodeNumber(it.name)
+                    val matchResult = MediaNameAdapter.findEpisodeNumber(it.name)
                    val number = matchResult ?: Float.MAX_VALUE
                    it.episode_number = number  // Store the found number in episode_number
                    number
@@ -171,13 +171,13 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
                var episodeCounter = 1f
                // Group by season, sort within each season, and then renumber while keeping episode number 0 as is
                val seasonGroups =
-                    res.groupBy { AnimeNameAdapter.findSeasonNumber(it.name) ?: 0 }
+                    res.groupBy { MediaNameAdapter.findSeasonNumber(it.name) ?: 0 }
                seasonGroups.keys.sortedBy { it }
                    .flatMap { season ->
                        seasonGroups[season]?.sortedBy { it.episode_number }?.map { episode ->
                            if (episode.episode_number != 0f) { // Skip renumbering for episode number 0
                                val potentialNumber =
-                                    AnimeNameAdapter.findEpisodeNumber(episode.name)
+                                    MediaNameAdapter.findEpisodeNumber(episode.name)
                                if (potentialNumber != null) {
                                    episode.episode_number = potentialNumber
                                } else {
--- a/app/src/main/java/ani/dantotsu/parsers/MangaParser.kt
+++ b/app/src/main/java/ani/dantotsu/parsers/MangaParser.kt
@@ -1,7 +1,7 @@
 package ani.dantotsu.parsers

 import ani.dantotsu.FileUrl
-import ani.dantotsu.media.manga.MangaNameAdapter
+import ani.dantotsu.media.MediaNameAdapter
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
@@ -33,9 +33,9 @@ abstract class MangaParser : BaseParser() {
    ): MangaChapter? {
        val chapter = loadChapters(mangaLink, extra, sManga)
        val max = chapter
-            .maxByOrNull { MangaNameAdapter.findChapterNumber(it.number) ?: 0f }
+            .maxByOrNull { MediaNameAdapter.findChapterNumber(it.number) ?: 0f }
        return max
-            ?.takeIf { latest < (MangaNameAdapter.findChapterNumber(it.number) ?: 0.001f) }
+            ?.takeIf { latest < (MediaNameAdapter.findChapterNumber(it.number) ?: 0.001f) }
    }

    /**
--- a/app/src/main/java/ani/dantotsu/parsers/OfflineAnimeParser.kt
+++ b/app/src/main/java/ani/dantotsu/parsers/OfflineAnimeParser.kt
@@ -5,7 +5,7 @@ import android.os.Environment
 import ani.dantotsu.currContext
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.media.MediaType
-import ani.dantotsu.media.anime.AnimeNameAdapter
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.tryWithSuspend
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
@@ -54,7 +54,7 @@ class OfflineAnimeParser : AnimeParser() {
                    episodes.add(episode)
                }
            }
-            episodes.sortBy { AnimeNameAdapter.findEpisodeNumber(it.number) }
+            episodes.sortBy { MediaNameAdapter.findEpisodeNumber(it.number) }
            return episodes
        }
        return emptyList()
--- a/app/src/main/java/ani/dantotsu/parsers/OfflineMangaParser.kt
+++ b/app/src/main/java/ani/dantotsu/parsers/OfflineMangaParser.kt
@@ -3,7 +3,7 @@ package ani.dantotsu.parsers
 import android.os.Environment
 import ani.dantotsu.currContext
 import ani.dantotsu.download.DownloadsManager
-import ani.dantotsu.media.manga.MangaNameAdapter
+import ani.dantotsu.media.MediaNameAdapter
 import ani.dantotsu.util.Logger
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
@@ -43,7 +43,7 @@ class OfflineMangaParser : MangaParser() {
                    chapters.add(chapter)
                }
            }
-            chapters.sortBy { MangaNameAdapter.findChapterNumber(it.number) }
+            chapters.sortBy { MediaNameAdapter.findChapterNumber(it.number) }
            return chapters
        }
        return emptyList()
--- a/app/src/main/java/ani/dantotsu/parsers/OfflineNovelParser.kt
+++ b/app/src/main/java/ani/dantotsu/parsers/OfflineNovelParser.kt
@@ -3,7 +3,7 @@ package ani.dantotsu.parsers
 import android.os.Environment
 import ani.dantotsu.currContext
 import ani.dantotsu.download.DownloadsManager
-import ani.dantotsu.media.manga.MangaNameAdapter
+import ani.dantotsu.media.MediaNameAdapter
 import me.xdrop.fuzzywuzzy.FuzzySearch
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -38,7 +38,7 @@ class OfflineNovelParser : NovelParser() {
                    chapters.add(chapter)
                }
            }
-            chapters.sortBy { MangaNameAdapter.findChapterNumber(it.name) }
+            chapters.sortBy { MediaNameAdapter.findChapterNumber(it.name) }
            return chapters.first()
        }
        return Book(