opt.: sync immediately after changes (#577)

This commit is contained in:
lollipopkit🏳️‍⚧️
2024-09-14 17:08:51 +08:00
committed by GitHub
parent d611fdcd50
commit 90b88ed795
17 changed files with 64 additions and 124 deletions

View File

@@ -4,16 +4,16 @@ import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/data/model/app/backup.dart';
import 'package:server_box/data/store/no_backup.dart';
const sync = Sync._();
const bakSync = BakSyncer._();
final class Sync extends SyncCfg {
const Sync._() : super();
final class BakSyncer extends SyncIface<Backup> {
const BakSyncer._() : super();
@override
Future<void> saveToFile() => Backup.backup();
@override
Future<Mergeable> fromFile(String path) async {
Future<Backup> fromFile(String path) async {
final content = await File(path).readAsString();
return Backup.fromJsonString(content);
}

View File

@@ -1,4 +1,5 @@
import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/core/sync.dart';
import 'package:server_box/data/model/server/private_key_info.dart';
import 'package:server_box/data/res/store.dart';
@@ -18,12 +19,14 @@ class PrivateKeyProvider extends Provider {
pkis.value.add(info);
pkis.notify();
Stores.key.put(info);
bakSync.sync(milliDelay: 1000);
}
static void delete(PrivateKeyInfo info) {
pkis.value.removeWhere((e) => e.id == info.id);
pkis.notify();
Stores.key.delete(info);
bakSync.sync(milliDelay: 1000);
}
static void update(PrivateKeyInfo old, PrivateKeyInfo newInfo) {
@@ -37,5 +40,6 @@ class PrivateKeyProvider extends Provider {
Stores.key.put(newInfo);
}
pkis.notify();
bakSync.sync(milliDelay: 1000);
}
}

View File

@@ -5,6 +5,7 @@ import 'package:computer/computer.dart';
import 'package:dartssh2/dartssh2.dart';
import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/core/extension/ssh_client.dart';
import 'package:server_box/core/sync.dart';
import 'package:server_box/core/utils/ssh_auth.dart';
import 'package:server_box/data/model/app/error.dart';
import 'package:server_box/data/model/app/shell_func.dart';
@@ -190,6 +191,7 @@ class ServerProvider extends Provider {
Stores.setting.serverOrder.put(serverOrder.value);
_updateTags();
refresh(spi: spi);
bakSync.sync(milliDelay: 1000);
}
static void delServer(String id) {
@@ -199,6 +201,7 @@ class ServerProvider extends Provider {
Stores.setting.serverOrder.put(serverOrder.value);
Stores.server.delete(id);
_updateTags();
bakSync.sync(milliDelay: 1000);
}
static void deleteAll() {
@@ -234,6 +237,7 @@ class ServerProvider extends Provider {
}
}
_updateTags();
bakSync.sync();
}
static void _setServerState(VNode<Server> s, ServerConn ss) {

View File

@@ -1,4 +1,5 @@
import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/core/sync.dart';
import 'package:server_box/data/model/server/snippet.dart';
import 'package:server_box/data/res/store.dart';
@@ -44,6 +45,7 @@ class SnippetProvider extends Provider {
snippets.notify();
Stores.snippet.put(snippet);
_updateTags();
bakSync.sync(milliDelay: 1000);
}
static void del(Snippet snippet) {
@@ -51,6 +53,7 @@ class SnippetProvider extends Provider {
snippets.notify();
Stores.snippet.delete(snippet);
_updateTags();
bakSync.sync(milliDelay: 1000);
}
static void update(Snippet old, Snippet newOne) {
@@ -60,6 +63,7 @@ class SnippetProvider extends Provider {
Stores.snippet.delete(old);
Stores.snippet.put(newOne);
_updateTags();
bakSync.sync(milliDelay: 1000);
}
static void renameTag(String old, String newOne) {
@@ -71,5 +75,6 @@ class SnippetProvider extends Provider {
}
}
_updateTags();
bakSync.sync(milliDelay: 1000);
}
}

View File

@@ -1,35 +1,38 @@
import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/data/store/container.dart';
import 'package:server_box/data/store/history.dart';
import 'package:server_box/data/store/no_backup.dart';
import 'package:server_box/data/store/private_key.dart';
import 'package:server_box/data/store/server.dart';
import 'package:server_box/data/store/setting.dart';
import 'package:server_box/data/store/snippet.dart';
abstract final class Stores {
static final setting = SettingStore();
static final server = ServerStore();
static final container = ContainerStore();
static final history = HistoryStore();
static final key = PrivateKeyStore();
static final snippet = SnippetStore();
static final setting = SettingStore.instance;
static final server = ServerStore.instance;
static final container = ContainerStore.instance;
static final key = PrivateKeyStore.instance;
static final snippet = SnippetStore.instance;
static final history = HistoryStore.instance;
static final List<PersistentStore> all = [
setting,
server,
container,
history,
key,
snippet,
/// All stores that need backup
static final List<PersistentStore> _allBackup = [
SettingStore.instance,
ServerStore.instance,
ContainerStore.instance,
PrivateKeyStore.instance,
SnippetStore.instance,
HistoryStore.instance,
];
static Future<void> init() async {
await Future.wait(all.map((store) => store.init()));
await Future.wait(_allBackup.map((store) => store.init()));
await NoBackupStore.instance.init();
}
static int? get lastModTime {
int? lastModTime = 0;
for (final store in all) {
for (final store in _allBackup) {
final last = store.box.lastModified ?? 0;
if (last > (lastModTime ?? 0)) {
lastModTime = last;

View File

@@ -5,7 +5,9 @@ import 'package:server_box/data/res/store.dart';
const _keyConfig = 'providerConfig';
class ContainerStore extends PersistentStore {
ContainerStore() : super('docker');
ContainerStore._() : super('docker');
static final instance = ContainerStore._();
String? fetch(String? id) {
return box.get(id);

View File

@@ -46,7 +46,9 @@ class _MapHistory {
}
class HistoryStore extends PersistentStore {
HistoryStore() : super('history');
HistoryStore._() : super('history');
static final instance = HistoryStore._();
/// Paths that user has visited by 'Locate' button
late final sftpGoPath = _ListHistory(box: box, name: 'sftpPath');

View File

@@ -3,7 +3,9 @@ import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/data/model/server/private_key_info.dart';
class PrivateKeyStore extends PersistentStore {
PrivateKeyStore() : super('key');
PrivateKeyStore._() : super('key');
static final instance = PrivateKeyStore._();
void put(PrivateKeyInfo info) {
box.put(info.id, info);

View File

@@ -3,7 +3,9 @@ import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/data/model/server/server_private_info.dart';
class ServerStore extends PersistentStore {
ServerStore() : super('server');
ServerStore._() : super('server');
static final instance = ServerStore._();
void put(Spi info) {
box.put(info.id, info);

View File

@@ -7,7 +7,9 @@ import 'package:server_box/data/model/app/net_view.dart';
import 'package:server_box/data/res/default.dart';
class SettingStore extends PersistentStore {
SettingStore() : super('setting');
SettingStore._() : super('setting');
static final instance = SettingStore._();
// ------BEGIN------
//

View File

@@ -3,7 +3,9 @@ import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/data/model/server/snippet.dart';
class SnippetStore extends PersistentStore {
SnippetStore() : super('snippet');
SnippetStore._() : super('snippet');
static final instance = SnippetStore._();
void put(Snippet snippet) {
box.put(snippet.name, snippet);

View File

@@ -122,7 +122,7 @@ void _doPlatformRelated() async {
// Plus 1 to avoid 0.
Computer.shared.turnOn(workersCount: (serversCount / 3).round() + 1);
sync.sync();
bakSync.sync();
}
// It may contains some async heavy funcs.

View File

@@ -104,7 +104,7 @@ class BackupPage extends StatelessWidget {
callback: (val) async {
if (val) {
icloudLoading.value = true;
await sync.sync(rs: icloud);
await bakSync.sync(rs: icloud);
icloudLoading.value = false;
}
},
@@ -147,7 +147,7 @@ class BackupPage extends StatelessWidget {
callback: (val) async {
if (val) {
webdavLoading.value = true;
await sync.sync(rs: webdav);
await bakSync.sync(rs: webdav);
webdavLoading.value = false;
}
},

View File

@@ -15,7 +15,7 @@ final class _AppBar extends CustomAppBar {
@override
Widget build(BuildContext context) {
final placeholder = SizedBox(
height: CustomAppBar.barHeight ?? 0 + MediaQuery.of(context).padding.top,
height: CustomAppBar.sysStatusBarHeight ?? 0 + MediaQuery.of(context).padding.top,
);
return selectIndex.listenVal(
(idx) {

View File

@@ -137,7 +137,7 @@ class SSHPageState extends State<SSHPage>
_media.padding.top,
child: Padding(
padding: EdgeInsets.only(
top: widget.notFromTab ? CustomAppBar.barHeight ?? 0 : 0,
top: widget.notFromTab ? CustomAppBar.sysStatusBarHeight ?? 0 : 0,
left: _horizonPadding,
right: _horizonPadding,
),
@@ -155,7 +155,7 @@ class SSHPageState extends State<SSHPage>
showToolbar: isMobile,
viewOffset: Offset(
2 * _horizonPadding,
CustomAppBar.barHeight ?? _media.padding.top,
CustomAppBar.sysStatusBarHeight ?? _media.padding.top,
),
hideScrollBar: false,
focusNode: widget.focusNode,