fix

kodjodevf · Jan 17, 2025 · ce2cc56 · ce2cc56
1 parent 5d54fe8
commit ce2cc56
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 36 deletions.
diff --git a/dart/manga/multisrc/mangareader/mangareader.dart b/dart/manga/multisrc/mangareader/mangareader.dart
@@ -34,7 +34,7 @@ class MangaReader extends MProvider {
   Future<MPages> search(String query, int page, FilterList filterList) async {
     final filters = filterList.filters;
 
-    String url = "$baseUrl/?&title=$query&page=$page";
+    String url = "$baseUrl${getMangaSearchUrl(page, query)}";
 
     for (var filter in filters) {
       if (filter.type == "AuthorFilter") {
@@ -277,37 +277,39 @@ class MangaReader extends MProvider {
 
   @override
   List<dynamic> getFilterList() {
-    return [
-      SeparatorFilter(),
-      TextFilter("AuthorFilter", "Author"),
-      TextFilter("YearFilter", "Year"),
-      SelectFilter("StatusFilter", "Status", 0, [
-        SelectFilterOption("All", ""),
-        SelectFilterOption("Ongoing", "ongoing"),
-        SelectFilterOption("Completed", "completed"),
-        SelectFilterOption("Hiatus", "hiatus"),
-        SelectFilterOption("Dropped", "dropped"),
-      ]),
-      SelectFilter("TypeFilter", "Type", 0, [
-        SelectFilterOption("All", ""),
-        SelectFilterOption("Manga", "Manga"),
-        SelectFilterOption("Manhwa", "Manhwa"),
-        SelectFilterOption("Manhua", "Manhua"),
-        SelectFilterOption("Comic", "Comic"),
-      ]),
-      SelectFilter("OrderByFilter", "Sort By", 0, [
-        SelectFilterOption("Default", ""),
-        SelectFilterOption("A-Z", "title"),
-        SelectFilterOption("Z-A", "titlereverse"),
-        SelectFilterOption("Latest Update", "update"),
-        SelectFilterOption("Latest Added", "latest"),
-        SelectFilterOption("Popular", "popular"),
-      ]),
-      HeaderFilter("Genre exclusion is not available for all sources"),
-      GroupFilter("GenreListFilter", "Genre", [
-        TriStateFilter("Press reset to attempt to fetch genres", ""),
-      ]),
-    ];
+    return ignoreFilter()
+        ? []
+        : [
+            SeparatorFilter(),
+            TextFilter("AuthorFilter", "Author"),
+            TextFilter("YearFilter", "Year"),
+            SelectFilter("StatusFilter", "Status", 0, [
+              SelectFilterOption("All", ""),
+              SelectFilterOption("Ongoing", "ongoing"),
+              SelectFilterOption("Completed", "completed"),
+              SelectFilterOption("Hiatus", "hiatus"),
+              SelectFilterOption("Dropped", "dropped"),
+            ]),
+            SelectFilter("TypeFilter", "Type", 0, [
+              SelectFilterOption("All", ""),
+              SelectFilterOption("Manga", "Manga"),
+              SelectFilterOption("Manhwa", "Manhwa"),
+              SelectFilterOption("Manhua", "Manhua"),
+              SelectFilterOption("Comic", "Comic"),
+            ]),
+            SelectFilter("OrderByFilter", "Sort By", 0, [
+              SelectFilterOption("Default", ""),
+              SelectFilterOption("A-Z", "title"),
+              SelectFilterOption("Z-A", "titlereverse"),
+              SelectFilterOption("Latest Update", "update"),
+              SelectFilterOption("Latest Added", "latest"),
+              SelectFilterOption("Popular", "popular"),
+            ]),
+            HeaderFilter("Genre exclusion is not available for all sources"),
+            GroupFilter("GenreListFilter", "Genre", [
+              TriStateFilter("Press reset to attempt to fetch genres", ""),
+            ]),
+          ];
   }
 
   @override
@@ -337,6 +339,17 @@ class MangaReader extends MProvider {
     }
     return "/manga";
   }
+
+  String getMangaSearchUrl(int page, String query) {
+    if (["Sushi-Scan"].contains(source.name)) {
+      return "/page/$page/?s=$query";
+    }
+    return "/?s=$query&page=$page";
+  }
+
+  bool ignoreFilter() {
+    return ["Sushi-Scan"].contains(source.name);
+  }
 }
 
 MangaReader main(MSource source) {

diff --git a/dart/manga/multisrc/mangareader/sources.dart b/dart/manga/multisrc/mangareader/sources.dart
@@ -25,7 +25,6 @@ import 'src/raikiscan/raikiscan.dart';
 import 'src/ravenscans/ravenscans.dart';
 import 'src/shadowmangas/shadowmangas.dart';
 import 'src/suryascans/suryascans.dart';
-import 'src/sushiscans/sushiscans.dart';
 import 'src/sushiscan/sushiscan.dart';
 import 'src/tarotscans/tarotscans.dart';
 import 'src/tukangkomik/tukangkomik.dart';
@@ -93,7 +92,7 @@ import 'src/shijiescans/shijiescans.dart';
 import 'src/summertoon/summertoon.dart';
 import 'src/zenithscans/zenithscans.dart';
 
-const mangareaderVersion = "0.1.5";
+const mangareaderVersion = "0.1.6";
 const mangareaderSourceCodeUrl =
     "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/dart/manga/multisrc/mangareader/mangareader.dart";
 
@@ -151,8 +150,6 @@ List<Source> _mangareaderSourcesList = [
   shadowmangasSource,
 //Surya Scans (EN)
   suryascansSource,
-//Sushi-Scans (FR)
-  sushiscansSource,
 //Sushi-Scan (FR)
   sushiscanSource,
 //Tarot Scans (TR)