opt.: rm settings of backup

This commit is contained in:
lollipopkit
2024-03-20 20:29:22 -06:00
parent fae3a20a9e
commit e11d505409
3 changed files with 2 additions and 25 deletions

View File

@@ -24,7 +24,6 @@ class Backup {
final List<Snippet> snippets; final List<Snippet> snippets;
final List<PrivateKeyInfo> keys; final List<PrivateKeyInfo> keys;
final Map<String, dynamic> container; final Map<String, dynamic> container;
final Map<String, dynamic> settings;
final Map<String, dynamic> history; final Map<String, dynamic> history;
final int? lastModTime; final int? lastModTime;
@@ -35,7 +34,6 @@ class Backup {
required this.snippets, required this.snippets,
required this.keys, required this.keys,
required this.container, required this.container,
required this.settings,
required this.history, required this.history,
this.lastModTime, this.lastModTime,
}); });
@@ -52,7 +50,6 @@ class Backup {
.map((e) => PrivateKeyInfo.fromJson(e)) .map((e) => PrivateKeyInfo.fromJson(e))
.toList(), .toList(),
container = json['container'] ?? {}, container = json['container'] ?? {},
settings = json['settings'] ?? {},
lastModTime = json['lastModTime'], lastModTime = json['lastModTime'],
history = json['history'] ?? {}; history = json['history'] ?? {};
@@ -63,7 +60,6 @@ class Backup {
'snippets': snippets, 'snippets': snippets,
'keys': keys, 'keys': keys,
'container': container, 'container': container,
'settings': settings,
'lastModTime': lastModTime, 'lastModTime': lastModTime,
'history': history, 'history': history,
}; };
@@ -75,7 +71,6 @@ class Backup {
snippets = Stores.snippet.fetch(), snippets = Stores.snippet.fetch(),
keys = Stores.key.fetch(), keys = Stores.key.fetch(),
container = Stores.container.box.toJson(), container = Stores.container.box.toJson(),
settings = Stores.setting.box.toJson(),
lastModTime = Stores.lastModTime, lastModTime = Stores.lastModTime,
history = Stores.history.box.toJson(); history = Stores.history.box.toJson();
@@ -95,22 +90,6 @@ class Backup {
return; return;
} }
// Settings
final nowSettingsKeys = Stores.setting.box.keys.toSet();
final bakSettingsKeys = settings.keys.toSet();
final newSettingsKeys = bakSettingsKeys.difference(nowSettingsKeys);
final delSettingsKeys = nowSettingsKeys.difference(bakSettingsKeys);
final updateSettingsKeys = nowSettingsKeys.intersection(bakSettingsKeys);
for (final k in newSettingsKeys) {
Stores.setting.box.put(k, settings[k]);
}
for (final k in delSettingsKeys) {
Stores.setting.box.delete(k);
}
for (final k in updateSettingsKeys) {
Stores.setting.box.put(k, settings[k]);
}
// Snippets // Snippets
final nowSnippets = Stores.snippet.box.keys.toSet(); final nowSnippets = Stores.snippet.box.keys.toSet();
final bakSnippets = snippets.map((e) => e.name).toSet(); final bakSnippets = snippets.map((e) => e.name).toSet();

View File

@@ -1,6 +1,5 @@
import 'dart:ui'; import 'dart:ui';
abstract final class Defaults { abstract final class Defaults {
static const primaryColor = Color.fromARGB(255, 145, 58, 31); static const primaryColor = Color.fromARGB(255, 145, 58, 31);

View File

@@ -42,9 +42,8 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
return ServerDetailCards.names; return ServerDetailCards.names;
} }
}(); }();
final disabled = ServerDetailCards.names final disabled =
.where((e) => !keys.contains(e)) ServerDetailCards.names.where((e) => !keys.contains(e)).toList();
.toList();
final allKeys = [...keys, ...disabled]; final allKeys = [...keys, ...disabled];
return ReorderableListView.builder( return ReorderableListView.builder(
padding: const EdgeInsets.all(7), padding: const EdgeInsets.all(7),