基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
suport bangumi alias as search keyword
Predidit76b4d45ab897
diff --git a/lib/bean/widget/error_widget.dart b/lib/bean/widget/error_widget.dartnew file mode 100644index 00000000..8d6cdc56--- /dev/null+++ b/lib/bean/widget/error_widget.dart@@ -0,0 +1,53 @@+import 'package:flutter/material.dart';++class GeneralErrorWidget extends StatelessWidget {+ const GeneralErrorWidget(+ {required this.errMsg,+ this.fn,+ this.showButton = true,+ this.btnText,+ super.key});++ final String? errMsg;+ final bool showButton;+ final Function()? fn;+ final String? btnText;++ @override+ Widget build(BuildContext context) {+ return Column(+ crossAxisAlignment: CrossAxisAlignment.center,+ mainAxisAlignment: MainAxisAlignment.center,+ children: [+ const SizedBox(height: 30),+ LayoutBuilder(+ builder: (BuildContext context, BoxConstraints constraints) {+ return ConstrainedBox(+ constraints: BoxConstraints(+ maxWidth: constraints.maxWidth * 2 / 3,+ ),+ child: Text(+ errMsg ?? '请求异常',+ textAlign: TextAlign.center,+ style: Theme.of(context).textTheme.titleSmall,+ ),+ );+ },+ ),+ const SizedBox(height: 20),+ showButton ? FilledButton.tonal(+ onPressed: fn,+ style: ButtonStyle(+ backgroundColor: WidgetStateProperty.resolveWith((states) {+ return Theme.of(context).colorScheme.primary.withAlpha(20);+ }),+ ),+ child: Text(+ btnText ?? '点击重试',+ style: TextStyle(color: Theme.of(context).colorScheme.primary),+ ),+ ) : Container(),+ ],+ );+ }+}diff --git a/lib/main.dart b/lib/main.dartindex 879839d7..56b59a68 100644--- a/lib/main.dart+++ b/lib/main.dart@@ -14,6 +14,7 @@ import 'package:media_kit/media_kit.dart';import 'package:window_manager/window_manager.dart';import 'package:kazumi/pages/error/storage_error_page.dart';import 'package:provider/provider.dart';+import 'package:flutter_localizations/flutter_localizations.dart';void main() async {WidgetsFlutterBinding.ensureInitialized();@@ -33,6 +34,13 @@ void main() async {} catch (_) {runApp(MaterialApp(title: '初始化失败',+ localizationsDelegates: GlobalMaterialLocalizations.delegates,+ supportedLocales: const [+ Locale.fromSubtags(+ languageCode: 'zh', scriptCode: 'Hans', countryCode: "CN")+ ],+ locale: const Locale.fromSubtags(+ languageCode: 'zh', scriptCode: 'Hans', countryCode: "CN"),builder: (context, child) {return const StorageErrorPage();}));diff --git a/lib/modules/bangumi/bangumi_item.dart b/lib/modules/bangumi/bangumi_item.dartindex 0dc6650c..ac89d94e 100644--- a/lib/modules/bangumi/bangumi_item.dart+++ b/lib/modules/bangumi/bangumi_item.dart@@ -8,7 +8,6 @@ part 'bangumi_item.g.dart';class BangumiItem {@HiveField(0)int id;- // String? url;@HiveField(1)int type;@HiveField(2)@@ -21,54 +20,78 @@ class BangumiItem {String airDate;@HiveField(6)int airWeekday;- // Rating? rating;@HiveField(7)int rank;@HiveField(8)Map<String, String> images;- // Map<String, int>? collection;@HiveField(9, defaultValue: [])List<BangumiTag> tags;+ @HiveField(10, defaultValue: [])+ List<String> alias;- BangumiItem({- required this.id,- // this.url,- required this.type,- required this.name,- required this.nameCn,- required this.summary,- required this.airDate,- required this.airWeekday,- // this.rating,- required this.rank,- required this.images,- // this.collection,- required this.tags- });+ BangumiItem(+ {required this.id,+ required this.type,+ required this.name,+ required this.nameCn,+ required this.summary,+ required this.airDate,+ required this.airWeekday,+ required this.rank,+ required this.images,+ required this.tags,+ required this.alias});factory BangumiItem.fromJson(Map<String, dynamic> json) {+ List<String> parseBangumiAliases(Map<String, dynamic> jsonData) {+ if (jsonData.containsKey('infobox') && jsonData['infobox'] is List) {+ final List<dynamic> infobox = jsonData['infobox'];+ for (var item in infobox) {+ if (item is Map<String, dynamic> && item['key'] == '别名') {+ final dynamic value = item['value'];+ if (value is List) {+ return value+ .map<String>((element) {+ if (element is Map<String, dynamic> &&+ element.containsKey('v')) {+ return element['v'].toString();+ }+ return '';+ })+ .where((alias) => alias.isNotEmpty)+ .toList();+ }+ }+ }+ }+ return [];+ }List list = json['tags'] ?? [];- List<BangumiTag> tagList =- list.map((i) => BangumiTag.fromJson(i)).toList();+ List<String> bangumiAlias = parseBangumiAliases(json);+ List<BangumiTag> tagList = list.map((i) => BangumiTag.fromJson(i)).toList();return BangumiItem(- id: json['id'],- type: json['type'] ?? 2,- name: json['name'] ?? '',- nameCn: (json['name_cn'] ?? '') == '' ? (((json['nameCN'] ?? '') == '') ? json['name'] : json['nameCN']) : json['name_cn'],- summary: json['summary'] ?? '',- airDate: json['air_date'] ?? json ['date'] ?? '',- airWeekday: json['air_weekday'] ?? Utils.dateStringToWeekday(json['date'] ?? '2000-11-11'),- // rating: Rating.fromJson(json['rating']),- rank: json['rating']['rank'] ?? json['rank'] ?? 0,- images: Map<String, String>.from(json['images'] ?? {- "large": json['image'],- "common": "",- "medium": "",- "small": "",- "grid": ""- },),- tags: tagList- // collection: Map<String, int>.from(json['collection']),- );+ id: json['id'],+ type: json['type'] ?? 2,+ name: json['name'] ?? '',+ nameCn: (json['name_cn'] ?? '') == ''+ ? (((json['nameCN'] ?? '') == '') ? json['name'] : json['nameCN'])+ : json['name_cn'],+ summary: json['summary'] ?? '',+ airDate: json['air_date'] ?? json['date'] ?? '',+ airWeekday: json['air_weekday'] ??+ Utils.dateStringToWeekday(json['date'] ?? '2000-11-11'),+ rank: json['rating']['rank'] ?? json['rank'] ?? 0,+ images: Map<String, String>.from(+ json['images'] ??+ {+ "large": json['image'],+ "common": "",+ "medium": "",+ "small": "",+ "grid": ""+ },+ ),+ tags: tagList,+ alias: bangumiAlias);}}diff --git a/lib/modules/bangumi/bangumi_item.g.dart b/lib/modules/bangumi/bangumi_item.g.dartindex 9bd65754..77180256 100644--- a/lib/modules/bangumi/bangumi_item.g.dart+++ b/lib/modules/bangumi/bangumi_item.g.dart@@ -27,13 +27,14 @@ class BangumiItemAdapter extends TypeAdapter<BangumiItem> {rank: fields[7] as int,images: (fields[8] as Map).cast<String, String>(),tags: fields[9] == null ? [] : (fields[9] as List).cast<BangumiTag>(),+ alias: fields[10] == null ? [] : (fields[10] as List).cast<String>(),);}@overridevoid write(BinaryWriter writer, BangumiItem obj) {writer- ..writeByte(10)+ ..writeByte(11)..writeByte(0)..write(obj.id)..writeByte(1)@@ -53,7 +54,9 @@ class BangumiItemAdapter extends TypeAdapter<BangumiItem> {..writeByte(8)..write(obj.images)..writeByte(9)- ..write(obj.tags);+ ..write(obj.tags)+ ..writeByte(10)+ ..write(obj.alias);}@overridediff --git a/lib/pages/error/http_error.dart b/lib/pages/error/http_error.dartdeleted file mode 100644index 051d553e..00000000--- a/lib/pages/error/http_error.dart+++ /dev/null@@ -1,46 +0,0 @@-import 'package:flutter/material.dart';--class HttpError extends StatelessWidget {- const HttpError(- {required this.errMsg, required this.fn, this.btnText, super.key});-- final String? errMsg;- final Function()? fn;- final String? btnText;-- @override- Widget build(BuildContext context) {- return SliverToBoxAdapter(- child: SizedBox(- height: 400,- child: Column(- crossAxisAlignment: CrossAxisAlignment.center,- mainAxisAlignment: MainAxisAlignment.center,- children: [- const SizedBox(height: 30),- Text(- errMsg ?? '请求异常',- textAlign: TextAlign.center,- style: Theme.of(context).textTheme.titleSmall,- ),- const SizedBox(height: 20),- FilledButton.tonal(- onPressed: () {- fn!();- },- style: ButtonStyle(- backgroundColor: WidgetStateProperty.resolveWith((states) {- return Theme.of(context).colorScheme.primary.withAlpha(20);- }),- ),- child: Text(- btnText ?? '点击重试',- style: TextStyle(color: Theme.of(context).colorScheme.primary),- ),- ),- ],- ),- ),- );- }-}diff --git a/lib/pages/error/storage_error_page.dart b/lib/pages/error/storage_error_page.dartindex b3509fd6..c9af50b0 100644--- a/lib/pages/error/storage_error_page.dart+++ b/lib/pages/error/storage_error_page.dart@@ -1,6 +1,6 @@import 'dart:io';-import 'package:flutter/material.dart';+import 'package:kazumi/bean/widget/error_widget.dart';class StorageErrorPage extends StatelessWidget {const StorageErrorPage({@@ -14,17 +14,12 @@ class StorageErrorPage extends StatelessWidget {title: const Text('内部错误'),),body: Center(- child: Column(- mainAxisAlignment: MainAxisAlignment.center,- crossAxisAlignment: CrossAxisAlignment.center,- children: [- const Text('存储初始化错误: 检测到一个Kazumi实例已在运行, 请勿重复启动该程序。(0x02)'),- TextButton(- onPressed: () {- exit(0);- },- child: const Text('退出程序'))- ],+ child: GeneralErrorWidget(+ errMsg: '存储初始化错误: 检测到一个Kazumi实例已在运行, 请勿重复启动该程序。(0x02)',+ btnText: '退出程序',+ fn: () {+ exit(0);+ },),),);diff --git a/lib/pages/info/info_controller.dart b/lib/pages/info/info_controller.dartindex 33aa6c6a..100d6dc6 100644--- a/lib/pages/info/info_controller.dart+++ b/lib/pages/info/info_controller.dart@@ -49,6 +49,7 @@ abstract class _InfoController with Store {bangumiItem.rank = value.rank;bangumiItem.airDate = value.airDate;bangumiItem.airWeekday = value.airWeekday;+ bangumiItem.alias = value.alias;}collectController.updateLocalCollect(bangumiItem);}diff --git a/lib/pages/info/info_page.dart b/lib/pages/info/info_page.dartindex 631fe3fd..55d75291 100644--- a/lib/pages/info/info_page.dart+++ b/lib/pages/info/info_page.dart@@ -2,6 +2,7 @@ import 'dart:ui';import 'package:flutter/material.dart';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/info/info_controller.dart';import 'package:kazumi/bean/card/bangumi_info_card.dart';import 'package:flutter_mobx/flutter_mobx.dart';@@ -42,11 +43,12 @@ class _InfoPageState extends State<InfoPage>// Because the gap between different bangumi API reponse is too large, sometimes we need to query the bangumi info again// We need the type parameter to determine whether to attach the new data to the old data// We can't generally replace the old data with the new data, because the old data containes images url, update them will cause the image to reload and flicker- if (infoController.bangumiItem.summary == '' || infoController.bangumiItem.tags.isEmpty) {+ if (infoController.bangumiItem.summary == '' ||+ infoController.bangumiItem.tags.isEmpty) {queryBangumiInfoByID(infoController.bangumiItem.id, type: 'attach');}queryManager = QueryManager();- queryManager.querySource(popularController.keyword);+ queryManager.queryAllSource(popularController.keyword);tabController =TabController(length: pluginsController.pluginList.length, vsync: this);}@@ -70,6 +72,28 @@ class _InfoPageState extends State<InfoPage>}}+ void showAliasSearchDialog(String pluginName) {+ if (infoController.bangumiItem.alias.isEmpty) {+ KazumiDialog.showToast(message: '无可用别名');+ return;+ }+ KazumiDialog.show(builder: (context) {+ return Dialog(+ child: ListView(+ shrinkWrap: true,+ children: infoController.bangumiItem.alias+ .map((alias) => ListTile(+ title: Text(alias),+ onTap: () {+ KazumiDialog.dismiss();+ queryManager.querySource(alias, pluginName);+ },+ ))+ .toList(),+ ));+ });+ }+@overrideWidget build(BuildContext context) {return PopScope(@@ -214,7 +238,37 @@ class _InfoPageState extends State<InfoPage>}}}- return ListView(children: cardList);+ return infoController.pluginSearchStatus[plugin.name] ==+ 'pending'+ ? const Center(child: CircularProgressIndicator())+ : (infoController.pluginSearchStatus[plugin.name] ==+ 'error'+ ? GeneralErrorWidget(+ errMsg:+ '${plugin.name} 检索失败 重试或左右滑动以切换到其他视频来源',+ btnText: '重试',+ fn: () {+ queryManager.querySource(+ popularController.keyword,+ plugin.name);+ })+ : cardList.isEmpty+ ? (infoController+ .bangumiItem.alias.isNotEmpty+ ? GeneralErrorWidget(+ errMsg:+ '${plugin.name} 无结果 使用别名或左右滑动以切换到其他视频来源',+ btnText: '别名检索',+ fn: () {+ showAliasSearchDialog(+ plugin.name);+ })+ : GeneralErrorWidget(+ errMsg:+ '${plugin.name} 无结果 左右滑动以切换到其他视频来源',+ showButton: false,+ ))+ : ListView(children: cardList));}),),),diff --git a/lib/pages/popular/popular_controller.dart b/lib/pages/popular/popular_controller.dartindex 9cb26831..bdbf15b7 100644--- a/lib/pages/popular/popular_controller.dart+++ b/lib/pages/popular/popular_controller.dart@@ -13,7 +13,6 @@ abstract class _PopularController with Store {String keyword = '';String searchKeyword = '';- bool isSearching = false;@observableString currentTag = '';@@ -30,7 +29,6 @@ abstract class _PopularController with Store {bool isTimeOut = false;void setSearchKeyword(String s) {- isSearching = s.isNotEmpty;searchKeyword = s;}diff --git a/lib/pages/popular/popular_page.dart b/lib/pages/popular/popular_page.dartindex 586a21ec..cbe10a53 100644--- a/lib/pages/popular/popular_page.dart+++ b/lib/pages/popular/popular_page.dart@@ -1,10 +1,10 @@import 'package:flutter/material.dart';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/utils/constants.dart';-import 'package:kazumi/pages/error/http_error.dart';import 'package:flutter_mobx/flutter_mobx.dart';import 'package:kazumi/bean/card/bangumi_card.dart';import 'package:flutter/services.dart';@@ -43,7 +43,6 @@ class _PopularPageState extends State<PopularPage>if (popularController.bangumiList.isEmpty) {popularController.queryBangumiFeed();}- popularController.isSearching = popularController.searchKeyword.isNotEmpty;showSearchBar = popularController.searchKeyword.isNotEmpty;}@@ -55,7 +54,6 @@ class _PopularPageState extends State<PopularPage>@overridevoid dispose() {- popularController.isSearching = false;_focusNode.dispose();scrollController.removeListener(scrollListener);super.dispose();@@ -145,7 +143,8 @@ class _PopularPageState extends State<PopularPage>showSearchBar = false;});popularController.setCurrentTag('');- await popularController.queryBangumiFeed(type: 'init');+ await popularController.queryBangumiFeed(+ type: 'init');} else {popularController.setSearchKeyword('');setState(() {@@ -214,11 +213,16 @@ class _PopularPageState extends State<PopularPage>sliver: Observer(builder: (context) {if (popularController.bangumiList.isEmpty &&popularController.isTimeOut) {- return HttpError(- errMsg: '什么都没有找到 (´;ω;`)',- fn: () {- popularController.queryBangumiList();- },+ return SliverToBoxAdapter(+ child: SizedBox(+ height: 400,+ child: GeneralErrorWidget(+ errMsg: '什么都没有找到 (´;ω;`)',+ fn: () {+ popularController.queryBangumiList();+ },+ ),+ ),);}if (popularController.bangumiList.isEmpty &&@@ -325,7 +329,8 @@ class _PopularPageState extends State<PopularPage>onPressed: () async {scrollController.jumpTo(0.0);popularController.setCurrentTag('');- await popularController.queryBangumiFeed(type: 'init');+ await popularController.queryBangumiFeed(+ type: 'init');},): FilledButton.tonal(@@ -338,7 +343,8 @@ class _PopularPageState extends State<PopularPage>showSearchBar = false;});popularController.setCurrentTag(filter);- await popularController.queryBangumiList(type: 'init');+ await popularController.queryBangumiList(+ type: 'init');},),),diff --git a/lib/request/query_manager.dart b/lib/request/query_manager.dartindex 50349371..76d02ab7 100644--- a/lib/request/query_manager.dart+++ b/lib/request/query_manager.dart@@ -1,4 +1,5 @@import 'dart:async';+import 'package:kazumi/modules/search/plugin_search_module.dart';import 'package:kazumi/plugins/plugins.dart';import 'package:flutter_modular/flutter_modular.dart';import 'package:kazumi/pages/info/info_controller.dart';@@ -10,7 +11,37 @@ class QueryManager {late StreamController _controller;bool _isCancelled = false;- Future<void> querySource(String keyword) async {+ Future<void> querySource(String keyword, String pluginName) async {+ for (PluginSearchResponse pluginSearchResponse+ in infoController.pluginSearchResponseList) {+ if (pluginSearchResponse.pluginName == pluginName) {+ infoController.pluginSearchResponseList.remove(pluginSearchResponse);+ break;+ }+ }+ if (infoController.pluginSearchStatus.containsKey(pluginName)) {+ infoController.pluginSearchStatus[pluginName] = 'pending';+ }+ for (Plugin plugin in pluginsController.pluginList) {+ if (plugin.name == pluginName) {+ plugin.queryBangumi(keyword, shouldRethrow: true).then((result) {+ if (_isCancelled) return;++ infoController.pluginSearchStatus[plugin.name] = 'success';+ if (result.data.isNotEmpty) {+ pluginsController.validityTracker.markSearchValid(plugin.name);+ }+ infoController.pluginSearchResponseList.add(result);+ }).catchError((error) {+ if (_isCancelled) return;++ infoController.pluginSearchStatus[plugin.name] = 'error';+ });+ }+ }+ }++ Future<void> queryAllSource(String keyword) async {_controller = StreamController();infoController.pluginSearchResponseList.clear();