fix: cloud sync (#769)

This commit is contained in:
lollipopkit🏳️‍⚧️
2025-06-04 00:11:31 +08:00
committed by GitHub
parent 9547d92ac5
commit 0c1ada0067
70 changed files with 2348 additions and 1906 deletions

View File

@@ -12,17 +12,17 @@ extension SftpFileX on SftpFileMode {
UnixPerm toUnixPerm() {
return UnixPerm(
user: RWX(
user: UnixPermOp(
r: userRead,
w: userWrite,
x: userExecute,
),
group: RWX(
group: UnixPermOp(
r: groupRead,
w: groupWrite,
x: groupExecute,
),
other: RWX(
other: UnixPermOp(
r: otherRead,
w: otherWrite,
x: otherExecute,

View File

@@ -1,7 +1,8 @@
import 'dart:io';
import 'package:fl_lib/fl_lib.dart';
import 'package:server_box/data/model/app/backup.dart';
import 'package:server_box/data/model/app/bak/backup2.dart';
import 'package:server_box/data/model/app/bak/utils.dart';
const bakSync = BakSyncer._();
@@ -11,12 +12,12 @@ final class BakSyncer extends SyncIface {
const BakSyncer._() : super();
@override
Future<void> saveToFile() => Backup.backup();
Future<void> saveToFile() => BackupV2.backup();
@override
Future<Backup> fromFile(String path) async {
Future<Mergeable> fromFile(String path) async {
final content = await File(path).readAsString();
return Backup.fromJsonString(content);
return MergeableUtils.fromJsonString(content).$1;
}
@override