From 00f3a58b4245e68ae714b13d7735b2786c532761 Mon Sep 17 00:00:00 2001
From: AlphaBoom <30779939+AlphaBoom@users.noreply.github.com>
Date: Sun, 23 Feb 2025 02:23:06 +0800
Subject: [PATCH] Xfani: Fix episode list sort (#696)

* Xfani: Fix episode list sort

* Triggering github action
---
 src/zh/xfani/build.gradle                                | 2 +-
 .../eu/kanade/tachiyomi/animeextension/zh/xfani/Xfani.kt | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/zh/xfani/build.gradle b/src/zh/xfani/build.gradle
index 395a0366..89b38f74 100644
--- a/src/zh/xfani/build.gradle
+++ b/src/zh/xfani/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Xfani'
     extClass = '.Xfani'
-    extVersionCode = 4
+    extVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Xfani.kt b/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Xfani.kt
index 5c210961..92583f32 100644
--- a/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Xfani.kt
+++ b/src/zh/xfani/src/eu/kanade/tachiyomi/animeextension/zh/xfani/Xfani.kt
@@ -136,9 +136,8 @@ class Xfani : AnimeHttpSource(), ConfigurableAnimeSource {
             SEpisode.create().apply {
                 name = it.text()
                 url = it.attr("href")
-                episode_number = numberRegex.find(name)?.value?.toFloat() ?: -1F
             }
-        }.sortedByDescending { it.episode_number }
+        }.reversed()
     }
 
     override fun videoListParse(response: Response): List<Video> {
@@ -155,9 +154,11 @@ class Xfani : AnimeHttpSource(), ConfigurableAnimeSource {
         val currentEpisodeName = allEpisodeElements.firstNotNullOfOrNull { elements ->
             elements.firstOrNull { it.attr("href") == currentPath }?.select("span")?.text()
         }
-        val targetEpisodeNumber = currentEpisodeName?.let { numberRegex.find(it)?.value?.toIntOrNull() } ?: -1
+        val targetEpisodeNumber =
+            currentEpisodeName?.let { numberRegex.find(it)?.value?.toIntOrNull() } ?: -1
         val sourceList = allEpisodeElements.map { elements ->
-            elements.findSourceOrNull { name, _ -> numberRegex.find(name)?.value?.toIntOrNull() == targetEpisodeNumber }
+            elements.findSourceOrNull { name, _ -> name == currentEpisodeName }
+                ?: elements.findSourceOrNull { name, _ -> numberRegex.find(name)?.value?.toIntOrNull() == targetEpisodeNumber }
                 ?: elements.findSourceOrNull { _, url -> url.endsWith(currentEpisodePathName) }
         }
         val sourceNameList = document.select(".anthology-tab .swiper-wrapper a").map {