基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
feat: search result sort
Predidit9f7e4ee515e9
diff --git a/lib/pages/search/search_controller.dart b/lib/pages/search/search_controller.dartindex 7b14c752..612befe8 100644--- a/lib/pages/search/search_controller.dart+++ b/lib/pages/search/search_controller.dart@@ -17,6 +17,17 @@ abstract class _SearchPageController with Store {@observableObservableList<BangumiItem> bangumiList = ObservableList.of([]);+ /// Avaliable sort parameters:+ /// 1. heat+ /// 2. match+ /// 3. rank+ /// 4. score+ String attachSortParams(String input, String sort) {+ SearchParser parser = SearchParser(input);+ String newInput = parser.updateSort(sort);+ return newInput;+ }+Future<void> searchBangumi(String input, {String type = 'add'}) async {if (type != 'add') {bangumiList.clear();@@ -26,6 +37,7 @@ abstract class _SearchPageController with Store {SearchParser parser = SearchParser(input);String? idString = parser.parseId();String? tag = parser.parseTag();+ String? sort = parser.parseSort();String keywords = parser.parseKeywords();if (idString != null) {final id = int.tryParse(idString);@@ -38,7 +50,7 @@ abstract class _SearchPageController with Store {}}var result =- await BangumiHTTP.bangumiSearch(keywords, tags: [if (tag != null) tag], offset: bangumiList.length);+ await BangumiHTTP.bangumiSearch(keywords, tags: [if (tag != null) tag], offset: bangumiList.length, sort: sort ?? 'heat');bangumiList.addAll(result);isLoading = false;isTimeOut = bangumiList.isEmpty;diff --git a/lib/pages/search/search_page.dart b/lib/pages/search/search_page.dartindex 18bf285a..d92968da 100644--- a/lib/pages/search/search_page.dart+++ b/lib/pages/search/search_page.dart@@ -17,6 +17,7 @@ class SearchPage extends StatefulWidget {class _SearchPageState extends State<SearchPage> {final SearchController searchController = SearchController();+/// Don't use modular singleton here. We may have multiple search pages./// Use a new instance of SearchPageController for each search page.final SearchPageController searchPageController = SearchPageController();@@ -46,6 +47,54 @@ class _SearchPageState extends State<SearchPage> {}}+ void showSortSwitcher() {+ showModalBottomSheet(+ context: context,+ isScrollControlled: true,+ builder: (context) {+ return Wrap(+ children: [+ Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ ListTile(+ title: const Text('按热度排序'),+ onTap: () {+ Navigator.pop(context);+ searchController.text = searchPageController+ .attachSortParams(searchController.text, 'heat');+ searchPageController.searchBangumi(searchController.text,+ type: 'init');+ },+ ),+ ListTile(+ title: const Text('按评分排序'),+ onTap: () {+ Navigator.pop(context);+ searchController.text = searchPageController+ .attachSortParams(searchController.text, 'rank');+ searchPageController.searchBangumi(searchController.text,+ type: 'init');+ },+ ),+ ListTile(+ title: const Text('按匹配程度排序'),+ onTap: () {+ Navigator.pop(context);+ searchController.text = searchPageController+ .attachSortParams(searchController.text, 'match');+ searchPageController.searchBangumi(searchController.text,+ type: 'init');+ },+ ),+ ],+ ),+ ],+ );+ },+ );+ }+@overrideWidget build(BuildContext context) {WidgetsBinding.instance.addPostFrameCallback((_) {@@ -60,6 +109,13 @@ class _SearchPageState extends State<SearchPage> {backgroundColor: Colors.transparent,title: const Text("搜索"),),+ floatingActionButton: FloatingActionButton.extended(+ onPressed: () {+ showSortSwitcher();+ },+ icon: const Icon(Icons.sort),+ label: const Text("排序方式"),+ ),body: Column(children: [Padding(diff --git a/lib/request/bangumi.dart b/lib/request/bangumi.dartindex 6f072bc7..d1bbfa62 100644--- a/lib/request/bangumi.dart+++ b/lib/request/bangumi.dart@@ -164,16 +164,16 @@ class BangumiHTTP {return bangumiList;}- static Future<List<BangumiItem>> bangumiSearch(String keyword, {List<String> tags = const [], int offset = 0}) async {+ static Future<List<BangumiItem>> bangumiSearch(String keyword, {List<String> tags = const [], int offset = 0, String sort = 'heat'}) async {List<BangumiItem> bangumiList = [];var params = <String, dynamic>{'keyword': keyword,- 'sort': 'rank',+ 'sort': sort,"filter": {"type": [2],"tag": tags,- "rank": [">0", "<=99999"],+ "rank": (sort == 'rank') ? [">0", "<=99999"] : [">=0", "<=99999"],"nsfw": false},};diff --git a/lib/utils/search_parser.dart b/lib/utils/search_parser.dartindex 846e79aa..fb4e992c 100644--- a/lib/utils/search_parser.dart+++ b/lib/utils/search_parser.dart@@ -2,6 +2,7 @@ class SearchParser {final String query;final RegExp _idRegExp = RegExp(r'id:(\d+)', caseSensitive: false);final RegExp _tagRegExp = RegExp(r'tag:([\w\u4e00-\u9fa5\u30A0-\u30FF\.\-]+)', caseSensitive: false);+ final RegExp _sortRegExp = RegExp(r'sort:([\w\-]+)', caseSensitive: false);SearchParser(this.query);@@ -15,9 +16,31 @@ class SearchParser {return match != null ? match.group(1) : null;}+ String? parseSort() {+ final match = _sortRegExp.firstMatch(query);+ return match != null ? match.group(1) : null;+ }+String parseKeywords() {String cleaned = query.replaceAll(_idRegExp, '');cleaned = cleaned.replaceAll(_tagRegExp, '');+ cleaned = cleaned.replaceAll(_sortRegExp, '');return cleaned.trim();}++ bool hasSortSyntax() {+ return _sortRegExp.hasMatch(query);+ }++ String removeSort() {+ return query.replaceAll(_sortRegExp, '').trim();+ }++ String updateSort(String sortValue) {+ if (hasSortSyntax()) {+ return query.replaceAllMapped(_sortRegExp, (match) => 'sort:$sortValue');+ } else {+ return '${query.trim()} sort:$sortValue'.trim();+ }+ }}\ No newline at end of file