基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
fix(bangumi): preserve sync preferences and stabilize connection status
Predidit92e91e3df4bf
diff --git a/lib/bean/settings/bangumi_sync_settings.dart b/lib/bean/settings/bangumi_sync_settings.dartnew file mode 100644index 00000000..12d2de3c--- /dev/null+++ b/lib/bean/settings/bangumi_sync_settings.dart@@ -0,0 +1,145 @@+import 'package:flutter/material.dart';+import 'package:kazumi/bean/settings/settings_list.dart';+import 'package:kazumi/bean/widget/loading_indicator.dart';+import 'package:kazumi/services/storage/storage.dart';+import 'package:kazumi/services/sync/bangumi_sync_service.dart';++class BangumiSyncSettings extends StatefulWidget {+ const BangumiSyncSettings({+ super.key,+ this.onConfigure,+ this.enabled = true,+ this.margin,+ });++ final Future<void> Function()? onConfigure;+ final bool enabled;+ final EdgeInsetsGeometry? margin;++ @override+ State<BangumiSyncSettings> createState() => _BangumiSyncSettingsState();+}++class _BangumiSyncSettingsState extends State<BangumiSyncSettings> {+ final _bangumi = BangumiSyncService();+ bool _isUpdating = false;+ String? _actionError;++ Future<void> _run(Future<void> Function() action) async {+ if (_isUpdating || _bangumi.isConnecting || !widget.enabled) return;+ setState(() {+ _isUpdating = true;+ _actionError = null;+ });+ try {+ await action();+ } catch (e) {+ if (mounted) {+ _actionError = _bangumi.lastError == null+ ? BangumiSyncService.describeError(e)+ : null;+ }+ } finally {+ if (mounted) setState(() => _isUpdating = false);+ }+ }++ @override+ Widget build(BuildContext context) {+ return ListenableBuilder(+ listenable: _bangumi,+ builder: (context, _) {+ final syncEnabled = GStorage.getSetting(SettingsKeys.bangumiSyncEnable);+ final busy = _isUpdating || _bangumi.isConnecting;+ final error = _actionError ?? _bangumi.lastError;+ final canInteract = widget.enabled && !busy;+ final description = busy+ ? '正在等待或验证连接,请稍候'+ : error != null+ ? '$error${syncEnabled ? '\n同步开关已保留,下次同步时会重新尝试连接' : ''}'+ : syncEnabled+ ? '同步已开启'+ : '同步已关闭,开启后自动同步追番状态';+ return SettingsSection(+ title: const Text('Bangumi'),+ margin: widget.margin,+ tiles: [+ SettingsTile.switchTile(+ leading: Icons.sync_rounded,+ title: const Text('Bangumi 同步'),+ description: const Text('与 Bangumi 自动同步追番状态'),+ initialValue: syncEnabled,+ enabled: canInteract,+ onToggle: (value) =>+ _run(() => _bangumi.setEnabled(value ?? !syncEnabled)),+ ),+ SettingsTile(+ leading: error == null+ ? Icons.cloud_outlined+ : Icons.error_outline_rounded,+ title: Text(+ busy+ ? '正在连接 Bangumi…'+ : error != null+ ? '连接失败'+ : _bangumi.initialized+ ? '已连接:${_bangumi.username}'+ : '尚未连接',+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ ),+ description: Tooltip(+ message: description,+ excludeFromSemantics: true,+ child: SizedBox(+ width: double.infinity,+ child: Stack(+ children: [+ // Reserve three lines while respecting text scaling.+ const ExcludeSemantics(child: Text('\n\n')),+ Positioned.fill(+ child: Text(+ description,+ maxLines: 3,+ overflow: TextOverflow.ellipsis,+ ),+ ),+ ],+ ),+ ),+ ),+ trailing: Stack(+ alignment: Alignment.center,+ children: [+ Visibility(+ visible: !busy,+ maintainSize: true,+ maintainState: true,+ maintainAnimation: true,+ child: TextButton(+ onPressed: canInteract ? () => _run(_bangumi.ping) : null,+ child: Text(error != null ? '重试连接' : '测试连接'),+ ),+ ),+ if (busy)+ const SizedBox(+ width: 20, height: 20, child: LoadingIndicator()),+ ],+ ),+ ),+ if (widget.onConfigure != null)+ SettingsTile(+ leading: Icons.tune_rounded,+ title: const Text('Bangumi 配置'),+ enabled: canInteract,+ onPressed: (_) async {+ await widget.onConfigure!();+ if (mounted) setState(() => _actionError = null);+ },+ ),+ ],+ );+ },+ );+ }+}diff --git a/lib/pages/bangumi/bangumi_setting.dart b/lib/pages/bangumi/bangumi_setting.dartindex e9678d8c..5d36399b 100644--- a/lib/pages/bangumi/bangumi_setting.dart+++ b/lib/pages/bangumi/bangumi_setting.dart@@ -4,6 +4,7 @@ import 'package:url_launcher/url_launcher.dart';import 'package:kazumi/bean/appbar/sys_app_bar.dart';import 'package:kazumi/bean/dialog/dialog_helper.dart';import 'package:kazumi/bean/settings/settings_list.dart';+import 'package:kazumi/bean/settings/bangumi_sync_settings.dart';import 'package:kazumi/bean/widget/loading_indicator.dart';import 'package:kazumi/modules/bangumi/sync_priority.dart';import 'package:kazumi/services/storage/storage.dart';@@ -18,39 +19,48 @@ class BangumiEditorPage extends StatefulWidget {class _BangumiEditorPageState extends State<BangumiEditorPage>with KazumiDialogOwner {- final TextEditingController bangumiTokenController = TextEditingController();- bool passwordVisible = false;- bool isVerifying = false;- late bool bangumiImmediateSyncToastEnable;- late int syncPriority;- final MenuController syncPriorityMenuController = MenuController();+ final TextEditingController _tokenController = TextEditingController();+ bool _passwordVisible = false;+ bool _isVerifying = false;+ String? _tokenError;+ String? _tokenStatus;+ late bool _immediateSyncToastEnabled;+ late int _syncPriority;+ final MenuController _syncPriorityMenuController = MenuController();++ bool get _isBusy => _isVerifying || dialogs.isRunning;@overridevoid initState() {super.initState();- bangumiTokenController.text =+ _tokenController.text =GStorage.getSetting(SettingsKeys.bangumiAccessToken);- bangumiImmediateSyncToastEnable =+ _immediateSyncToastEnabled =GStorage.getSetting(SettingsKeys.bangumiImmediateSyncToastEnable);- syncPriority = GStorage.getSetting(SettingsKeys.bangumiSyncPriority);+ _syncPriority = GStorage.getSetting(SettingsKeys.bangumiSyncPriority);}@overridevoid dispose() {- bangumiTokenController.dispose();+ _tokenController.dispose();super.dispose();}- Future<void> updateSyncPriority(int value) async {+ Future<void> _updateSyncPriority(int value) async {await GStorage.putSetting(SettingsKeys.bangumiSyncPriority, value);if (!mounted) return;setState(() {- syncPriority = value;+ _syncPriority = value;});}- Future<void> syncWithProgress() async {- if (dialogs.isRunning) return;+ Future<void> _syncWithProgress() async {+ if (_isBusy) return;+ if (_tokenController.text.trim() !=+ GStorage.getSetting(SettingsKeys.bangumiAccessToken).trim()) {+ setState(() => _tokenError = 'Token 已修改,请先验证并保存,再同步');+ return;+ }final syncEnable = GStorage.getSetting(SettingsKeys.bangumiSyncEnable);if (!syncEnable) {KazumiDialog.showToast(message: '请先开启 Bangumi 同步');@@ -63,9 +73,7 @@ class _BangumiEditorPageState extends State<BangumiEditorPage>builder: (context) =>_BangumiSyncProgressDialog(key: progressDialogKey),action: () async {- final bangumi = BangumiSyncService();- await bangumi.ping();- await bangumi.syncCollectibles(+ await BangumiSyncService().syncCollectibles(onProgress: (message, current, total) {progressDialogKey.currentState?.update(total > 0 ? '$message ($current/$total)' : message,@@ -76,8 +84,33 @@ class _BangumiEditorPageState extends State<BangumiEditorPage>},);}, onError: (e, _) {- KazumiDialog.showToast(message: 'Bangumi同步失败 $e');+ KazumiDialog.showToast(+ message: 'Bangumi 同步失败:${BangumiSyncService.describeError(e)}');+ });+ }++ Future<void> _saveToken() async {+ if (_isBusy) return;+ setState(() {+ _isVerifying = true;+ _tokenError = null;+ _tokenStatus = null;});+ try {+ final bangumi = BangumiSyncService();+ await bangumi.saveToken(_tokenController.text);+ if (mounted) {+ _tokenController.text =+ GStorage.getSetting(SettingsKeys.bangumiAccessToken);+ _tokenStatus = '已验证并保存,用户名:${bangumi.username}';+ }+ } catch (e) {+ if (mounted) {+ _tokenError = '${BangumiSyncService.describeError(e)}。本次修改未保存';+ }+ } finally {+ if (mounted) setState(() => _isVerifying = false);+ }}@override@@ -94,24 +127,40 @@ class _BangumiEditorPageState extends State<BangumiEditorPage>child: Column(children: [TextField(- controller: bangumiTokenController,- obscureText: !passwordVisible,+ controller: _tokenController,+ enabled: !_isBusy,+ onChanged: (_) => setState(() {+ _tokenError = null;+ _tokenStatus = null;+ }),+ obscureText: !_passwordVisible,decoration: InputDecoration(labelText: 'Bangumi Access Token',+ errorText: _tokenError,+ errorMaxLines: 4,+ helperText: _isVerifying+ ? '正在验证 Token,请稍候…'+ : _tokenStatus ?? '填写后点击“验证并保存”,验证成功后生效',+ helperMaxLines: 2,border: const OutlineInputBorder(),suffixIcon: IconButton(onPressed: () {setState(() {- passwordVisible = !passwordVisible;+ _passwordVisible = !_passwordVisible;});},- icon: Icon(passwordVisible+ icon: Icon(_passwordVisible? Icons.visibility_rounded: Icons.visibility_off_rounded),),),),const SizedBox(height: 16),+ BangumiSyncSettings(+ enabled: !_isBusy,+ margin: EdgeInsetsDirectional.zero,+ ),+ const SizedBox(height: 16),SettingsSection(title: Text('同步选项'),margin: EdgeInsetsDirectional.zero,@@ -119,11 +168,11 @@ class _BangumiEditorPageState extends State<BangumiEditorPage>SettingsTile.switchTile(leading: Icons.notifications_active_rounded,onToggle: (value) async {- bangumiImmediateSyncToastEnable =- value ?? !bangumiImmediateSyncToastEnable;+ _immediateSyncToastEnabled =+ value ?? !_immediateSyncToastEnabled;await GStorage.putSetting(SettingsKeys.bangumiImmediateSyncToastEnable,- bangumiImmediateSyncToastEnable,+ _immediateSyncToastEnabled,);if (mounted) {setState(() {});@@ -131,31 +180,31 @@ class _BangumiEditorPageState extends State<BangumiEditorPage>},title: Text('即时同步提示'),description: Text('点击追番按钮触发即时同步时显示提示框'),- initialValue: bangumiImmediateSyncToastEnable,+ initialValue: _immediateSyncToastEnabled,),SettingsTile(leading: Icons.rule_rounded,onPressed: (_) async {- if (syncPriorityMenuController.isOpen) {- syncPriorityMenuController.close();+ if (_syncPriorityMenuController.isOpen) {+ _syncPriorityMenuController.close();} else {- syncPriorityMenuController.open();+ _syncPriorityMenuController.open();}},title: Text('同步优先级'),description: Text('当本地与 Bangumi 状态不一致时优先使用哪个状态'),value: MenuAnchor(consumeOutsideTap: true,- controller: syncPriorityMenuController,+ controller: _syncPriorityMenuController,builder: (context, controller, child) => Text(- BangumiSyncPriority.fromValue(syncPriority)+ BangumiSyncPriority.fromValue(_syncPriority).label),menuChildren: [for (final entry in BangumiSyncPriority.values)MenuItemButton(requestFocusOnHover: false,onPressed: () =>- updateSyncPriority(entry.value),+ _updateSyncPriority(entry.value),child: Container(height: 48,constraints:@@ -165,11 +214,12 @@ class _BangumiEditorPageState extends State<BangumiEditorPage>child: Text(entry.label,style: TextStyle(- color: entry.value == syncPriority- ? Theme.of(context)- .colorScheme- .primary- : null,+ color:+ entry.value == _syncPriority+ ? Theme.of(context)+ .colorScheme+ .primary+ : null,),),)))@@ -177,6 +227,7 @@ class _BangumiEditorPageState extends State<BangumiEditorPage>),SettingsTile(leading: Icons.cloud_sync_rounded,+ enabled: !_isBusy,trailing: dialogs.isRunning? const SizedBox(width: 20,@@ -185,7 +236,7 @@ class _BangumiEditorPageState extends State<BangumiEditorPage>): const Icon(Icons.sync_rounded),onPressed: (_) async {- await syncWithProgress();+ await _syncWithProgress();},title: Text("立即同步状态"),description: Text('同步状态不一致或仅存在于本地/远端的条目'),@@ -218,57 +269,12 @@ class _BangumiEditorPageState extends State<BangumiEditorPage>),),),- floatingActionButton: FloatingActionButton(- onPressed: isVerifying- ? null- : () async {- final token = bangumiTokenController.text.trim();- final bool bangumiSyncEnable =- GStorage.getSetting(SettingsKeys.bangumiSyncEnable);-- if (token.isEmpty && bangumiSyncEnable) {- KazumiDialog.showToast(message: 'Access Token 不能为空');- return;- }- setState(() {- isVerifying = true;- });- await GStorage.putSetting(- SettingsKeys.bangumiAccessToken, token);- final bangumi = BangumiSyncService();-- if (token.isEmpty) {- bangumi.reset();- KazumiDialog.showToast(message: 'Bangumi Token 为空,请检查');- if (!mounted) return;- setState(() {- isVerifying = false;- });- return;- }-- KazumiDialog.showToast(message: '正在测试 Bangumi Token...');- try {- await bangumi.init();- } catch (e) {- KazumiDialog.showToast(message: '验证失败:${e.toString()}');- await GStorage.putSetting(- SettingsKeys.bangumiSyncEnable, false);- if (!mounted) return;- setState(() {- isVerifying = false;- });- return;- }-- KazumiDialog.showToast(- message: '测试成功,用户名:${bangumi.username}');- if (!mounted) return;- setState(() {- isVerifying = false;- });- },- child: const Icon(Icons.save),+ floatingActionButton: FloatingActionButton.extended(+ onPressed: _isBusy ? null : _saveToken,+ icon: _isVerifying+ ? const SizedBox(width: 20, height: 20, child: LoadingIndicator())+ : const Icon(Icons.save),+ label: Text(_isVerifying ? '正在验证…' : '验证并保存'),),),);diff --git a/lib/pages/collect/collect_controller.dart b/lib/pages/collect/collect_controller.dartindex e47e2517..90be2996 100644--- a/lib/pages/collect/collect_controller.dart+++ b/lib/pages/collect/collect_controller.dart@@ -110,11 +110,6 @@ abstract class _CollectController with Store {return _BangumiDeleteSyncAction.deleteLocalOnly;}- final bangumi = BangumiSyncService();- if (!bangumi.initialized) {- return _BangumiDeleteSyncAction.deleteLocalOnly;- }-return KazumiDialog.show<_BangumiDeleteSyncAction>(clickMaskDismiss: true,builder: (context) => AlertDialog(@@ -166,14 +161,6 @@ abstract class _CollectController with Store {}final bangumi = BangumiSyncService();- if (!bangumi.initialized) {- KazumiDialog.showToast(message: 'Bangumi 未初始化,同步失败,已取消本次状态修改');- KazumiLogger().w(- 'Bangumi: immediate collect sync skipped because Bangumi is not initialized. '- 'bangumiId=$bangumiId, type=$localType',- );- return false;- }try {if (showImmediateSyncToast) {KazumiDialog.showToast(message: '正在同步到 Bangumi...');@@ -192,7 +179,9 @@ abstract class _CollectController with Store {}return true;} catch (e, stackTrace) {- KazumiDialog.showToast(message: '同步到 Bangumi 失败,已取消本次状态修改: $e');+ KazumiDialog.showToast(+ message:+ '同步到 Bangumi 失败,已取消本次状态修改:${BangumiSyncService.describeError(e)}');KazumiLogger().e('Bangumi: immediate collect sync failed. bangumiId=$bangumiId, type=$localType',error: e,@@ -296,20 +285,10 @@ abstract class _CollectController with Store {return false;}- if (!BangumiSyncService().initialized) {- _reportSyncError('Bangumi 未连接,请检查令牌', onError);- return false;- }- try {- await BangumiSyncService().ping();- } catch (e) {- _reportSyncError('Bangumi 连接失败,请检查网络或令牌', onError, error: e);- return false;- }try {await BangumiSyncService().syncCollectibles(onProgress: onProgress);} catch (e) {- _reportSyncError('Bangumi 同步失败,请检查连接或令牌', onError, error: e);+ _reportSyncError(BangumiSyncService.describeError(e), onError, error: e);return false;}loadCollectibles();diff --git a/lib/pages/init_page.dart b/lib/pages/init_page.dartindex 1a87ef7b..5331adc3 100644--- a/lib/pages/init_page.dart+++ b/lib/pages/init_page.dart@@ -192,22 +192,20 @@ class _InitPageState extends State<InitPage> {}Future<void> _bangumiInit() async {- bool bangumiEnable =- await GStorage.getSetting(SettingsKeys.bangumiSyncEnable);+ final bangumiEnable = GStorage.getSetting(SettingsKeys.bangumiSyncEnable);if (bangumiEnable) {- var bangumi = BangumiSyncService();+ final bangumi = BangumiSyncService();KazumiLogger().i('Bangumi: Starting Bangumi initialization');try {- await bangumi.init();+ await bangumi.ping();} catch (e) {- bangumi.reset();- await GStorage.putSetting(SettingsKeys.bangumiSyncEnable, false);KazumiLogger().w(- 'Bangumi: initialization failed, disabling Bangumi sync until user re-enables it',+ 'Bangumi: initialization failed; keeping sync enabled for retry',error: e,);KazumiDialog.showToast(- message: '初始化Bangumi失败,已关闭 Bangumi 同步: ${e.toString()}',+ message:+ 'Bangumi 暂未连接,同步设置已保留:${BangumiSyncService.describeError(e)}',);}}diff --git a/lib/pages/webdav_editor/webdav_setting.dart b/lib/pages/webdav_editor/webdav_setting.dartindex bf728f3d..3eb0109e 100644--- a/lib/pages/webdav_editor/webdav_setting.dart+++ b/lib/pages/webdav_editor/webdav_setting.dart@@ -1,6 +1,6 @@import 'package:flutter/material.dart';import 'package:kazumi/bean/dialog/dialog_helper.dart';-import 'package:kazumi/services/sync/bangumi_sync_service.dart';+import 'package:kazumi/bean/settings/bangumi_sync_settings.dart';import 'package:kazumi/services/logging/logger.dart';import 'package:kazumi/services/storage/storage.dart';import 'package:kazumi/services/sync/webdav.dart';@@ -13,16 +13,15 @@ class WebDavSettingsPage extends StatefulWidget {const WebDavSettingsPage({super.key});@override- State<WebDavSettingsPage> createState() => _PlayerSettingsPageState();+ State<WebDavSettingsPage> createState() => _WebDavSettingsPageState();}-class _PlayerSettingsPageState extends State<WebDavSettingsPage> {+class _WebDavSettingsPageState extends State<WebDavSettingsPage> {late bool webDavEnable;late bool webDavEnableHistory;late bool webDavEnableCollect;late bool enableGitProxy;late bool enableBangumiProxy;- late bool bangumiSyncEnable;@overridevoid initState() {@@ -32,7 +31,6 @@ class _PlayerSettingsPageState extends State<WebDavSettingsPage> {webDavEnableCollect = GStorage.getSetting(SettingsKeys.webDavEnableCollect);enableGitProxy = GStorage.getSetting(SettingsKeys.enableGitProxy);enableBangumiProxy = GStorage.getSetting(SettingsKeys.enableBangumiProxy);- bangumiSyncEnable = GStorage.getSetting(SettingsKeys.bangumiSyncEnable);}Future<void> syncHistoryWithWebDav() async {@@ -80,57 +78,10 @@ class _PlayerSettingsPageState extends State<WebDavSettingsPage> {await GStorage.putSetting(SettingsKeys.enableGitProxy, value);},),- SettingsSection(- title: Text('Bangumi'),- tiles: [- SettingsTile.switchTile(- leading: Icons.sync_rounded,- onToggle: (value) async {- final tBangumiEnableSync = value ?? !bangumiSyncEnable;- final bangumi = BangumiSyncService();- if (tBangumiEnableSync == true) {- final token =- GStorage.getSetting(SettingsKeys.bangumiAccessToken)- .trim();- if (token.isEmpty) {- KazumiDialog.showToast(- message: '请先配置 Bangumi 的 Access Token');- return;- } else {- if (!bangumi.initialized) {- try {- await bangumi.init();- } catch (e) {- KazumiDialog.showToast(- message: "Bangumi 初始化失败,请稍后再试");- return;- }- }- }- }- bangumiSyncEnable = tBangumiEnableSync;- await GStorage.putSetting(- SettingsKeys.bangumiSyncEnable, bangumiSyncEnable);- if (!mounted) {- return;- }- setState(() {});- },- title: Text('Bangumi 同步'),- description: Text('与Bangumi自动同步追番状态'),- initialValue: bangumiSyncEnable,- ),- SettingsTile(- leading: Icons.tune_rounded,- onPressed: (_) async {- await context.pushNamed('/settings/bangumi/');- bangumiSyncEnable =- GStorage.getSetting(SettingsKeys.bangumiSyncEnable);- setState(() {});- },- title: Text('Bangumi 配置'),- ),- ],+ BangumiSyncSettings(+ onConfigure: () async {+ await context.pushNamed('/settings/bangumi/');+ },),SettingsSection(title: Text('WEBDAV'),diff --git a/lib/request/apis/bangumi_api.dart b/lib/request/apis/bangumi_api.dartindex 5dffc62f..2dcccc00 100644--- a/lib/request/apis/bangumi_api.dart+++ b/lib/request/apis/bangumi_api.dart@@ -522,12 +522,7 @@ class BangumiApi {return characterFullItem;}- static Future<String?> getUsername() async {- final user = await getCurrentUser();- return user?.username;- }-- static Future<User?> getCurrentUser() async {+ static Future<User?> getCurrentUser({String? accessToken}) async {try {final jsonData = await _client.get(ApiEndpoints.formatUrl(@@ -535,23 +530,18 @@ class BangumiApi {ApiEndpoints.bangumiUsernameByToken,[]),requiresAuth: true,+ accessToken: accessToken,);if (jsonData['id'] != null) {return User.fromJson(Map<String, dynamic>.from(jsonData));}- } on NetworkException catch (e) {- if (e.statusCode == 401) {- KazumiLogger().e('Bangumi token unauthorized, please check your token');- throw StateError('Bangumi token 未授权,请检查您的 token');- }- rethrow;} catch (e) {KazumiLogger().e('Network: get current user failed', error: e);+ rethrow;}return null;}- /// Get the Bangumi collection of the current userstatic Future<List<BangumiCollection>> getBangumiCollectibles({List<BangumiCollectionType> includeBangumiTypes = const [BangumiCollectionType.planToWatch,@@ -560,25 +550,17 @@ class BangumiApi {BangumiCollectionType.onHold,BangumiCollectionType.abandoned,],- String? username,+ required String username,int limit = 50,void Function(String message, int current, int total)? onProgress,}) async {final List<BangumiCollection> bangumiCollection = [];- final resolvedUsername = username != null && username.isNotEmpty- ? username- : await getUsername();int failedItemCount = 0;int progressCurrent = 0;int progressTotal = 0;- if (resolvedUsername == null) {- KazumiLogger().w('get username failed');- return [];- }try {- final rateLimiter =- AsyncRateLimiter(const Duration(milliseconds: 200));+ final rateLimiter = AsyncRateLimiter(const Duration(milliseconds: 200));const int concurrency = 3;Future<Map> fetchPageData(int offset, int pageLimit) async {@@ -586,7 +568,7 @@ class BangumiApi {final url = ApiEndpoints.formatUrl(ApiEndpoints.bangumiAuthAPIMirrorDomain +ApiEndpoints.bangumiGetAllCollections,- [resolvedUsername, pageLimit, offset]);+ [username, pageLimit, offset]);final jsonData = await _client.get(url,requiresAuth: true,@@ -687,7 +669,8 @@ class BangumiApi {progressTotal,);- if (jsonList.length < serverLimit && offset + jsonList.length >= total) {+ if (jsonList.length < serverLimit &&+ offset + jsonList.length >= total) {offsetsQueue.clear();break;}@@ -721,7 +704,6 @@ class BangumiApi {return bangumiCollection;}- /// Update the Bangumi collection by IDstatic Future<bool> updateBangumiById(int id, Map<String, dynamic> data) async {await _writeRateLimiter.acquire();@@ -759,7 +741,6 @@ class BangumiApi {}}- /// Update the Bangumi collection by Typestatic Future<bool> updateBangumiByType(int id, int localType) async {final type = CollectType.fromValue(localType).toBangumiCollectionType();if (type == null) {@@ -768,7 +749,6 @@ class BangumiApi {return await updateBangumiById(id, {'type': type.value});}- /// update or add Bangumi evaluation by subjectIDstatic Future<bool> addOrUpdateBangumiEvaluationBySubjectID(int subjectID,int localType, {diff --git a/lib/request/clients/bangumi_client.dart b/lib/request/clients/bangumi_client.dartindex 9521145a..5447e852 100644--- a/lib/request/clients/bangumi_client.dart+++ b/lib/request/clients/bangumi_client.dart@@ -17,6 +17,7 @@ class BangumiClient {String url, {Map<String, dynamic>? queryParameters,bool requiresAuth = false,+ String? accessToken,CancelToken? cancelToken,}) async {try {@@ -26,6 +27,7 @@ class BangumiClient {options: Options(headers: _headers(requiresAuth: requiresAuth,+ accessToken: accessToken,url: url,method: 'GET',),@@ -68,14 +70,17 @@ class BangumiClient {Map<String, dynamic> _headers({required bool requiresAuth,- String? url,- String method = 'GET',+ String? accessToken,+ required String url,+ required String method,Object? data,}) {final headers = <String, dynamic>{...bangumiHTTPHeader};final bangumiSyncEnable =GStorage.getSetting(SettingsKeys.bangumiSyncEnable);- final token = GStorage.getSetting(SettingsKeys.bangumiAccessToken).trim();+ final token = (accessToken ??+ GStorage.getSetting<String>(SettingsKeys.bangumiAccessToken))+ .trim();if ((requiresAuth || bangumiSyncEnable) && token.isNotEmpty) {headers['Authorization'] = 'Bearer $token';}@@ -86,7 +91,7 @@ class BangumiClient {headers['X-Timestamp'] = timestamp;headers['X-Signature'] = generateBangumiMirrorSearchSignature(method: method,- path: Uri.parse(url!).path,+ path: Uri.parse(url).path,body: body,timestamp: timestamp,);@@ -94,10 +99,7 @@ class BangumiClient {return headers;}- bool _shouldSignProtectedMirrorRequest(String? url, String method) {- if (url == null) {- return false;- }+ bool _shouldSignProtectedMirrorRequest(String url, String method) {final enableBangumiProxy =GStorage.getSetting(SettingsKeys.enableBangumiProxy);if (!enableBangumiProxy) {diff --git a/lib/services/sync/bangumi_sync_service.dart b/lib/services/sync/bangumi_sync_service.dartindex e0670b12..5d9a0801 100644--- a/lib/services/sync/bangumi_sync_service.dart+++ b/lib/services/sync/bangumi_sync_service.dart@@ -1,30 +1,27 @@-import 'dart:async';-import 'package:kazumi/bean/dialog/dialog_helper.dart';+import 'package:flutter/foundation.dart';import 'package:kazumi/modules/collect/collect_sync_merger.dart';import 'package:kazumi/services/storage/storage.dart';import 'package:kazumi/services/logging/logger.dart';import 'package:kazumi/modules/bangumi/sync_priority.dart';import 'package:kazumi/request/apis/bangumi_api.dart';+import 'package:kazumi/request/core/network_exception.dart';+import 'package:kazumi/utils/async_serial_queue.dart';-/// Bangumi 同步服务工具类-class BangumiSyncService {- /// Current username, set by ping()- String username = '';+class BangumiSyncService extends ChangeNotifier {+ String _username = '';+ String get username => initialized ? _username : '';- /// Init status, set after ping() in init()- bool initialized = false;+ String? _verifiedToken;+ bool get initialized =>+ _verifiedToken != null && _verifiedToken == _configuredToken;- /// Number of queued Bangumi operations waiting- int _queuedOperationCount = 0;+ bool _isConnecting = false;+ bool get isConnecting => _isConnecting;- /// Number of Bangumi operations running- int _activeOperationCount = 0;+ String? _lastError;+ String? get lastError => _lastError;- /// Serial queue for all Bangumi operations- Future<void> _operationQueue = Future.value();-- /// Whether any Bangumi operation is active or already queued.- bool get isUsing => _queuedOperationCount > 0 || _activeOperationCount > 0;+ final _operations = AsyncSerialQueue();String get _configuredToken =>GStorage.getSetting(SettingsKeys.bangumiAccessToken).trim();@@ -33,49 +30,110 @@ class BangumiSyncService {static final BangumiSyncService _instance = BangumiSyncService._internal();factory BangumiSyncService() => _instance;- void reset() {- initialized = false;- username = '';+ @visibleForTesting+ void resetForTesting() {+ _verifiedToken = null;+ _username = '';+ _lastError = null;+ notifyListeners();}- Future<void> init() async {- initialized = false;- username = '';- if (_configuredToken.isEmpty) {- throw Exception('请先填写Bangumi Access Token');+ Future<void> ping() => _operations.run(_connectConfiguredToken);++ Future<void> setEnabled(bool enabled) {+ return _operations.run(() async {+ if (enabled) {+ await _connectConfiguredToken();+ }+ await GStorage.putSetting(SettingsKeys.bangumiSyncEnable, enabled);+ notifyListeners();+ });+ }++ Future<String> _validateToken(String token) async {+ if (token.isEmpty) {+ throw StateError('请先在 Bangumi 配置中填写并保存 Access Token');+ }+ final user = await BangumiApi.getCurrentUser(accessToken: token);+ final name = user?.username;+ if (name == null || name.trim().isEmpty) {+ throw const FormatException('Bangumi 用户信息不完整');}+ return name;+ }++ Future<void> _connectConfiguredToken() async {+ _isConnecting = true;+ _lastError = null;+ notifyListeners();try {- await ping();- initialized = true;+ final token = _configuredToken;+ final name = await _validateToken(token);+ _verifiedToken = token;+ _username = name;} catch (e) {- KazumiLogger().e('Bangumi: Bangumi ping failed', error: e);+ _verifiedToken = null;+ _username = '';+ _lastError = describeError(e);+ KazumiLogger().w('Bangumi: connection failed', error: e);rethrow;+ } finally {+ _isConnecting = false;+ notifyListeners();}}- Future<void> ping() async {- if (isUsing) {- throw Exception('Bangumi: 当前有操作正在进行,请稍后再试');- }- await _runExclusive(() async {+ // Validate draft credentials before exposing them to other requests.+ Future<void> saveToken(String value) {+ return _operations.run(() async {+ final token = value.trim();+ _isConnecting = true;+ notifyListeners();try {- final name = await BangumiApi.getUsername();- if (name == null) {- throw Exception('Bangumi: 获取用户名失败');- } else {- username = name;- }+ final name = await _validateToken(token);+ await GStorage.putSetting(SettingsKeys.bangumiAccessToken, token);+ _verifiedToken = token;+ _username = name;+ _lastError = null;} catch (e) {- KazumiLogger().e('Bangumi: Bangumi ping failed', error: e);+ if (token == _configuredToken) {+ _verifiedToken = null;+ _username = '';+ _lastError = describeError(e);+ }rethrow;+ } finally {+ _isConnecting = false;+ notifyListeners();}});}- /// Update a single collectible on Bangumi, waiting for current Bangumi work- /// to finish and serializing multiple immediate update requests.+ static String describeError(Object error) {+ if (error is NetworkException) {+ switch (error.statusCode) {+ case 401:+ return 'Access Token 无效或已过期,请在 Bangumi 配置中更换 Token';+ case 403:+ return 'Bangumi 拒绝访问,请检查 Token 权限或稍后重试';+ case 429:+ return 'Bangumi 请求过于频繁,请稍后重试';+ }+ if (error.statusCode != null) {+ return 'Bangumi 服务请求失败(HTTP ${error.statusCode}),请稍后重试';+ }+ return error.message;+ }+ if (error is FormatException || error is TypeError) {+ return 'Bangumi 返回的用户信息格式异常,请稍后重试';+ }+ if (error is StateError) return error.message.toString();+ return 'Bangumi 操作失败,请稍后重试';+ }+Future<bool> syncCollectibleWhenIdle(int bangumiId, int localType) {- return _runExclusive(() async {+ return _operations.run(() async {+ if (!initialized) await _connectConfiguredToken();return BangumiApi.updateBangumiByType(bangumiId,localType,@@ -83,75 +141,37 @@ class BangumiSyncService {});}- Future<T> _runExclusive<T>(Future<T> Function() action) {- final completer = Completer<T>();- final previousOperation = _operationQueue;- _queuedOperationCount++;-- _operationQueue = (() async {- try {- await previousOperation;- } catch (_) {}-- _queuedOperationCount--;- _activeOperationCount++;- try {- completer.complete(await action());- } catch (e, stackTrace) {- completer.completeError(e, stackTrace);- } finally {- _activeOperationCount--;- }- })();-- return completer.future;- }-- /// Record a collectible change (used for WebDAV incremental sync)- /// [action] 1 代表新增(add),2 代表修改(update)- /// [type] via: [CollectType]- Future<void> _recordCollectibleChange(- int bangumiId,- int action,- int type,- ) async {+ Future<void> _applyLocalMutation(BangumiLocalMutation mutation) async {+ await GStorage.putCollectible(mutation.collectible);+ // Remote changes must also reach WebDAV's incremental change log.await GStorage.appendCollectChange(- bangumiId: bangumiId,- action: action,- type: type,+ bangumiId: mutation.collectible.bangumiItem.id,+ action: mutation.changeAction,+ type: mutation.collectible.type,);}- /// Sync Bangumi collectibles with local data- Future<bool> syncCollectibles({+ Future<void> syncCollectibles({void Function(String message, int current, int total)? onProgress,- }) async {- final syncEnable = GStorage.getSetting(SettingsKeys.bangumiSyncEnable);- if (!syncEnable) {- KazumiDialog.showToast(message: '同步已关闭');- KazumiLogger().i('Bangumi: sync disabled');- return false;- }- if (isUsing) {- KazumiLogger().w('Bangumi is currently syncing');- throw Exception('Bangumi 正在同步');- }- return _runExclusive(() async {+ }) {+ return _operations.run(() async {try {+ if (!GStorage.getSetting(SettingsKeys.bangumiSyncEnable)) {+ throw StateError('请先开启 Bangumi 同步');+ }+ await _connectConfiguredToken();onProgress?.call('开始同步 Bangumi 状态', 0, 0);final priority = BangumiSyncPriority.fromValue(GStorage.getSetting(SettingsKeys.bangumiSyncPriority),);- // 1. 全量拉取远程收藏final remoteCollection = await BangumiApi.getBangumiCollectibles(username: username,limit: 50,onProgress: onProgress,);- // 2. 与本地数据对比,进行乐观合并(单向填充)之后,按照优先级处理冲突final mergePlan = CollectSyncMerger.planBangumi(localCollectibles: GStorage.collectibles.values.toList(),remoteCollections: remoteCollection,@@ -161,11 +181,10 @@ class BangumiSyncService {if (totalOperations == 0) {onProgress?.call('未发现状态差异,无需同步', 1, 1);- return false;+ return;}int syncedCount = 0;- // 3. 仅本地有:直接上传到 Bangumiif (mergePlan.localOnlyUploads.isNotEmpty) {onProgress?.call('正在上传本地新增状态', syncedCount, totalOperations);for (final upload in mergePlan.localOnlyUploads) {@@ -182,22 +201,15 @@ class BangumiSyncService {}}- // 4. 仅远程有:直接补到本地if (mergePlan.remoteOnlyPuts.isNotEmpty) {onProgress?.call('正在补全本地缺失状态', syncedCount, totalOperations);for (final mutation in mergePlan.remoteOnlyPuts) {- await GStorage.putCollectible(mutation.collectible);- await _recordCollectibleChange(- mutation.collectible.bangumiItem.id,- mutation.changeAction,- mutation.collectible.type,- );+ await _applyLocalMutation(mutation);syncedCount++;onProgress?.call('正在补全本地缺失状态', syncedCount, totalOperations);}}- // 5. 双方都有但不一致:按优先级处理if (mergePlan.conflictUploads.isNotEmpty) {onProgress?.call('${priority.label}:正在上传冲突状态', syncedCount, totalOperations);@@ -218,19 +230,13 @@ class BangumiSyncService {onProgress?.call('${priority.label}:正在更新本地冲突状态', syncedCount, totalOperations);for (final mutation in mergePlan.conflictLocalUpdates) {- await GStorage.putCollectible(mutation.collectible);- await _recordCollectibleChange(- mutation.collectible.bangumiItem.id,- mutation.changeAction,- mutation.collectible.type,- );+ await _applyLocalMutation(mutation);syncedCount++;onProgress?.call('${priority.label}:正在更新本地冲突状态', syncedCount, totalOperations);}}onProgress?.call('Bangumi 状态同步完成', 1, 1);- return true;} catch (e) {KazumiLogger().e('Bangumi sync failed', error: e);rethrow;diff --git a/test/bangumi_sync_service_test.dart b/test/bangumi_sync_service_test.dartnew file mode 100644index 00000000..7f23d8a3--- /dev/null+++ b/test/bangumi_sync_service_test.dart@@ -0,0 +1,273 @@+import 'dart:async';+import 'dart:convert';+import 'dart:io';+import 'dart:typed_data';++import 'package:dio/dio.dart';+import 'package:flutter_test/flutter_test.dart';+import 'package:hive_ce/hive.dart';+import 'package:kazumi/pages/collect/collect_controller.dart';+import 'package:kazumi/repositories/collect_crud_repository.dart';+import 'package:kazumi/request/clients/bangumi_client.dart';+import 'package:kazumi/request/core/dio_factory.dart';+import 'package:kazumi/request/core/network_exception.dart';+import 'package:kazumi/services/storage/storage.dart';+import 'package:kazumi/services/sync/bangumi_sync_service.dart';+import 'package:logger/logger.dart';+import 'package:path_provider_platform_interface/path_provider_platform_interface.dart';++void main() {+ final bangumi = BangumiSyncService();+ late Directory directory;+ late PathProviderPlatform originalPathProvider;+ late _BangumiAdapter adapter;++ setUpAll(() async {+ Logger.level = Level.off;+ directory = await Directory.systemTemp.createTemp('kazumi_bangumi_test_');+ originalPathProvider = PathProviderPlatform.instance;+ PathProviderPlatform.instance = _TestPaths(directory.path);+ Hive.init(directory.path);+ await GStorage.init();+ });++ setUp(() async {+ bangumi.resetForTesting();+ await GStorage.putSetting(SettingsKeys.bangumiAccessToken, 'saved-token');+ await GStorage.putSetting(SettingsKeys.bangumiSyncEnable, true);+ await GStorage.putSetting(SettingsKeys.enableBangumiProxy, false);+ await GStorage.collectibles.clear();+ DioFactory.reset();+ adapter = _BangumiAdapter();+ DioFactory.apiDio.httpClientAdapter = adapter;+ });++ tearDownAll(() async {+ DioFactory.apiDio.close(force: true);+ DioFactory.reset();+ await Hive.close();+ PathProviderPlatform.instance = originalPathProvider;+ final testRoot = directory.absolute.path;+ expect(testRoot.startsWith(Directory.systemTemp.absolute.path), isTrue);+ expect(directory.uri.pathSegments.where((part) => part.isNotEmpty).last,+ startsWith('kazumi_bangumi_test_'));+ await directory.delete(recursive: true);+ });++ test('startup connection failure preserves enabled preference and can retry',+ () async {+ adapter.respond = (request) => throw DioException(+ requestOptions: request,+ type: DioExceptionType.connectionTimeout,+ );+ await expectLater(bangumi.ping(), throwsA(isA<NetworkException>()));+ expect(GStorage.getSetting(SettingsKeys.bangumiSyncEnable), isTrue);+ expect(bangumi.initialized, isFalse);+ expect(bangumi.isConnecting, isFalse);+ expect(bangumi.lastError, contains('超时'));++ adapter.respond = (_) async => _user();+ await bangumi.ping();+ expect(bangumi.initialized, isTrue);+ expect(bangumi.username, 'saved-user');+ expect(bangumi.lastError, isNull);+ });++ test('enabling sends authorization while sync is disabled', () async {+ await GStorage.putSetting(SettingsKeys.bangumiSyncEnable, false);+ await bangumi.setEnabled(true);+ expect(+ adapter.requests.single.headers['Authorization'], 'Bearer saved-token');+ expect(GStorage.getSetting(SettingsKeys.bangumiSyncEnable), isTrue);+ });++ test('failed draft validation preserves credentials and connected account',+ () async {+ await bangumi.ping();+ adapter.respond = (_) async => _json({}, status: 401);+ await expectLater(+ bangumi.saveToken('invalid-draft'), throwsA(isA<NetworkException>()));+ expect(+ adapter.requests.last.headers['Authorization'], 'Bearer invalid-draft');+ expect(GStorage.getSetting(SettingsKeys.bangumiAccessToken), 'saved-token');+ expect(GStorage.getSetting(SettingsKeys.bangumiSyncEnable), isTrue);+ expect(bangumi.initialized, isTrue);+ expect(bangumi.username, 'saved-user');+ expect(bangumi.isConnecting, isFalse);+ });++ test('draft validation is isolated and only commits after success', () async {+ final response = Completer<ResponseBody>();+ final started = Completer<void>();+ adapter.respond = (request) async {+ if (request.uri.path == '/v0/me') {+ started.complete();+ return response.future;+ }+ return _json({});+ };+ final saving = bangumi.saveToken(' replacement-token ');+ await started.future;+ expect(GStorage.getSetting(SettingsKeys.bangumiAccessToken), 'saved-token');+ await BangumiClient.instance.get('https://api.bgm.tv/v0/subjects/1');+ expect(+ adapter.requests.last.headers['Authorization'], 'Bearer saved-token');+ response.complete(_user('replacement-user'));+ await saving;+ expect(GStorage.getSetting(SettingsKeys.bangumiAccessToken),+ 'replacement-token');+ expect(bangumi.username, 'replacement-user');+ expect(GStorage.getSetting(SettingsKeys.bangumiSyncEnable), isTrue);+ });++ test('revalidating an expired saved token updates status without disabling',+ () async {+ await bangumi.ping();+ adapter.respond = (_) async => _json({}, status: 401);+ await expectLater(+ bangumi.saveToken('saved-token'), throwsA(isA<NetworkException>()));+ expect(bangumi.initialized, isFalse);+ expect(bangumi.lastError, contains('无效或已过期'));+ expect(GStorage.getSetting(SettingsKeys.bangumiAccessToken), 'saved-token');+ expect(GStorage.getSetting(SettingsKeys.bangumiSyncEnable), isTrue);+ });++ test('saving a token while disabled does not enable sync', () async {+ await GStorage.putSetting(SettingsKeys.bangumiSyncEnable, false);+ await bangumi.saveToken('replacement-token');+ expect(bangumi.initialized, isTrue);+ expect(GStorage.getSetting(SettingsKeys.bangumiSyncEnable), isFalse);+ });++ test('empty draft does not erase the saved token', () async {+ await expectLater(bangumi.saveToken(' '), throwsStateError);+ expect(GStorage.getSetting(SettingsKeys.bangumiAccessToken), 'saved-token');+ expect(adapter.requests, isEmpty);+ expect(bangumi.isConnecting, isFalse);+ });++ for (final status in [401, 403, 429, 503]) {+ test('HTTP $status leaves a persistent actionable connection error',+ () async {+ adapter.respond = (_) async => _json({}, status: status);+ await expectLater(bangumi.ping(), throwsA(isA<NetworkException>()));+ expect(GStorage.getSetting(SettingsKeys.bangumiSyncEnable), isTrue);+ expect(+ bangumi.lastError,+ contains(switch (status) {+ 401 => '无效或已过期',+ 403 => '拒绝访问',+ 429 => '请求过于频繁',+ _ => 'HTTP 503',+ }));+ });+ }++ test('malformed user response does not enable sync', () async {+ await GStorage.putSetting(SettingsKeys.bangumiSyncEnable, false);+ adapter.respond = (_) async => _json({'id': 123, 'avatar': {}});+ await expectLater(bangumi.setEnabled(true), throwsFormatException);+ expect(bangumi.lastError, contains('格式异常'));+ expect(GStorage.getSetting(SettingsKeys.bangumiSyncEnable), isFalse);+ });++ test('busy connection checks serialize without clearing a valid session',+ () async {+ await bangumi.ping();+ final response = Completer<void>();+ final started = Completer<void>();+ adapter.respond = (_) async {+ if (!started.isCompleted) started.complete();+ await response.future;+ return _user();+ };+ final first = bangumi.ping();+ await started.future;+ final second = bangumi.ping();+ expect(bangumi.initialized, isTrue);+ expect(bangumi.username, 'saved-user');+ response.complete();+ await Future.wait([first, second]);+ expect(bangumi.initialized, isTrue);+ });++ test('immediate sync reconnects after initialization failure', () async {+ adapter.respond = (_) async => _json({}, status: 503);+ await expectLater(bangumi.ping(), throwsA(isA<NetworkException>()));+ adapter.respond =+ (request) async => request.method == 'POST' ? _json({}) : _user();+ expect(await bangumi.syncCollectibleWhenIdle(123, 1), isTrue);+ expect(adapter.requests.last.method, 'POST');+ expect(bangumi.initialized, isTrue);+ expect(bangumi.lastError, isNull);+ });++ test('manual collection sync reconnects instead of rejecting uninitialized',+ () async {+ adapter.respond = (request) async => request.uri.path == '/v0/me'+ ? _user()+ : _json({'data': [], 'total': 0, 'limit': 50});+ final errors = <String>[];+ final controller = CollectController(CollectCrudRepository());+ expect(+ await controller.syncCollectiblesBangumi(+ onProgress: (message, current, total) {}, onError: errors.add),+ isTrue);+ expect(errors, isEmpty);+ expect(bangumi.initialized, isTrue);+ });++ test('queued disable prevents subsequent full sync requests', () async {+ final response = Completer<ResponseBody>();+ final started = Completer<void>();+ adapter.respond = (_) {+ started.complete();+ return response.future;+ };+ final connecting = bangumi.ping();+ await started.future;+ final disabling = bangumi.setEnabled(false);+ final syncing = expectLater(bangumi.syncCollectibles(), throwsStateError);+ response.complete(_user());+ await Future.wait([connecting, disabling, syncing]);+ expect(GStorage.getSetting(SettingsKeys.bangumiSyncEnable), isFalse);+ expect(adapter.requests, hasLength(1));+ });+}++ResponseBody _json(Object data, {int status = 200}) => ResponseBody.fromString(+ jsonEncode(data),+ status,+ headers: {+ Headers.contentTypeHeader: [Headers.jsonContentType]+ },+ );++ResponseBody _user([String username = 'saved-user']) => _json({+ 'id': 123,+ 'username': username,+ 'avatar': <String, String>{},+ });++class _BangumiAdapter implements HttpClientAdapter {+ final requests = <RequestOptions>[];+ Future<ResponseBody> Function(RequestOptions) respond = (_) async => _user();++ @override+ Future<ResponseBody> fetch(RequestOptions options,+ Stream<Uint8List>? requestStream, Future<void>? cancelFuture) {+ requests.add(options);+ return respond(options);+ }++ @override+ void close({bool force = false}) {}+}++class _TestPaths extends PathProviderPlatform {+ _TestPaths(this.path);+ final String path;++ @override+ Future<String?> getApplicationSupportPath() async => path;+}