From 7e07c35b032f97c289e7761dc83104cd40b50a3e Mon Sep 17 00:00:00 2001
From: dyphire <qimoge@gmail.com>
Date: Tue, 22 Oct 2024 07:35:20 +0800
Subject: [PATCH] fix(manhuagui): incorrect chapter order

---
 src/rust/zh.manhuagui/res/source.json | 4 ++--
 src/rust/zh.manhuagui/src/decoder.rs  | 7 +++----
 src/rust/zh.manhuagui/src/parser.rs   | 7 ++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/rust/zh.manhuagui/res/source.json b/src/rust/zh.manhuagui/res/source.json
index ba45377b3..a813cac39 100644
--- a/src/rust/zh.manhuagui/res/source.json
+++ b/src/rust/zh.manhuagui/res/source.json
@@ -3,8 +3,8 @@
 		"id": "zh.manhuagui",
 		"lang": "zh",
 		"name": "ManHuaGui",
-		"version": 2,
-		"url": "https://www.manhuagui.com/",
+		"version": 3,
+		"url": "https://www.manhuagui.com",
 		"nsfw": 1
 	}
 }
diff --git a/src/rust/zh.manhuagui/src/decoder.rs b/src/rust/zh.manhuagui/src/decoder.rs
index 0d4629eb0..f886d45a4 100644
--- a/src/rust/zh.manhuagui/src/decoder.rs
+++ b/src/rust/zh.manhuagui/src/decoder.rs
@@ -36,8 +36,7 @@ impl Decoder {
 			String::new()
 		};
 
-		let suffix_vec = vec![
-			self.tr(c % self.a, 36),
+		let suffix_vec = [self.tr(c % self.a, 36),
 			String::from_utf8(vec![(c % self.a + 29) as u8]).unwrap_or_default(),
 		];
 		let suffix = suffix_vec[(c % self.a > 35) as usize].clone();
@@ -47,7 +46,7 @@ impl Decoder {
 
 	fn tr(&self, value: i32, num: i32) -> String {
 		let tmp = Self::itr(value, num);
-		if tmp.eq("") {
+		if tmp.is_empty() {
 			return String::from("0");
 		}
 		tmp
@@ -69,7 +68,7 @@ impl Decoder {
 		let mut d_value: Vec<String> = vec![];
 		while c > -1 {
 			let key = self.e(c);
-			let value_index = self.data[c as usize].eq("") as usize;
+			let value_index = self.data[c as usize].is_empty() as usize;
 			let value = vec![self.data[c as usize].clone(), self.e(c)][value_index].clone();
 
 			let index = d_key
diff --git a/src/rust/zh.manhuagui/src/parser.rs b/src/rust/zh.manhuagui/src/parser.rs
index 55699a7fa..61e7fec3c 100644
--- a/src/rust/zh.manhuagui/src/parser.rs
+++ b/src/rust/zh.manhuagui/src/parser.rs
@@ -212,7 +212,7 @@ pub fn get_chapter_list(html: Node) -> Result<Vec<Chapter>> {
 		div = Node::new_fragment(decompressed.as_bytes()).unwrap_or(div);
 	}
 
-	for element in div.select(".chapter-list").array() {
+	for element in div.select(".chapter-list").array().rev() {
 		let chapt_list_div = match element.as_node() {
 			Ok(node) => node,
 			Err(_) => continue,
@@ -224,7 +224,7 @@ pub fn get_chapter_list(html: Node) -> Result<Vec<Chapter>> {
 				Err(_) => continue,
 			};
 
-			for li_ref in ul.select("li").array() {
+			for li_ref in ul.select("li").array().rev() {
 				let elem = match li_ref.as_node() {
 					Ok(node) => node,
 					Err(_) => continue,
@@ -239,7 +239,7 @@ pub fn get_chapter_list(html: Node) -> Result<Vec<Chapter>> {
 				let title = elem.select("a").attr("title").read();
 				let chapter_or_volume = title
 					.clone()
-					.replace(['第', '话', '卷'], "")
+					.replace(['第', '话', '話', '回', '卷'], " ")
 					.parse::<f32>()
 					.unwrap_or(index);
 				let ch = if title.contains('卷') {
@@ -270,6 +270,7 @@ pub fn get_chapter_list(html: Node) -> Result<Vec<Chapter>> {
 		}
 	}
 
+	chapters.reverse();
 	Ok(chapters)
 }