Skip to content

Offline gym log for Android. No account, no ads, no internet.

Roll back a restore that fails

InlitX26c8f2b7b466
diff --git a/lib/services/backup_zip.dart b/lib/services/backup_zip.dart
index 7543e61..ca98785 100644
--- a/lib/services/backup_zip.dart
+++ b/lib/services/backup_zip.dart
@@ -112,6 +112,21 @@ Future<Uint8List> buildBackupZip() async {
return ZipEncoder().encodeBytes(archive);
}
+bool isValidBackupZip(Uint8List zipBytes) {
+ try {
+ final archive = ZipDecoder().decodeBytes(zipBytes);
+ final jsonFile = _findJson(archive);
+ if (jsonFile == null) return false;
+ if (jsonDecode(utf8.decode(jsonFile.readBytes() ?? const [])) is! Map<String, dynamic>) return false;
+ for (final f in archive.files) {
+ if (f.isFile && f.readBytes() == null) return false;
+ }
+ return true;
+ } catch (_) {
+ return false;
+ }
+}
+
Future<bool> restoreBackupZip(Uint8List zipBytes) async {
final Archive archive;
try {
@@ -131,7 +146,7 @@ Future<bool> restoreBackupZip(Uint8List zipBytes) async {
return false;
}
- await MediaStore.clearAll();
+ final previous = MediaStore.names();
final wanted = <String, String>{};
((data['media'] as Map?) ?? {}).forEach((k, v) {
if (k is String && v is String && v.isNotEmpty) wanted[k] = v;
@@ -192,19 +207,29 @@ Future<bool> restoreBackupZip(Uint8List zipBytes) async {
if (base != null) restoredFoods[e.key] = base;
}
+ final ok = fit.tryApplyBackup(data,
+ restoredMedia: restored,
+ restoredNoteMedia: restoredNotes,
+ restoredShots: restoredShots,
+ restoredMoments: restoredMoments,
+ restoredFoods: restoredFoods);
+ final added = {...restored.values, ...restoredNotes.values, ...restoredShots.values, ...restoredMoments.values, ...restoredFoods.values};
+ if (!ok) {
+ for (final name in added) {
+ await MediaStore.delete(name);
+ }
+ return false;
+ }
+ for (final name in previous) {
+ if (!added.contains(name)) await MediaStore.delete(name);
+ }
+
final alarmName = data['alarmSound'] as String?;
String? alarmBase;
if (alarmName != null && alarmName.isNotEmpty) {
final bytes = archive.findFile('$_alarmDir/$alarmName')?.readBytes();
if (bytes != null) alarmBase = await AlarmStore.saveBytes(alarmName, bytes);
}
-
- fit.applyBackup(data,
- restoredMedia: restored,
- restoredNoteMedia: restoredNotes,
- restoredShots: restoredShots,
- restoredMoments: restoredMoments,
- restoredFoods: restoredFoods);
if (alarmBase != null) {
fit.setAlarmSound(alarmBase, (data['alarmSoundName'] as String?) ?? alarmBase);
} else {
diff --git a/lib/services/media_store.dart b/lib/services/media_store.dart
index 00becef..a026873 100644
--- a/lib/services/media_store.dart
+++ b/lib/services/media_store.dart
@@ -68,6 +68,18 @@ class MediaStore {
} catch (_) {}
}
+ static Set<String> names() {
+ if (_dir == null) return {};
+ try {
+ return {
+ for (final f in Directory(_dir!).listSync())
+ if (f is File) f.uri.pathSegments.last,
+ };
+ } catch (_) {
+ return {};
+ }
+ }
+
static Future<void> clearAll() async {
if (_dir == null) return;
try {
diff --git a/lib/state/fit_state.dart b/lib/state/fit_state.dart
index dccf93d..10a25f3 100644
--- a/lib/state/fit_state.dart
+++ b/lib/state/fit_state.dart
@@ -623,8 +623,29 @@ class FitState extends FitCore
bool importJson(String raw) {
final map = Store.instance.tryParse(raw);
if (map == null) return false;
- applyBackup(map);
- return true;
+ return tryApplyBackup(map);
+ }
+
+ bool tryApplyBackup(Map<String, dynamic> backup,
+ {Map<String, String>? restoredMedia,
+ Map<String, String>? restoredNoteMedia,
+ Map<String, String>? restoredShots,
+ Map<String, String>? restoredMoments,
+ Map<String, String>? restoredFoods}) {
+ final before = jsonDecode(jsonEncode(Store.finite(toJson()))) as Map<String, dynamic>;
+ try {
+ applyBackup(backup,
+ restoredMedia: restoredMedia,
+ restoredNoteMedia: restoredNoteMedia,
+ restoredShots: restoredShots,
+ restoredMoments: restoredMoments,
+ restoredFoods: restoredFoods);
+ return true;
+ } catch (e) {
+ debugPrint('applyBackup failed: $e');
+ applyBackup(before);
+ return false;
+ }
}
void applyBackup(Map<String, dynamic> backup,