diff --git a/lib/core/utils/sync/icloud.dart b/lib/core/utils/sync/icloud.dart index 80d3ada4..b9af0d52 100644 --- a/lib/core/utils/sync/icloud.dart +++ b/lib/core/utils/sync/icloud.dart @@ -201,7 +201,6 @@ abstract final class ICloud { static Future sync() async { final result = await download(relativePath: Miscs.bakFileName); if (result != null) { - _logger.warning('Download backup failed: $result'); await backup(); return; } diff --git a/lib/core/utils/sync/webdav.dart b/lib/core/utils/sync/webdav.dart index 9420b28f..41f5f928 100644 --- a/lib/core/utils/sync/webdav.dart +++ b/lib/core/utils/sync/webdav.dart @@ -99,7 +99,6 @@ abstract final class Webdav { static Future sync() async { final result = await download(relativePath: Miscs.bakFileName); if (result != null) { - _logger.warning('Download failed: $result'); await backup(); return; } diff --git a/lib/data/model/app/backup.dart b/lib/data/model/app/backup.dart index fe45e595..8d296778 100644 --- a/lib/data/model/app/backup.dart +++ b/lib/data/model/app/backup.dart @@ -6,6 +6,7 @@ import 'package:logging/logging.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'; +import 'package:toolbox/data/res/misc.dart'; import 'package:toolbox/data/res/provider.dart'; import 'package:toolbox/data/res/rebuild.dart'; import 'package:toolbox/data/res/store.dart'; @@ -74,7 +75,7 @@ class Backup { static Future backup([String? name]) async { final result = _diyEncrypt(json.encode(Backup.loadFromStore().toJson())); - final path = '${Paths.doc}/${name ?? 'srvbox_bak.json'}'; + final path = '${Paths.doc}/${name ?? Miscs.bakFileName}'; await File(path).writeAsString(result); return path; } diff --git a/lib/data/res/misc.dart b/lib/data/res/misc.dart index 1b699080..efccc276 100644 --- a/lib/data/res/misc.dart +++ b/lib/data/res/misc.dart @@ -19,5 +19,5 @@ abstract final class Miscs { static const jsonEncoder = JsonEncoder.withIndent(' '); - static const bakFileName = 'srvbox_backup.json'; + static const bakFileName = 'srvbox_bak.json'; } diff --git a/lib/main.dart b/lib/main.dart index 204be757..4c2b2507 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -22,6 +22,7 @@ import 'package:toolbox/data/model/server/server_private_info.dart'; import 'package:toolbox/data/model/server/snippet.dart'; import 'package:toolbox/data/model/ssh/virtual_key.dart'; import 'package:toolbox/data/res/build_data.dart'; +import 'package:toolbox/data/res/misc.dart'; import 'package:toolbox/data/res/provider.dart'; import 'package:toolbox/data/res/store.dart'; import 'package:toolbox/data/res/url.dart'; @@ -64,7 +65,7 @@ void _runInZone(void Function() body) { Future _initApp() async { WidgetsFlutterBinding.ensureInitialized(); - await Paths.init(BuildData.name, bakName: 'srvbox'); + await Paths.init(BuildData.name, bakName: Miscs.bakFileName); await _initData(); _setupDebug();