opt: hive ce (#1868)

lib/models/model_owner.dart

@@ -1,6 +1,6 @@
 import 'package:PiliPlus/models/model_video.dart';
 import 'package:PiliPlus/utils/utils.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 part 'model_owner.g.dart';
 

lib/models/user/danmaku_rule_adapter.dart

@@ -1,5 +1,5 @@
 import 'package:PiliPlus/models/user/danmaku_rule.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 class RuleFilterAdapter extends TypeAdapter<RuleFilter> {
   @override

lib/models/user/info.dart

@@ -1,5 +1,5 @@
 import 'package:PiliPlus/utils/extension/map_ext.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 part 'info.g.dart';
 

lib/models/user/stat.dart

@@ -1,4 +1,4 @@
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 part 'stat.g.dart';
 

lib/pages/search/controller.dart

@@ -54,7 +54,7 @@ abstract class DebounceStreamState<T extends StatefulWidget, S> extends State<T>
 
 class BaseSearchController extends GetxController {
   final historyList = List<String>.from(
-    GStorage.historyWord.get('cacheList') ?? [],
+    GStorage.historyWord.get('cacheList') ?? const <String>[],
   ).obs;
 
   late final Rx<LoadingState<SearchTrendingData>> trendingState;

lib/pages/setting/pages/display_mode.dart

@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show PlatformException;
 import 'package:flutter_displaymode/flutter_displaymode.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 class SetDisplayMode extends StatefulWidget {
   const SetDisplayMode({super.key});

lib/pages/setting/pages/play_speed_set.dart

@@ -11,7 +11,7 @@ import 'package:flutter/material.dart' hide ListTile;
 import 'package:flutter/services.dart' show FilteringTextInputFormatter;
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 class PlaySpeedPage extends StatefulWidget {
   const PlaySpeedPage({super.key});

lib/pages/sponsor_block/view.dart

@@ -17,7 +17,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show FilteringTextInputFormatter;
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 class SponsorBlockPage extends StatefulWidget {

lib/pages/video/controller.dart

@@ -71,7 +71,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:flutter_volume_controller/flutter_volume_controller.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 import 'package:media_kit/media_kit.dart' hide Subtitle;
 import 'package:path/path.dart' as path;
 

lib/pages/video/widgets/header_control.dart

@@ -63,7 +63,7 @@ import 'package:flutter/material.dart' hide showBottomSheet;
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 import 'package:intl/intl.dart' show DateFormat;
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 

lib/plugin/pl_player/controller.dart

@@ -53,7 +53,7 @@ import 'package:flutter/services.dart' show HapticFeedback;
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:flutter_volume_controller/flutter_volume_controller.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
 import 'package:path/path.dart' as path;

lib/utils/accounts.dart

@@ -3,7 +3,7 @@ import 'package:PiliPlus/models/common/account_type.dart';
 import 'package:PiliPlus/pages/mine/controller.dart';
 import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:PiliPlus/utils/login_utils.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 abstract final class Accounts {
   static late final Box<LoginAccount> account;
@@ -70,13 +70,13 @@ abstract final class Accounts {
   //   }
   // }
 
-  static Future<void> refresh() async {
+  static Future<void> refresh() {
     for (final a in account.values) {
       for (final t in a.type) {
         accountMode[t.index] = a;
       }
     }
-    await Future.wait(
+    return Future.wait(
       (accountMode.toSet()..removeWhere((i) => i.activated)).map(
         Request.buvidActive,
       ),

lib/utils/accounts/account.dart

@@ -4,7 +4,7 @@ import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/accounts/grpc_headers.dart';
 import 'package:PiliPlus/utils/id_utils.dart';
 import 'package:cookie_jar/cookie_jar.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 sealed class Account {
   Map<String, dynamic>? toJson() => null;

lib/utils/accounts/account_adapter.dart

@@ -1,7 +1,7 @@
 import 'package:PiliPlus/models/common/account_type.dart';
 import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:cookie_jar/cookie_jar.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 class LoginAccountAdapter extends TypeAdapter<LoginAccount> {
   @override

lib/utils/accounts/account_type_adapter.dart

@@ -1,5 +1,5 @@
 import 'package:PiliPlus/models/common/account_type.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 class AccountTypeAdapter extends TypeAdapter<AccountType> {
   @override

lib/utils/accounts/cookie_jar_adapter.dart

@@ -1,6 +1,6 @@
 import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:cookie_jar/cookie_jar.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 class BiliCookieJarAdapter extends TypeAdapter<DefaultCookieJar> {
   @override

lib/utils/extension/box_ext.dart

@@ -1,5 +1,5 @@
 import 'package:collection/collection.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 extension BoxExt<E> on Box<E> {
   bool equal(dynamic key, E value) {

lib/utils/set_int_adapter.dart

@@ -1,4 +1,4 @@
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 class SetIntAdapter extends TypeAdapter<Set<int>> {
   @override

lib/utils/storage.dart

@@ -12,7 +12,7 @@ import 'package:PiliPlus/utils/path_utils.dart';
 import 'package:PiliPlus/utils/set_int_adapter.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:PiliPlus/utils/utils.dart';
-import 'package:hive_flutter/hive_flutter.dart';
+import 'package:hive_ce/hive.dart';
 import 'package:path/path.dart' as path;
 
 abstract final class GStorage {
@@ -25,7 +25,7 @@ abstract final class GStorage {
   static late final Box<Uint8List>? reply;
 
   static Future<void> init() async {
-    await Hive.initFlutter(path.join(appSupportDirPath, 'hive'));
+    Hive.init(path.join(appSupportDirPath, 'hive'));
     regAdapter();
 
     await Future.wait([
@@ -57,7 +57,7 @@ abstract final class GStorage {
       Accounts.init(),
       Hive.openBox<int>(
         'watchProgress',
-        keyComparator: _intStrKeyComparator,
+        keyComparator: _intStrDescKeyComparator,
         compactionStrategy: (entries, deletedEntries) {
           return deletedEntries > 4;
         },
@@ -67,7 +67,7 @@ abstract final class GStorage {
     if (Pref.saveReply) {
       reply = await Hive.openBox<Uint8List>(
         'reply',
-        keyComparator: _intStrKeyComparator,
+        keyComparator: _intStrDescKeyComparator,
         compactionStrategy: (entries, deletedEntries) {
           return deletedEntries > 10;
         },
@@ -147,7 +147,7 @@ abstract final class GStorage {
     ]);
   }
 
-  static int _intStrKeyComparator(dynamic k1, dynamic k2) {
+  static int _intStrDescKeyComparator(dynamic k1, dynamic k2) {
     if (k1 is int) {
       if (k2 is int) {
         return k2.compareTo(k1);

lib/utils/storage_pref.dart

@@ -43,7 +43,7 @@ import 'package:flex_seed_scheme/flex_seed_scheme.dart' show FlexSchemeVariant;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 abstract final class Pref {
   static final Box _setting = GStorage.setting;

lib/utils/wbi_sign.dart

@@ -11,7 +11,7 @@ import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/storage_key.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:crypto/crypto.dart';
-import 'package:hive/hive.dart';
+import 'package:hive_ce/hive.dart';
 
 abstract final class WbiSign {
   static Box get _localCache => GStorage.localCache;