Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

feat: redesign search page

Predidit18a0c252d98f
diff --git a/lib/pages/index_module.dart b/lib/pages/index_module.dart
index 77d71bb2..a0689375 100644
--- a/lib/pages/index_module.dart
+++ b/lib/pages/index_module.dart
@@ -14,6 +14,8 @@ import 'package:kazumi/pages/history/history_controller.dart';
import 'package:kazumi/pages/video/video_module.dart';
import 'package:kazumi/pages/info/info_module.dart';
import 'package:kazumi/pages/settings/settings_module.dart';
+import 'package:kazumi/pages/search/search_page.dart';
+import 'package:kazumi/pages/search/search_controller.dart';
import 'package:kazumi/shaders/shaders_controller.dart';
class IndexModule extends Module {
@@ -30,6 +32,7 @@ class IndexModule extends Module {
i.addSingleton(CollectController.new);
i.addSingleton(HistoryController.new);
i.addSingleton(MyController.new);
+ i.addSingleton(SearchPageController.new);
i.addSingleton(ShadersController.new);
}
@@ -59,5 +62,8 @@ class IndexModule extends Module {
r.module("/video", module: VideoModule());
r.module("/info", module: InfoModule());
r.module("/settings", module: SettingsModule());
+ r.child("/search/:tag", child: (_) {
+ return SearchPage(inputTag: r.args.params['tag']);
+ });
}
}
diff --git a/lib/pages/info/info_tabview.dart b/lib/pages/info/info_tabview.dart
index a3bbc87e..b7527f6e 100644
--- a/lib/pages/info/info_tabview.dart
+++ b/lib/pages/info/info_tabview.dart
@@ -1,5 +1,6 @@
import 'dart:ui' as ui;
import 'package:flutter/material.dart';
+import 'package:flutter_modular/flutter_modular.dart';
import 'package:kazumi/bean/widget/error_widget.dart';
import 'package:kazumi/bean/card/comments_card.dart';
import 'package:kazumi/bean/card/character_card.dart';
@@ -149,7 +150,8 @@ class _InfoTabViewState extends State<InfoTabView>
],
),
onPressed: () {
- // TODO: Search with selected tag.
+ Modular.to.pushNamed(
+ '/search/${widget.bangumiItem.tags[index].name}');
},
);
}).toList(),
diff --git a/lib/pages/popular/popular_controller.dart b/lib/pages/popular/popular_controller.dart
index 0c63e800..68e4cf34 100644
--- a/lib/pages/popular/popular_controller.dart
+++ b/lib/pages/popular/popular_controller.dart
@@ -11,9 +11,6 @@ class PopularController = _PopularController with _$PopularController;
abstract class _PopularController with Store {
final ScrollController scrollController = ScrollController();
- @observable
- String searchKeyword = '';
-
@observable
String currentTag = '';
@@ -31,10 +28,6 @@ abstract class _PopularController with Store {
@observable
bool isTimeOut = false;
- void setSearchKeyword(String s) {
- searchKeyword = s;
- }
-
void setCurrentTag(String s) {
currentTag = s;
}
@@ -67,26 +60,4 @@ abstract class _PopularController with Store {
isLoadingMore = false;
isTimeOut = bangumiList.isEmpty;
}
-
- Future<void> searchBangumi(String keyword) async {
- currentTag = '';
- isLoadingMore = true;
- if (RegExp(r'^[0-9]+$').hasMatch(keyword)) {
- // 纯数字时调用ID查询
- final id = int.parse(keyword);
- final BangumiItem? item = await BangumiHTTP.getBangumiInfoByID(id);
-
- bangumiList.clear();
- if (item != null) {
- bangumiList.add(item); // 单个结果转为列表
- }
- } else {
- // 非数字时调用普通搜索
- var result = await BangumiHTTP.bangumiSearch(keyword);
- bangumiList.clear();
- bangumiList.addAll(result);
- }
- isLoadingMore = false;
- isTimeOut = bangumiList.isEmpty;
- }
}
diff --git a/lib/pages/popular/popular_controller.g.dart b/lib/pages/popular/popular_controller.g.dart
index 6fcbdd9a..5810c2e7 100644
--- a/lib/pages/popular/popular_controller.g.dart
+++ b/lib/pages/popular/popular_controller.g.dart
@@ -9,22 +9,6 @@ part of 'popular_controller.dart';
// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
mixin _$PopularController on _PopularController, Store {
- late final _$searchKeywordAtom =
- Atom(name: '_PopularController.searchKeyword', context: context);
-
- @override
- String get searchKeyword {
- _$searchKeywordAtom.reportRead();
- return super.searchKeyword;
- }
-
- @override
- set searchKeyword(String value) {
- _$searchKeywordAtom.reportWrite(value, super.searchKeyword, () {
- super.searchKeyword = value;
- });
- }
-
late final _$currentTagAtom =
Atom(name: '_PopularController.currentTag', context: context);
@@ -108,7 +92,6 @@ mixin _$PopularController on _PopularController, Store {
@override
String toString() {
return '''
-searchKeyword: ${searchKeyword},
currentTag: ${currentTag},
bangumiList: ${bangumiList},
trendList: ${trendList},
diff --git a/lib/pages/popular/popular_page.dart b/lib/pages/popular/popular_page.dart
index fe278799..c1a2d821 100644
--- a/lib/pages/popular/popular_page.dart
+++ b/lib/pages/popular/popular_page.dart
@@ -3,10 +3,9 @@ import 'package:flutter_modular/flutter_modular.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/bean/widget/error_widget.dart';
import 'package:kazumi/pages/popular/popular_controller.dart';
-import 'package:kazumi/utils/utils.dart';
+import 'package:kazumi/bean/card/bangumi_card.dart';
import 'package:kazumi/utils/constants.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:kazumi/bean/card/bangumi_card.dart';
import 'package:flutter/services.dart';
import 'package:window_manager/window_manager.dart';
import 'package:kazumi/bean/appbar/sys_app_bar.dart';
@@ -27,12 +26,10 @@ class _PopularPageState extends State<PopularPage>
with AutomaticKeepAliveClientMixin {
DateTime? _lastPressedAt;
bool showTagFilter = true;
- bool showSearchBar = false;
late NavigationBarState navigationBarState;
final FocusNode _focusNode = FocusNode();
final ScrollController scrollController = ScrollController();
final PopularController popularController = Modular.get<PopularController>();
- late TextEditingController searchController;
@override
bool get wantKeepAlive => true;
@@ -44,13 +41,6 @@ class _PopularPageState extends State<PopularPage>
if (popularController.trendList.isEmpty) {
popularController.queryBangumiByTrend();
}
- showSearchBar = popularController.searchKeyword.isNotEmpty;
- searchController =
- TextEditingController(text: popularController.searchKeyword);
-
- searchController.addListener(() {
- setState(() {});
- });
}
@override
@@ -63,7 +53,6 @@ class _PopularPageState extends State<PopularPage>
void dispose() {
_focusNode.dispose();
scrollController.removeListener(scrollListener);
- searchController.dispose();
super.dispose();
}
@@ -72,13 +61,11 @@ class _PopularPageState extends State<PopularPage>
if (scrollController.position.pixels >=
scrollController.position.maxScrollExtent - 200 &&
!popularController.isLoadingMore) {
- if (popularController.searchKeyword == '') {
- KazumiLogger().log(Level.info, 'Popular is loading more');
- if (popularController.currentTag != '') {
- popularController.queryBangumiByTag();
- } else {
- popularController.queryBangumiByTrend();
- }
+ KazumiLogger().log(Level.info, 'Popular is loading more');
+ if (popularController.currentTag != '') {
+ popularController.queryBangumiByTag();
+ } else {
+ popularController.queryBangumiByTrend();
}
}
}
@@ -135,44 +122,15 @@ class _PopularPageState extends State<PopularPage>
backgroundColor: Colors.transparent,
actions: [
IconButton(
- onPressed: () async {
- if (!showSearchBar) {
- setState(() {
- showSearchBar = true;
- });
- _focusNode.requestFocus();
- } else {
- _focusNode.unfocus();
- setState(() {
- showSearchBar = false;
- });
- popularController.setCurrentTag('');
- popularController.clearBangumiList();
- popularController.setSearchKeyword('');
- searchController.clear();
- }
+ onPressed: () {
+ Modular.to.pushNamed('/search/');
},
- icon: showSearchBar
- ? const Text("取消")
- : const Icon(Icons.search))
+ icon: const Icon(Icons.search))
],
- title: Stack(
- children: [
- Positioned.fill(
- child: GestureDetector(
- behavior: HitTestBehavior.translucent,
- onPanStart: (_) => windowManager.startDragging(),
- child: Container(),
- ),
- ),
- Padding(
- padding: EdgeInsets.only(top: (Utils.isDesktop()) ? 8 : 0),
- child: Visibility(
- visible: showSearchBar,
- child: searchBar(),
- ),
- ),
- ],
+ title: GestureDetector(
+ behavior: HitTestBehavior.translucent,
+ onPanStart: (_) => windowManager.startDragging(),
+ child: Container(),
),
),
body: Column(
@@ -201,7 +159,7 @@ class _PopularPageState extends State<PopularPage>
SliverPadding(
padding: const EdgeInsets.fromLTRB(
StyleString.cardSpace, 0, StyleString.cardSpace, 0),
- sliver: Observer(builder: (context) {
+ sliver: Observer(builder: (_) {
if (popularController.isTimeOut) {
return SliverToBoxAdapter(
child: SizedBox(
@@ -211,11 +169,7 @@ class _PopularPageState extends State<PopularPage>
actions: [
GeneralErrorButton(
onPressed: () {
- if (popularController.searchKeyword !=
- '') {
- popularController.searchBangumi(
- popularController.searchKeyword);
- } else if (popularController
+ if (popularController
.trendList.isEmpty) {
popularController
.queryBangumiByTrend();
@@ -231,8 +185,7 @@ class _PopularPageState extends State<PopularPage>
);
}
return contentGrid(
- (popularController.currentTag == '' &&
- popularController.searchKeyword == '')
+ (popularController.currentTag == '')
? popularController.trendList
: popularController.bangumiList,
orientation);
@@ -327,10 +280,6 @@ class _PopularPageState extends State<PopularPage>
onPressed: () async {
_focusNode.unfocus();
scrollController.jumpTo(0.0);
- popularController.setSearchKeyword('');
- setState(() {
- showSearchBar = false;
- });
popularController.setCurrentTag(filter);
await popularController.queryBangumiByTag(
type: 'init');
@@ -345,47 +294,4 @@ class _PopularPageState extends State<PopularPage>
],
);
}
-
- Widget searchBar() {
- final isLight = Theme.of(context).brightness == Brightness.light;
- return TextField(
- controller: searchController,
- focusNode: _focusNode,
- cursorColor: Theme.of(context).colorScheme.primary,
- decoration: InputDecoration(
- floatingLabelBehavior: FloatingLabelBehavior.never,
- alignLabelWithHint: true,
- contentPadding: const EdgeInsets.symmetric(vertical: 8, horizontal: 8),
- border: const OutlineInputBorder(
- borderRadius: BorderRadius.all(Radius.circular(8)),
- ),
- suffixIcon: searchController.text.isNotEmpty
- ? IconButton(
- icon: const Icon(Icons.cancel),
- onPressed: () {
- searchController.clear();
- popularController.setSearchKeyword('');
- _focusNode.unfocus();
- popularController.setCurrentTag('');
- popularController.clearBangumiList();
- },
- )
- : null,
- ),
- style: TextStyle(color: isLight ? Colors.black87 : Colors.white70),
- onChanged: (_) {
- scrollController.jumpTo(0.0);
- },
- onSubmitted: (t) async {
- popularController.setSearchKeyword(t);
- if (t != '') {
- await popularController
- .searchBangumi(popularController.searchKeyword);
- } else {
- popularController.setCurrentTag('');
- popularController.clearBangumiList();
- }
- },
- );
- }
}
diff --git a/lib/pages/search/search_controller.dart b/lib/pages/search/search_controller.dart
new file mode 100644
index 00000000..9fada31d
--- /dev/null
+++ b/lib/pages/search/search_controller.dart
@@ -0,0 +1,49 @@
+import 'package:mobx/mobx.dart';
+import 'package:kazumi/modules/bangumi/bangumi_item.dart';
+import 'package:kazumi/request/bangumi.dart';
+import 'package:kazumi/utils/search_parser.dart';
+
+part 'search_controller.g.dart';
+
+class SearchPageController = _SearchPageController with _$SearchPageController;
+
+abstract class _SearchPageController with Store {
+ @observable
+ bool isLoading = false;
+
+ @observable
+ bool isTimeOut = false;
+
+ @observable
+ String searchKeyword = '';
+
+ @observable
+ ObservableList<BangumiItem> bangumiList = ObservableList.of([]);
+
+ Future<void> searchBangumi(String input, {String type = 'add'}) async {
+ if (type != 'add') {
+ bangumiList.clear();
+ }
+ isLoading = true;
+ isTimeOut = false;
+ SearchParser parser = SearchParser(input);
+ String? idString = parser.parseId();
+ String? tag = parser.parseTag();
+ String keywords = parser.parseKeywords();
+ if (idString != null) {
+ final id = int.tryParse(idString);
+ if (id != null) {
+ final BangumiItem? item = await BangumiHTTP.getBangumiInfoByID(id);
+ if (item != null) {
+ bangumiList.add(item);
+ }
+ return;
+ }
+ }
+ var result =
+ await BangumiHTTP.bangumiSearch(keywords, tags: [if (tag != null) tag], offset: bangumiList.length);
+ bangumiList.addAll(result);
+ isLoading = false;
+ isTimeOut = bangumiList.isEmpty;
+ }
+}
diff --git a/lib/pages/search/search_controller.g.dart b/lib/pages/search/search_controller.g.dart
new file mode 100644
index 00000000..9648b27e
--- /dev/null
+++ b/lib/pages/search/search_controller.g.dart
@@ -0,0 +1,85 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'search_controller.dart';
+
+// **************************************************************************
+// StoreGenerator
+// **************************************************************************
+
+// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
+
+mixin _$SearchPageController on _SearchPageController, Store {
+ late final _$isLoadingAtom =
+ Atom(name: '_SearchPageController.isLoading', context: context);
+
+ @override
+ bool get isLoading {
+ _$isLoadingAtom.reportRead();
+ return super.isLoading;
+ }
+
+ @override
+ set isLoading(bool value) {
+ _$isLoadingAtom.reportWrite(value, super.isLoading, () {
+ super.isLoading = value;
+ });
+ }
+
+ late final _$isTimeOutAtom =
+ Atom(name: '_SearchPageController.isTimeOut', context: context);
+
+ @override
+ bool get isTimeOut {
+ _$isTimeOutAtom.reportRead();
+ return super.isTimeOut;
+ }
+
+ @override
+ set isTimeOut(bool value) {
+ _$isTimeOutAtom.reportWrite(value, super.isTimeOut, () {
+ super.isTimeOut = value;
+ });
+ }
+
+ late final _$searchKeywordAtom =
+ Atom(name: '_SearchPageController.searchKeyword', context: context);
+
+ @override
+ String get searchKeyword {
+ _$searchKeywordAtom.reportRead();
+ return super.searchKeyword;
+ }
+
+ @override
+ set searchKeyword(String value) {
+ _$searchKeywordAtom.reportWrite(value, super.searchKeyword, () {
+ super.searchKeyword = value;
+ });
+ }
+
+ late final _$bangumiListAtom =
+ Atom(name: '_SearchPageController.bangumiList', context: context);
+
+ @override
+ ObservableList<BangumiItem> get bangumiList {
+ _$bangumiListAtom.reportRead();
+ return super.bangumiList;
+ }
+
+ @override
+ set bangumiList(ObservableList<BangumiItem> value) {
+ _$bangumiListAtom.reportWrite(value, super.bangumiList, () {
+ super.bangumiList = value;
+ });
+ }
+
+ @override
+ String toString() {
+ return '''
+isLoading: ${isLoading},
+isTimeOut: ${isTimeOut},
+searchKeyword: ${searchKeyword},
+bangumiList: ${bangumiList}
+ ''';
+ }
+}
diff --git a/lib/pages/search/search_page.dart b/lib/pages/search/search_page.dart
new file mode 100644
index 00000000..3a402f55
--- /dev/null
+++ b/lib/pages/search/search_page.dart
@@ -0,0 +1,143 @@
+import 'package:flutter/material.dart';
+import 'package:kazumi/utils/constants.dart';
+import 'package:kazumi/bean/card/bangumi_card.dart';
+import 'package:flutter_modular/flutter_modular.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:kazumi/bean/widget/error_widget.dart';
+import 'package:kazumi/pages/search/search_controller.dart';
+
+class SearchPage extends StatefulWidget {
+ const SearchPage({super.key, this.inputTag = ''});
+
+ final String inputTag;
+
+ @override
+ State<SearchPage> createState() => _SearchPageState();
+}
+
+class _SearchPageState extends State<SearchPage> {
+ final SearchController searchController = SearchController();
+ final SearchPageController searchPageController =
+ Modular.get<SearchPageController>();
+ final ScrollController scrollController = ScrollController();
+
+ @override
+ void initState() {
+ super.initState();
+ scrollController.addListener(scrollListener);
+ }
+
+ @override
+ void dispose() {
+ searchPageController.bangumiList.clear();
+ scrollController.removeListener(scrollListener);
+ super.dispose();
+ }
+
+ void scrollListener() {
+ if (scrollController.position.pixels >=
+ scrollController.position.maxScrollExtent - 200 &&
+ !searchPageController.isLoading &&
+ searchController.text != '' && searchPageController.bangumiList.length >= 20) {
+ debugPrint('Search results is loading more');
+ searchPageController.searchBangumi(searchController.text, type: 'add');
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ if (widget.inputTag != '') {
+ final String tagString = 'tag:${Uri.decodeComponent(widget.inputTag)}';
+ searchController.text = tagString;
+ searchPageController.searchBangumi(tagString, type: 'init');
+ }
+ });
+ return Scaffold(
+ appBar: AppBar(
+ forceMaterialTransparency: true,
+ title: const Text("搜索"),
+ ),
+ body: Column(
+ children: [
+ Padding(
+ padding: const EdgeInsets.fromLTRB(16, 0, 16, 0),
+ child: SearchAnchor.bar(
+ searchController: searchController,
+ suggestionsBuilder: (context, controller) => <Widget>[
+ Container(
+ height: 400,
+ alignment: Alignment.center,
+ child: Text("无可用搜索建议,回车以直接检索"),
+ ),
+ ],
+ onSubmitted: (value) {
+ searchPageController.searchBangumi(value, type: 'init');
+ searchController.closeView(value);
+ },
+ ),
+ ),
+ Expanded(
+ child: Padding(
+ padding: const EdgeInsets.fromLTRB(16, 16, 16, 0),
+ child: Observer(builder: (context) {
+ if (searchPageController.isTimeOut) {
+ return Center(
+ child: SizedBox(
+ height: 400,
+ child: GeneralErrorWidget(
+ errMsg: '什么都没有找到 (´;ω;`)',
+ actions: [
+ GeneralErrorButton(
+ onPressed: () {
+ searchPageController.searchBangumi(
+ searchController.text,
+ type: 'init');
+ },
+ text: '点击重试',
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+ if (searchPageController.isLoading &&
+ searchPageController.bangumiList.isEmpty) {
+ return Center(child: CircularProgressIndicator());
+ }
+ return GridView.builder(
+ controller: scrollController,
+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+ mainAxisSpacing: StyleString.cardSpace - 2,
+ crossAxisSpacing: StyleString.cardSpace,
+ crossAxisCount: MediaQuery.of(context).orientation !=
+ Orientation.portrait
+ ? 6
+ : 3,
+ mainAxisExtent: MediaQuery.of(context).size.width /
+ (MediaQuery.of(context).orientation !=
+ Orientation.portrait
+ ? 6
+ : 3) /
+ 0.65 +
+ MediaQuery.textScalerOf(context).scale(32.0),
+ ),
+ itemCount: searchPageController.bangumiList.isNotEmpty
+ ? searchPageController.bangumiList.length
+ : 10,
+ itemBuilder: (context, index) {
+ return searchPageController.bangumiList.isNotEmpty
+ ? BangumiCardV(
+ bangumiItem:
+ searchPageController.bangumiList[index])
+ : Container();
+ },
+ );
+ }),
+ ),
+ )
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/request/bangumi.dart b/lib/request/bangumi.dart
index 0d88929e..6f072bc7 100644
--- a/lib/request/bangumi.dart
+++ b/lib/request/bangumi.dart
@@ -164,7 +164,7 @@ class BangumiHTTP {
return bangumiList;
}
- static Future<List<BangumiItem>> bangumiSearch(String keyword) async {
+ static Future<List<BangumiItem>> bangumiSearch(String keyword, {List<String> tags = const [], int offset = 0}) async {
List<BangumiItem> bangumiList = [];
var params = <String, dynamic>{
@@ -172,7 +172,7 @@ class BangumiHTTP {
'sort': 'rank',
"filter": {
"type": [2],
- "tag": [],
+ "tag": tags,
"rank": [">0", "<=99999"],
"nsfw": false
},
@@ -180,7 +180,7 @@ class BangumiHTTP {
try {
final res = await Request().post(
- Api.formatUrl(Api.bangumiRankSearch, [100, 0]),
+ Api.formatUrl(Api.bangumiRankSearch, [20, offset]),
data: params,
options: Options(
headers: bangumiHTTPHeader, contentType: 'application/json'));
diff --git a/lib/utils/search_parser.dart b/lib/utils/search_parser.dart
new file mode 100644
index 00000000..846e79aa
--- /dev/null
+++ b/lib/utils/search_parser.dart
@@ -0,0 +1,23 @@
+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);
+
+ SearchParser(this.query);
+
+ String? parseId() {
+ final match = _idRegExp.firstMatch(query);
+ return match != null ? match.group(1) : null;
+ }
+
+ String? parseTag() {
+ final match = _tagRegExp.firstMatch(query);
+ return match != null ? match.group(1) : null;
+ }
+
+ String parseKeywords() {
+ String cleaned = query.replaceAll(_idRegExp, '');
+ cleaned = cleaned.replaceAll(_tagRegExp, '');
+ return cleaned.trim();
+ }
+}
\ No newline at end of file