chore: screenshots

lib/core/extension/listx.dart

@@ -6,4 +6,12 @@ extension ListX<T> on List<T> {
     }
     return list;
   }
+
+  List<T> combine(List<T> other, [bool self = true]) {
+    final list = self ? this : List<T>.from(this);
+    for (var i = 0; i < length; i++) {
+      list[i] = other[i];
+    }
+    return list;
+  }
 }

lib/core/persistant_store.dart

@@ -1,9 +1,8 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:hive_flutter/hive_flutter.dart';
-import 'package:toolbox/data/res/path.dart';
+import 'package:toolbox/core/utils/misc.dart';
 
 // abstract final class SecureStore {
 //   static const _secureStorage = FlutterSecureStorage();
@@ -30,8 +29,8 @@ import 'package:toolbox/data/res/path.dart';
 //   }
 // }
 
-class PersistentStore<E> {
-  late final Box<E> box;
+class PersistentStore {
+  late final Box box;
 
   final String boxName;
 
@@ -41,35 +40,48 @@ class PersistentStore<E> {
         boxName,
         //encryptionCipher: SecureStore._cipher,
       );
+}
 
-  /// Get all db filenames.
-  ///
-  /// - [suffixs] defaults to ['.hive']
-  ///
-  /// - If [hideSetting] is true, hide 'setting.hive'
-  static Future<List<String>> getFileNames({
-    bool hideSetting = false,
-    List<String>? suffixs,
-  }) async {
-    final docPath = await Paths.doc;
-    final dir = Directory(docPath);
-    final files = await dir.list().toList();
-    if (suffixs != null) {
-      files.removeWhere((e) => !suffixs.contains(e.path.split('.').last));
-    } else {
-      // filter out non-hive(db) files
-      files.removeWhere((e) => !e.path.endsWith('.hive'));
+extension BoxX on Box {
+  static const _internalPreffix = '_sbi_';
+
+  /// Last modified timestamp
+  static const String lastModifiedKey = '${_internalPreffix}lastModified';
+  int? get lastModified {
+    final val = get(lastModifiedKey);
+    if (val == null || val is! int) {
+      final time = timeStamp;
+      put(lastModifiedKey, time);
+      return time;
     }
-    if (hideSetting) {
-      files.removeWhere((e) => e.path.endsWith('setting.hive'));
-    }
-    final paths =
-        files.map((e) => e.path.replaceFirst('$docPath/', '')).toList();
-    return paths;
+    return val;
   }
 
+  Future<void> updateLastModified() => put(lastModifiedKey, timeStamp);
+
   /// Convert db to json
-  Map<String, dynamic> toJson() => {for (var e in box.keys) e: box.get(e)};
+  Map<String, dynamic> toJson({bool includeInternal = true}) {
+    final json = <String, dynamic>{};
+    for (final key in keys) {
+      if (key is String &&
+          key.startsWith(_internalPreffix) &&
+          !includeInternal) {
+        continue;
+      }
+      json[key] = get(key);
+    }
+    return json;
+  }
+}
+
+extension StoreX on PersistentStore {
+  _StoreProperty<T> property<T>(String key, T defaultValue) {
+    return _StoreProperty<T>(box, key, defaultValue);
+  }
+
+  _StoreListProperty<T> listProperty<T>(String key, List<T> defaultValue) {
+    return _StoreListProperty<T>(box, key, defaultValue);
+  }
 }
 
 abstract class StorePropertyBase<T> {
@@ -79,8 +91,8 @@ abstract class StorePropertyBase<T> {
   Future<void> delete();
 }
 
-class StoreProperty<T> implements StorePropertyBase<T> {
-  StoreProperty(this._box, this._key, this.defaultValue);
+class _StoreProperty<T> implements StorePropertyBase<T> {
+  _StoreProperty(this._box, this._key, this.defaultValue);
 
   final Box _box;
   final String _key;
@@ -102,6 +114,7 @@ class StoreProperty<T> implements StorePropertyBase<T> {
 
   @override
   Future<void> put(T value) {
+    _box.updateLastModified();
     return _box.put(_key, value);
   }
 
@@ -111,8 +124,8 @@ class StoreProperty<T> implements StorePropertyBase<T> {
   }
 }
 
-class StoreListProperty<T> implements StorePropertyBase<List<T>> {
-  StoreListProperty(this._box, this._key, this.defaultValue);
+class _StoreListProperty<T> implements StorePropertyBase<List<T>> {
+  _StoreListProperty(this._box, this._key, this.defaultValue);
 
   final Box _box;
   final String _key;

lib/core/utils/icloud.dart

@@ -2,29 +2,13 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:icloud_storage/icloud_storage.dart';
+import 'package:toolbox/data/model/app/sync.dart';
 import 'package:toolbox/data/res/logger.dart';
 
 import '../../data/model/app/error.dart';
 import '../../data/model/app/json.dart';
 import '../../data/res/path.dart';
 
-class SyncResult<T, E> {
-  final List<T> up;
-  final List<T> down;
-  final Map<T, E> err;
-
-  const SyncResult({
-    required this.up,
-    required this.down,
-    required this.err,
-  });
-
-  @override
-  String toString() {
-    return 'SyncResult{up: $up, down: $down, err: $err}';
-  }
-}
-
 abstract final class ICloud {
   static const _containerId = 'iCloud.tech.lolli.serverbox';
 
@@ -111,7 +95,7 @@ abstract final class ICloud {
   /// Return `null` if upload success, `ICloudErr` otherwise
   ///
   /// TODO: consider merge strategy, use [SyncAble] and [JsonSerializable]
-  static Future<SyncResult<String, ICloudErr>> sync({
+  static Future<SyncResult<String, ICloudErr>> syncFiles({
     required Iterable<String> relativePaths,
     String? bakPrefix,
   }) async {
@@ -196,4 +180,5 @@ abstract final class ICloud {
       Loggers.app.info('iCloud sync, up: $uploadFiles, down: $downloadFiles');
     }
   }
+
 }

lib/core/utils/misc.dart

@@ -37,3 +37,5 @@ String pathJoin(String path1, String path2) {
 
 /// Check if a url is a file url (ends with a file extension)
 bool isFileUrl(String url) => url.split('/').last.contains('.');
+
+int get timeStamp => DateTime.now().millisecondsSinceEpoch;

lib/data/model/app/backup.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:toolbox/core/persistant_store.dart';
 import 'package:toolbox/data/model/server/private_key_info.dart';
 import 'package:toolbox/data/model/server/server_private_info.dart';
 import 'package:toolbox/data/model/server/snippet.dart';
@@ -60,8 +61,8 @@ class Backup {
         spis = Stores.server.fetch(),
         snippets = Stores.snippet.fetch(),
         keys = Stores.key.fetch(),
-        dockerHosts = Stores.docker.toJson(),
-        settings = Stores.setting.toJson();
+        dockerHosts = Stores.docker.box.toJson(),
+        settings = Stores.setting.box.toJson();
 
   static Future<String> backup() async {
     final result = _diyEncrypt(json.encode(Backup.loadFromStore()));

lib/data/model/app/sync.dart

@@ -0,0 +1,24 @@
+import 'dart:async';
+
+class SyncResult<T, E> {
+  final List<T> up;
+  final List<T> down;
+  final Map<T, E> err;
+
+  const SyncResult({
+    required this.up,
+    required this.down,
+    required this.err,
+  });
+
+  @override
+  String toString() {
+    return 'SyncResult{up: $up, down: $down, err: $err}';
+  }
+}
+
+abstract class SyncIface<T> {
+  /// Merge [other] into [this], return [this] after merge.
+  /// Data in [other] has higher priority than [this].
+  FutureOr<void> sync(T other);
+}

lib/data/model/app/syncable.dart

@@ -1,9 +0,0 @@
-abstract class SyncAble<T> {
-  /// If [other] is newer than [this] then return true,
-  /// else return false
-  bool needSync(T other);
-
-  /// Merge [other] into [this],
-  /// return [this] after merge
-  T merge(T other);
-}

lib/data/store/docker.dart

@@ -1,6 +1,6 @@
 import '../../core/persistant_store.dart';
 
-class DockerStore extends PersistentStore<String> {
+class DockerStore extends PersistentStore {
   DockerStore() : super('docker');
 
   String? fetch(String? id) {

lib/data/store/private_key.dart

@@ -1,7 +1,7 @@
 import '../../core/persistant_store.dart';
 import '../model/server/private_key_info.dart';
 
-class PrivateKeyStore extends PersistentStore<PrivateKeyInfo> {
+class PrivateKeyStore extends PersistentStore {
   PrivateKeyStore() : super('key');
 
   void put(PrivateKeyInfo info) {

lib/data/store/server.dart

@@ -1,7 +1,7 @@
 import '../../core/persistant_store.dart';
 import '../model/server/server_private_info.dart';
 
-class ServerStore extends PersistentStore<ServerPrivateInfo> {
+class ServerStore extends PersistentStore {
   ServerStore() : super('server');
 
   void put(ServerPrivateInfo info) {

lib/data/store/setting.dart

@@ -15,22 +15,19 @@ class SettingStore extends PersistentStore {
   // item in the drawer of the home page)
 
   /// Discussion #146
-  late final serverTabUseOldUI = StoreProperty(
-    box,
+  late final serverTabUseOldUI = property(
     'serverTabUseOldUI',
     false,
   );
 
   /// Time out for server connect and more...
-  late final timeout = StoreProperty(
-    box,
+  late final timeout = property(
     'timeOut',
     5,
   );
 
   /// Record history of SFTP path and etc.
-  late final recordHistory = StoreProperty(
-    box,
+  late final recordHistory = property(
     'recordHistory',
     true,
   );
@@ -38,142 +35,125 @@ class SettingStore extends PersistentStore {
   /// Bigger for bigger font size
   /// 1.0 means 100%
   /// Warning: This may cause some UI issues
-  late final textFactor = StoreProperty(
-    box,
+  late final textFactor = property(
     'textFactor',
     1.0,
   );
 
   /// Lanch page idx
-  late final launchPage = StoreProperty(
-    box,
+  late final launchPage = property(
     'launchPage',
     Defaults.launchPageIdx,
   );
 
   /// Server detail disk ignore path
   late final diskIgnorePath =
-      StoreListProperty(box, 'diskIgnorePath', Defaults.diskIgnorePath);
+      property('diskIgnorePath', Defaults.diskIgnorePath);
 
   /// Use double column servers page on Desktop
-  late final doubleColumnServersPage = StoreProperty(
-    box,
+  late final doubleColumnServersPage = property(
     'doubleColumnServersPage',
     isDesktop,
   );
 
   /// Disk view: amount / IO
-  late final serverTabPreferDiskAmount = StoreProperty(
-    box,
+  late final serverTabPreferDiskAmount = property(
     'serverTabPreferDiskAmount',
     false,
   );
 
   // ------END------
 
-  late final primaryColor = StoreProperty(
-    box,
+  late final primaryColor = property(
     'primaryColor',
     4287106639,
   );
 
-  late final serverStatusUpdateInterval = StoreProperty(
-    box,
+  late final serverStatusUpdateInterval = property(
     'serverStatusUpdateInterval',
     Defaults.updateInterval,
   );
 
   // Max retry count when connect to server
-  late final maxRetryCount = StoreProperty(box, 'maxRetryCount', 2);
+  late final maxRetryCount = property('maxRetryCount', 2);
 
   // Night mode: 0 -> auto, 1 -> light, 2 -> dark, 3 -> AMOLED, 4 -> AUTO-AMOLED
-  late final themeMode = StoreProperty(box, 'themeMode', 0);
+  late final themeMode = property('themeMode', 0);
 
   // Font file path
-  late final fontPath = StoreProperty(box, 'fontPath', '');
+  late final fontPath = property('fontPath', '');
 
   // Backgroud running (Android)
-  late final bgRun = StoreProperty(box, 'bgRun', isAndroid);
+  late final bgRun = property('bgRun', isAndroid);
 
   // Server order
-  late final serverOrder = StoreListProperty<String>(box, 'serverOrder', []);
+  late final serverOrder = listProperty<String>('serverOrder', []);
 
-  late final snippetOrder = StoreListProperty<String>(box, 'snippetOrder', []);
+  late final snippetOrder = listProperty<String>('snippetOrder', []);
 
   // Server details page cards order
   late final detailCardOrder =
-      StoreListProperty(box, 'detailCardPrder', Defaults.detailCardOrder);
+      listProperty('detailCardPrder', Defaults.detailCardOrder);
 
   // SSH term font size
-  late final termFontSize = StoreProperty(box, 'termFontSize', 13.0);
+  late final termFontSize = property('termFontSize', 13.0);
 
   // Locale
-  late final locale = StoreProperty<String>(box, 'locale', '');
+  late final locale = property<String>('locale', '');
 
   // SSH virtual key (ctrl | alt) auto turn off
-  late final sshVirtualKeyAutoOff =
-      StoreProperty(box, 'sshVirtualKeyAutoOff', true);
+  late final sshVirtualKeyAutoOff = property('sshVirtualKeyAutoOff', true);
 
-  late final editorFontSize = StoreProperty(box, 'editorFontSize', 13.0);
+  late final editorFontSize = property('editorFontSize', 13.0);
 
   // Editor theme
-  late final editorTheme = StoreProperty(
-    box,
+  late final editorTheme = property(
     'editorTheme',
     Defaults.editorTheme,
   );
 
-  late final editorDarkTheme = StoreProperty(
-    box,
+  late final editorDarkTheme = property(
     'editorDarkTheme',
     Defaults.editorDarkTheme,
   );
 
-  late final fullScreen = StoreProperty(
-    box,
+  late final fullScreen = property(
     'fullScreen',
     false,
   );
 
-  late final fullScreenJitter = StoreProperty(
-    box,
+  late final fullScreenJitter = property(
     'fullScreenJitter',
     true,
   );
 
-  late final fullScreenRotateQuarter = StoreProperty(
-    box,
+  late final fullScreenRotateQuarter = property(
     'fullScreenRotateQuarter',
     1,
   );
 
-  late final keyboardType = StoreProperty(
-    box,
+  late final keyboardType = property(
     'keyboardType',
     TextInputType.text.index,
   );
 
-  late final sshVirtKeys = StoreListProperty(
-    box,
+  late final sshVirtKeys = listProperty(
     'sshVirtKeys',
     Defaults.sshVirtKeys,
   );
 
-  late final netViewType = StoreProperty(
-    box,
+  late final netViewType = property(
     'netViewType',
     NetViewType.speed,
   );
 
   // Only valid on iOS
-  late final autoUpdateHomeWidget = StoreProperty(
-    box,
+  late final autoUpdateHomeWidget = property(
     'autoUpdateHomeWidget',
     isIOS,
   );
 
-  late final autoCheckAppUpdate = StoreProperty(
-    box,
+  late final autoCheckAppUpdate = property(
     'autoCheckAppUpdate',
     true,
   );
@@ -181,59 +161,54 @@ class SettingStore extends PersistentStore {
   /// Display server tab function buttons on the bottom of each server card if [true]
   ///
   /// Otherwise, display them on the top of server detail page
-  late final moveOutServerTabFuncBtns = StoreProperty(
-    box,
+  late final moveOutServerTabFuncBtns = property(
     'moveOutServerTabFuncBtns',
     true,
   );
 
   /// Whether use `rm -r` to delete directory on SFTP
-  late final sftpRmrDir = StoreProperty(
-    box,
+  late final sftpRmrDir = property(
     'sftpRmrDir',
     false,
   );
 
   /// Whether use system's primary color as the app's primary color
-  late final useSystemPrimaryColor = StoreProperty(
-    box,
+  late final useSystemPrimaryColor = property(
     'useSystemPrimaryColor',
     false,
   );
 
   /// Only valid on iOS and macOS
-  late final icloudSync = StoreProperty(
-    box,
+  late final icloudSync = property(
     'icloudSync',
     false,
   );
 
   /// Only valid on iOS / Android / Windows
-  late final useBioAuth = StoreProperty(
-    box,
+  late final useBioAuth = property(
     'useBioAuth',
     false,
   );
 
   /// The performance of highlight is bad
-  late final editorHighlight = StoreProperty(box, 'editorHighlight', true);
+  late final editorHighlight = property('editorHighlight', true);
 
   /// Open SFTP with last viewed path
-  late final sftpOpenLastPath = StoreProperty(box, 'sftpOpenLastPath', true);
+  late final sftpOpenLastPath = property('sftpOpenLastPath', true);
 
   /// Show tip of suspend
-  late final showSuspendTip = StoreProperty(box, 'showSuspendTip', true);
+  late final showSuspendTip = property('showSuspendTip', true);
 
   /// Server func btns display name
   late final serverFuncBtnsDisplayName =
-      StoreProperty(box, 'serverFuncBtnsDisplayName', false);
+      property('serverFuncBtnsDisplayName', false);
 
   // Never show these settings for users
   //
   // ------BEGIN------
 
   /// Version of store db
-  late final storeVersion = StoreProperty(box, 'storeVersion', 0);
+  late final storeVersion = property('storeVersion', 0);
 
   // ------END------
 }

lib/data/store/snippet.dart

@@ -1,7 +1,7 @@
 import '../../core/persistant_store.dart';
 import '../model/server/snippet.dart';
 
-class SnippetStore extends PersistentStore<Snippet> {
+class SnippetStore extends PersistentStore {
   SnippetStore() : super('snippet');
 
   void put(Snippet snippet) {

lib/view/page/backup.dart

@@ -95,8 +95,6 @@ class BackupPage extends StatelessWidget {
               prop: Stores.setting.icloudSync,
               func: (val) async {
                 if (val) {
-                  final relativePaths = await PersistentStore.getFileNames();
-                  await ICloud.sync(relativePaths: relativePaths);
                 }
               },
             ),
@@ -109,35 +107,25 @@ class BackupPage extends StatelessWidget {
                 if (icloudLoading.value) {
                   return UIs.centerSizedLoadingSmall;
                 }
-                return ConstrainedBox(
-                  constraints: const BoxConstraints(maxWidth: 137),
-                  child: Row(
-                    children: [
-                      TextButton(
-                        onPressed: () async {
-                          icloudLoading.value = true;
-                          final files = await PersistentStore.getFileNames();
-                          for (final file in files) {
-                            await ICloud.download(relativePath: file);
-                          }
-                          icloudLoading.value = false;
-                        },
-                        child: Text(l10n.download),
-                      ),
-                      UIs.width7,
-                      TextButton(
-                        onPressed: () async {
-                          icloudLoading.value = true;
-                          final files = await PersistentStore.getFileNames();
-                          for (final file in files) {
-                            await ICloud.upload(relativePath: file);
-                          }
-                          icloudLoading.value = false;
-                        },
-                        child: Text(l10n.upload),
-                      ),
-                    ],
-                  ),
+                return Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    TextButton(
+                      onPressed: () async {
+                        icloudLoading.value = true;
+                        icloudLoading.value = false;
+                      },
+                      child: Text(l10n.download),
+                    ),
+                    UIs.width7,
+                    TextButton(
+                      onPressed: () async {
+                        icloudLoading.value = true;
+                        icloudLoading.value = false;
+                      },
+                      child: Text(l10n.upload),
+                    ),
+                  ],
                 );
               },
             ),

lib/view/page/home.dart

@@ -8,6 +8,7 @@ import 'package:toolbox/core/channel/bg_run.dart';
 import 'package:toolbox/core/channel/home_widget.dart';
 import 'package:toolbox/core/extension/context/dialog.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
+import 'package:toolbox/core/persistant_store.dart';
 import 'package:toolbox/core/utils/platform/auth.dart';
 import 'package:toolbox/core/utils/platform/base.dart';
 import 'package:toolbox/data/res/github_id.dart';
@@ -340,7 +341,7 @@ class _HomePageState extends State<HomePage>
   }
 
   Future<void> _onLongPressSetting() async {
-    final map = Stores.setting.toJson();
+    final map = Stores.setting.box.toJson(includeInternal: false);
     final keys = map.keys;
 
     /// Encode [map] to String with indent `\t`

lib/view/page/server/tab.dart

@@ -219,29 +219,31 @@ class _ServerPageState extends State<ServerPage>
     final cardStatus = getCardNoti(id);
     final title = _buildServerCardTitle(srv.status, srv.state, srv.spi);
 
-    return AnimatedContainer(
-      duration: const Duration(milliseconds: 377),
-      curve: Curves.fastEaseInToSlowEaseOut,
-      height: _calcCardHeight(srv.state, cardStatus.value.flip),
-      child: ValueBuilder(
-        listenable: cardStatus,
-        build: () {
-          final List<Widget> children = [title];
-          if (srv.state == ServerState.finished) {
-            if (cardStatus.value.flip) {
-              children.addAll(_buildFlipedCard(srv));
-            } else {
-              children.addAll(_buildNormalCard(srv.status, srv.spi));
-            }
+    return ValueBuilder(
+      listenable: cardStatus,
+      build: () {
+        late final List<Widget> children;
+        if (srv.state == ServerState.finished) {
+          if (cardStatus.value.flip) {
+            children = [title, ..._buildFlipedCard(srv)];
+          } else {
+            children = [title, ..._buildNormalCard(srv.status, srv.spi)];
           }
-          return Column(
+        } else {
+          children = [title];
+        }
+        return AnimatedContainer(
+          duration: const Duration(milliseconds: 377),
+          curve: Curves.fastEaseInToSlowEaseOut,
+          height: _calcCardHeight(srv.state, cardStatus.value.flip),
+          child: Column(
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: children,
-          );
-        },
-      ),
+          ),
+        );
+      },
     );
   }