diff --git a/app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt b/app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt index 050e58a4..f64f2dc4 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt @@ -6,7 +6,7 @@ import java.util.regex.Pattern class AnimeNameAdapter { companion object { const val episodeRegex = - "(episode|ep|e)[\\s:.\\-]*([\\d]+\\.?[\\d]*)[\\s:.\\-]*\\(?\\s*(sub|subbed|dub|dubbed)*\\s*\\)?\\s*" + "(episode|ep|e)[\\s:.\\-]*([\\d]+\\.?[\\d]*)[\\s:.\\-]*\\(?\\s*(sub|subbed|dub|dubbed)*\\s*\\)?\\s*|(\\b\\d+\\b)" const val seasonRegex = "(season|s)[\\s:.\\-]*(\\d+)[\\s:.\\-]*" fun findSeasonNumber(text: String): Int? { @@ -25,7 +25,11 @@ class AnimeNameAdapter { val episodeMatcher: Matcher = episodePattern.matcher(text) return if (episodeMatcher.find()) { - episodeMatcher.group(2)?.toFloat() + if (episodeMatcher.group(2) != null) { + episodeMatcher.group(2)?.toFloat() + } else { + episodeMatcher.group(4)?.toFloat() + } } else { null } diff --git a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt index 93d00689..673e30df 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt @@ -959,11 +959,6 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL episodeTitleArr.add("Episode ${episode.number}${if (episode.filler) " [Filler]" else ""}${if (cleanedTitle.isNotEmpty() && cleanedTitle != "null") ": $cleanedTitle" else ""}") } - for (i in episodeTitleArr.indices) { - episodeTitleArr[i] = AnimeNameAdapter.removeEpisodeNumber(episodeTitleArr[i]) - } - - //Episode Change fun change(index: Int) { if (isInitialized) {