Remove episode number from episode title like saikou (#119)

* Add files via upload

* Add files via upload

* Add files via upload

* use existing robust episode regex

* use existing robust episode regex

* use existing robust episode regex

* use existing robust episode regex

* allow external use of manga chapter regex as well

---------

Co-authored-by: rebel onion <87634197+rebelonion@users.noreply.github.com>

app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt

@@ -5,8 +5,10 @@ import java.util.regex.Pattern
 
 class AnimeNameAdapter {
     companion object {
+        val episodeRegex = "(episode|ep|e)[\\s:.\\-]*([\\d]+\\.?[\\d]*)[\\s:.\\-]*"
+        val seasonRegex = "(season|s)[\\s:.\\-]*(\\d+)[\\s:.\\-]*"
+
         fun findSeasonNumber(text: String): Int? {
-            val seasonRegex = "(season|s)[\\s:.\\-]*(\\d+)"
             val seasonPattern: Pattern = Pattern.compile(seasonRegex, Pattern.CASE_INSENSITIVE)
             val seasonMatcher: Matcher = seasonPattern.matcher(text)
 
@@ -18,7 +20,6 @@ class AnimeNameAdapter {
         }
 
         fun findEpisodeNumber(text: String): Float? {
-            val episodeRegex = "(episode|ep|e)[\\s:.\\-]*([\\d]+\\.?[\\d]*)"
             val episodePattern: Pattern = Pattern.compile(episodeRegex, Pattern.CASE_INSENSITIVE)
             val episodeMatcher: Matcher = episodePattern.matcher(text)
 

app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt

@@ -17,6 +17,7 @@ import ani.dantotsu.*
 import ani.dantotsu.databinding.ItemAnimeWatchBinding
 import ani.dantotsu.databinding.ItemChipBinding
 import ani.dantotsu.databinding.DialogLayoutBinding
+import ani.dantotsu.media.anime.AnimeNameAdapter
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.media.SourceSearchDialogFragment
@@ -343,12 +344,15 @@ class AnimeWatchAdapter(
                     }
                 }
                 val ep = media.anime.episodes!![continueEp]!!
+
+                val cleanedTitle = ep.title?.replace(Regex(AnimeNameAdapter.episodeRegex, RegexOption.IGNORE_CASE), "")
+
                 binding.itemEpisodeImage.loadImage(
                     ep.thumb ?: FileUrl[media.banner ?: media.cover], 0
                 )
                 if (ep.filler) binding.itemEpisodeFillerView.visibility = View.VISIBLE
                 binding.animeSourceContinueText.text =
-                        currActivity()!!.getString(R.string.continue_episode) + "${ep.number}${if (ep.filler) " - Filler" else ""}${if (ep.title != null) "\n${ep.title}" else ""}"
+                    currActivity()!!.getString(R.string.continue_episode) + "${ep.number}${if (ep.filler) " - Filler" else ""}${if (cleanedTitle != null) "\n$cleanedTitle" else ""}"
                 binding.animeSourceContinue.setOnClickListener {
                     fragment.onEpisodeClick(continueEp)
                 }
@@ -361,6 +365,7 @@ class AnimeWatchAdapter(
             } else {
                 binding.animeSourceContinue.visibility = View.GONE
             }
+
             binding.animeSourceProgressBar.visibility = View.GONE
             if (media.anime.episodes!!.isNotEmpty())
                 binding.animeSourceNotFound.visibility = View.GONE

app/src/main/java/ani/dantotsu/media/anime/EpisodeAdapters.kt

@@ -11,6 +11,7 @@ import ani.dantotsu.connections.updateProgress
 import ani.dantotsu.databinding.ItemEpisodeCompactBinding
 import ani.dantotsu.databinding.ItemEpisodeGridBinding
 import ani.dantotsu.databinding.ItemEpisodeListBinding
+import ani.dantotsu.media.anime.AnimeNameAdapter
 import ani.dantotsu.media.Media
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.model.GlideUrl
@@ -76,12 +77,11 @@ class EpisodeAdapter(
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val ep = arr[position]
-        val title =
-            "${
-                if (!ep.title.isNullOrEmpty() && ep.title != "null") "" else currContext()!!.getString(
-                    R.string.episode_singular
-                )
-            } ${if (!ep.title.isNullOrEmpty() && ep.title != "null") ep.title else ep.number}"
+val title = if (!ep.title.isNullOrEmpty() && ep.title != "null") {
+    (ep.title as? String)?.replaceFirst(Regex(AnimeNameAdapter.episodeRegex, RegexOption.IGNORE_CASE), "")
+} else {
+    ep.number
+} ?: ""
 
         when (holder) {
             is EpisodeListViewHolder -> {
@@ -246,4 +246,3 @@ class EpisodeAdapter(
     }
 }
 
-

app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt

@@ -69,6 +69,7 @@ import ani.dantotsu.connections.discord.DiscordServiceRunningSingleton
 import ani.dantotsu.connections.discord.RPC
 import ani.dantotsu.connections.updateProgress
 import ani.dantotsu.databinding.ActivityExoplayerBinding
+import ani.dantotsu.media.anime.AnimeNameAdapter
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsViewModel
 import ani.dantotsu.media.SubtitleDownloader
@@ -949,12 +950,15 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
 episodeArr = episodes.keys.toList()
 currentEpisodeIndex = episodeArr.indexOf(media.anime!!.selectedEpisode!!)
 
-        episodeTitleArr = arrayListOf()
+val episodeTitleArr = arrayListOf<String>()
 episodes.forEach {
     val episode = it.value
-            episodeTitleArr.add("${if (!episode.title.isNullOrEmpty() && episode.title != "null") "" else "Episode "}${episode.number}${if (episode.filler) " [Filler]" else ""}${if (!episode.title.isNullOrEmpty() && episode.title != "null") " : " + episode.title else ""}")
+    episodeTitleArr.add("${if (!episode.title.isNullOrEmpty() && episode.title != "null") "" else "numeric :"}${episode.number}${if (episode.filler) " [Filler]" else ""}${if (!episode.title.isNullOrEmpty() && episode.title != "null") " : " + episode.title else ""}")
 }
 
+val regexPattern = Regex(AnimeNameAdapter.episodeRegex, RegexOption.IGNORE_CASE)
+episodeTitleArr.replaceAll { it.replace(regexPattern, "") }
+
         //Episode Change
         fun change(index: Int) {
             if (isInitialized) {

app/src/main/java/ani/dantotsu/media/manga/MangaNameAdapter.kt

@@ -5,8 +5,8 @@ import java.util.regex.Pattern
 
 class MangaNameAdapter {
     companion object {
+        val chapterRegex = "(chapter|chap|ch|c)[\\s:.\\-]*([\\d]+\\.?[\\d]*)[\\s:.\\-]*"
         fun findChapterNumber(text: String): Float? {
-            val regex = "(chapter|chap|ch|c)[\\s:.\\-]*([\\d]+\\.?[\\d]*)"
             val pattern: Pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE)
             val matcher: Matcher = pattern.matcher(text)