Skip to content

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

Add gymmane_merge package for state merging

InlitX87e02c73ab00
diff --git a/packages/gymmane_merge/lib/gymmane_merge.dart b/packages/gymmane_merge/lib/gymmane_merge.dart
new file mode 100644
index 0000000..2cac490
--- /dev/null
+++ b/packages/gymmane_merge/lib/gymmane_merge.dart
@@ -0,0 +1,161 @@
+import 'dart:convert';
+
+const String syncPrefix = 'gymmane-auto-';
+
+const Set<String> _localOnly = {'live', 'liveStart', 'liveElapsed', 'livePaused', 'alarmSound', 'alarmSoundName'};
+
+const Set<String> _unionLists = {'checkins', 'awardsSeen', 'trkKnown'};
+
+const Set<String> mediaGroups = {'noteMedia', 'shotMedia', 'momentMedia', 'foodMedia', 'passMedia'};
+
+class SyncFile {
+ const SyncFile(this.name, this.device, this.at);
+
+ final String name;
+ final String device;
+ final DateTime at;
+
+ static SyncFile? parse(String name) {
+ if (!name.startsWith(syncPrefix) || !name.toLowerCase().endsWith('.zip')) return null;
+ final body = name.substring(syncPrefix.length, name.length - 4);
+ final dash = body.indexOf('-');
+ if (dash <= 0) return null;
+ final device = body.substring(0, dash);
+ if (!RegExp(r'^[a-z]+$').hasMatch(device)) return null;
+ final at = parseStamp(body.substring(dash + 1));
+ if (at == null) return null;
+ return SyncFile(name, device, at);
+ }
+}
+
+String two(int n) => n.toString().padLeft(2, '0');
+
+String stamp(DateTime d) {
+ final u = d.toUtc();
+ return '${u.year}-${two(u.month)}-${two(u.day)}-${two(u.hour)}${two(u.minute)}${two(u.second)}';
+}
+
+DateTime? parseStamp(String s) {
+ final m = RegExp(r'^(\d{4})-(\d{2})-(\d{2})-(\d{2})(\d{2})(\d{2})$').firstMatch(s);
+ if (m == null) return null;
+ int g(int i) => int.parse(m.group(i)!);
+ return DateTime.utc(g(1), g(2), g(3), g(4), g(5), g(6));
+}
+
+String syncName(String device, DateTime at) => '$syncPrefix$device-${stamp(at)}.zip';
+
+Map<String, SyncFile> newestByDevice(Iterable<String> names, {required String self}) {
+ final out = <String, SyncFile>{};
+ for (final n in names) {
+ final f = SyncFile.parse(n);
+ if (f == null || f.device == self) continue;
+ final best = out[f.device];
+ if (best == null || f.at.isAfter(best.at)) out[f.device] = f;
+ }
+ return out;
+}
+
+Map<String, dynamic> mergeStates(Map<String, dynamic> local, Map<String, dynamic> incoming,
+ {required bool incomingNewer}) {
+ final newer = incomingNewer ? incoming : local;
+ final older = incomingNewer ? local : incoming;
+ final out = _mergeMap(newer, older);
+ for (final k in _localOnly) {
+ if (local.containsKey(k)) {
+ out[k] = local[k];
+ } else {
+ out.remove(k);
+ }
+ }
+ for (final g in mediaGroups) {
+ out.remove(g);
+ }
+ if (local['onboarded'] == true || incoming['onboarded'] == true) out['onboarded'] = true;
+ return out;
+}
+
+bool sameState(Map<String, dynamic> a, Map<String, dynamic> b) => jsonEncode(a) == jsonEncode(b);
+
+Map<String, dynamic> _mergeMap(Map a, Map b) {
+ final out = <String, dynamic>{};
+ for (final e in a.entries) {
+ final k = '${e.key}';
+ out[k] = b.containsKey(e.key) ? _merge(k, e.value, b[e.key]) : e.value;
+ }
+ for (final e in b.entries) {
+ final k = '${e.key}';
+ if (!out.containsKey(k)) out[k] = e.value;
+ }
+ return out;
+}
+
+Object? _merge(String key, Object? a, Object? b) {
+ if (a is Map && b is Map) return _mergeMap(a, b);
+ if (a is List && b is List) return _mergeList(key, a, b);
+ return a ?? b;
+}
+
+String? _keyOf(Object? x) {
+ if (x is! Map) return null;
+ final id = x['id'];
+ if (id is String && id.isNotEmpty) return 'id:$id';
+ if (id is num) return 'id:$id';
+ final d = x['d'];
+ if (d is String && d.isNotEmpty) return 'd:$d|${x['k'] ?? ''}';
+ return null;
+}
+
+List<Object?> _mergeList(String key, List a, List b) {
+ if (b.isEmpty) return a;
+ if (a.isEmpty) return b;
+ final all = [...a, ...b];
+ if (all.every((x) => x is Map)) {
+ final keyed = all.every((x) => _keyOf(x) != null);
+ final seen = <String>{};
+ final out = <Object?>[];
+ for (final x in a) {
+ final k = keyed ? _keyOf(x)! : jsonEncode(x);
+ if (seen.add(k)) out.add(x);
+ }
+ for (final x in b) {
+ final k = keyed ? _keyOf(x)! : jsonEncode(x);
+ if (seen.add(k)) out.add(x);
+ }
+ if (keyed && all.first is Map && (all.first as Map).containsKey('d') && !(all.first as Map).containsKey('id')) {
+ out.sort((x, y) => '${(x as Map)['d']}'.compareTo('${(y as Map)['d']}'));
+ }
+ return out;
+ }
+ if (_unionLists.contains(key) && all.every((x) => x is! Map && x is! List)) {
+ final seen = <String>{};
+ return [
+ for (final x in [...a, ...b])
+ if (seen.add(jsonEncode(x))) x,
+ ];
+ }
+ return a;
+}
+
+Set<String> stringsIn(Object? node) {
+ final out = <String>{};
+ void walk(Object? n) {
+ if (n is String) {
+ out.add(n);
+ } else if (n is List) {
+ n.forEach(walk);
+ } else if (n is Map) {
+ n.values.forEach(walk);
+ }
+ }
+
+ walk(node);
+ return out;
+}
+
+Object? renameStrings(Object? node, Map<String, String> renames) {
+ if (renames.isEmpty) return node;
+ if (node is String) return renames[node] ?? node;
+ if (node is List) return [for (final x in node) renameStrings(x, renames)];
+ if (node is Map) return {for (final e in node.entries) '${e.key}': renameStrings(e.value, renames)};
+ return node;
+}
diff --git a/packages/gymmane_merge/pubspec.lock b/packages/gymmane_merge/pubspec.lock
new file mode 100644
index 0000000..a40d0e0
--- /dev/null
+++ b/packages/gymmane_merge/pubspec.lock
@@ -0,0 +1,397 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+ _fe_analyzer_shared:
+ dependency: transitive
+ description:
+ name: _fe_analyzer_shared
+ sha256: "48e48f73a431eb269eec66d243a63a07ed90ef9417a74047a3b98d52338626ad"
+ url: "https://pub.dev"
+ source: hosted
+ version: "109.0.0"
+ analyzer:
+ dependency: transitive
+ description:
+ name: analyzer
+ sha256: "6d377901d198536b648172974d9d4f277910502cad92193466869cac0ff34990"
+ url: "https://pub.dev"
+ source: hosted
+ version: "14.5.0"
+ args:
+ dependency: transitive
+ description:
+ name: args
+ sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.7.0"
+ async:
+ dependency: transitive
+ description:
+ name: async
+ sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.13.1"
+ boolean_selector:
+ dependency: transitive
+ description:
+ name: boolean_selector
+ sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.2"
+ cli_config:
+ dependency: transitive
+ description:
+ name: cli_config
+ sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.2.0"
+ cli_util:
+ dependency: transitive
+ description:
+ name: cli_util
+ sha256: "89b8801ba49f8b593fbf2d3e59efd0f566c46cd4ba6837ae2610c72b52a0f899"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.6.0"
+ collection:
+ dependency: transitive
+ description:
+ name: collection
+ sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.19.1"
+ convert:
+ dependency: transitive
+ description:
+ name: convert
+ sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.1.2"
+ coverage:
+ dependency: transitive
+ description:
+ name: coverage
+ sha256: ff89e37c19355194e279d26dafe8e4bece46c9ea63a30be4dc68214f5bc290d3
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.16.0"
+ crypto:
+ dependency: transitive
+ description:
+ name: crypto
+ sha256: e3626ae6270383c9e3a549f34c9e4cd26c09ae6a9adaab2bf4737a00340efdc4
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.8"
+ ffi:
+ dependency: transitive
+ description:
+ name: ffi
+ sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.2.0"
+ file:
+ dependency: transitive
+ description:
+ name: file
+ sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+ url: "https://pub.dev"
+ source: hosted
+ version: "7.0.1"
+ frontend_server_client:
+ dependency: transitive
+ description:
+ name: frontend_server_client
+ sha256: "404dbf9bce29beafbe9dcb19219447b6f7d49900cd42b8d3b7af102b24508e25"
+ url: "https://pub.dev"
+ source: hosted
+ version: "4.1.0"
+ glob:
+ dependency: transitive
+ description:
+ name: glob
+ sha256: "218aeb56050c714f62a3182775320dfa04602b55074873e24e31bbd39bda96fb"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.2.0"
+ http_multi_server:
+ dependency: transitive
+ description:
+ name: http_multi_server
+ sha256: "361668bdd71f0ae2dc6d17b75a593520f3c414af6534f9eed1aa72049dd71d18"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.2.3"
+ http_parser:
+ dependency: transitive
+ description:
+ name: http_parser
+ sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
+ url: "https://pub.dev"
+ source: hosted
+ version: "4.1.2"
+ io:
+ dependency: transitive
+ description:
+ name: io
+ sha256: "2635216ca6a737e60de577ffa1a48a0bec76ca8a62917cfc1bb88c14c570646f"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.1.0"
+ logging:
+ dependency: transitive
+ description:
+ name: logging
+ sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.3.0"
+ matcher:
+ dependency: transitive
+ description:
+ name: matcher
+ sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.12.20"
+ meta:
+ dependency: transitive
+ description:
+ name: meta
+ sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.19.0"
+ mime:
+ dependency: transitive
+ description:
+ name: mime
+ sha256: bd47de35f07e27267e69c8c8b22edf9473bfee170a60d60fcc93730c5144b7f6
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.0"
+ node_preamble:
+ dependency: transitive
+ description:
+ name: node_preamble
+ sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.0.2"
+ package_config:
+ dependency: transitive
+ description:
+ name: package_config
+ sha256: ffcf4cf3d6c0b74ac43708d9f56625506e8a68aa935abe9d267a7330f320eb5d
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.0"
+ path:
+ dependency: transitive
+ description:
+ name: path
+ sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.9.1"
+ pool:
+ dependency: transitive
+ description:
+ name: pool
+ sha256: "4177f68c237ea2128d1bee66ac17b2ce05ba3dbaafcbdd54c5d40a39d0b6b11c"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.5.3"
+ pub_semver:
+ dependency: transitive
+ description:
+ name: pub_semver
+ sha256: "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.2.1"
+ shelf:
+ dependency: transitive
+ description:
+ name: shelf
+ sha256: e75e9cf311d7fd712048038cc17c25199c38536c20330d53e7db058b543d5a48
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.4.3"
+ shelf_packages_handler:
+ dependency: transitive
+ description:
+ name: shelf_packages_handler
+ sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.2"
+ shelf_static:
+ dependency: transitive
+ description:
+ name: shelf_static
+ sha256: "480504af9e5323899c5be26a4f6c2fc4437d50954d39842f0290f4ae733d57b4"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.2.0"
+ shelf_web_socket:
+ dependency: transitive
+ description:
+ name: shelf_web_socket
+ sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.0"
+ source_map_stack_trace:
+ dependency: transitive
+ description:
+ name: source_map_stack_trace
+ sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.2"
+ source_maps:
+ dependency: transitive
+ description:
+ name: source_maps
+ sha256: "14c2945847669b44089bb1222f66873d7ff7103c58911917f2a63c5a62327898"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.10.14"
+ source_span:
+ dependency: transitive
+ description:
+ name: source_span
+ sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.10.2"
+ stack_trace:
+ dependency: transitive
+ description:
+ name: stack_trace
+ sha256: "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.12.2"
+ stream_channel:
+ dependency: transitive
+ description:
+ name: stream_channel
+ sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.4"
+ string_scanner:
+ dependency: transitive
+ description:
+ name: string_scanner
+ sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.4.1"
+ term_glyph:
+ dependency: transitive
+ description:
+ name: term_glyph
+ sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.2.2"
+ test:
+ dependency: "direct dev"
+ description:
+ name: test
+ sha256: "44b2fccf4407bcdb5e105c064c5d6b5e2a640c87761f8b03cdce8cf532d98cfa"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.33.0"
+ test_api:
+ dependency: transitive
+ description:
+ name: test_api
+ sha256: "47481c58bb92d0b1d218f0510ff5647e768f8e1256d07077a151fb520923b51d"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.7.15"
+ test_core:
+ dependency: transitive
+ description:
+ name: test_core
+ sha256: "9dec4c178bd61493e1cd2060ffe701fcb61c43da2493e99590fb1b0cc82eb4af"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.6.21"
+ typed_data:
+ dependency: transitive
+ description:
+ name: typed_data
+ sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.4.0"
+ vm_service:
+ dependency: transitive
+ description:
+ name: vm_service
+ sha256: "89b11d62e1040ee681af3b4f1c97a803ecbf010c6e8b9c5896ee5b08c3bf7b78"
+ url: "https://pub.dev"
+ source: hosted
+ version: "15.4.0"
+ watcher:
+ dependency: transitive
+ description:
+ name: watcher
+ sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.2.1"
+ web:
+ dependency: transitive
+ description:
+ name: web
+ sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.1.1"
+ web_socket:
+ dependency: transitive
+ description:
+ name: web_socket
+ sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.1"
+ web_socket_channel:
+ dependency: transitive
+ description:
+ name: web_socket_channel
+ sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.3"
+ webkit_inspection_protocol:
+ dependency: transitive
+ description:
+ name: webkit_inspection_protocol
+ sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.2.1"
+ yaml:
+ dependency: transitive
+ description:
+ name: yaml
+ sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.1.4"
+sdks:
+ dart: ">=3.11.0 <4.0.0"
diff --git a/packages/gymmane_merge/pubspec.yaml b/packages/gymmane_merge/pubspec.yaml
new file mode 100644
index 0000000..3462e08
--- /dev/null
+++ b/packages/gymmane_merge/pubspec.yaml
@@ -0,0 +1,10 @@
+name: gymmane_merge
+description: "Merges two GymMane states for folder sync."
+publish_to: 'none'
+version: 1.0.0
+
+environment:
+ sdk: ^3.11.0
+
+dev_dependencies:
+ test: ^1.25.0
diff --git a/packages/gymmane_merge/test/merge_test.dart b/packages/gymmane_merge/test/merge_test.dart
new file mode 100644
index 0000000..58a541f
--- /dev/null
+++ b/packages/gymmane_merge/test/merge_test.dart
@@ -0,0 +1,82 @@
+import 'package:gymmane_merge/gymmane_merge.dart';
+import 'package:test/test.dart';
+
+void main() {
+ test('keeps workouts from both sides and the newer settings', () {
+ final phone = {
+ 'units': 'kg',
+ 'sessions': [
+ {'d': '2026-11-01T10:00:00.000', 'dur': 60},
+ {'d': '2026-11-03T10:00:00.000', 'dur': 50},
+ ],
+ 'routines': [
+ {'id': 'a', 'n': 'Push'},
+ ],
+ 'live': {'ex': 1},
+ };
+ final web = {
+ 'units': 'lb',
+ 'sessions': [
+ {'d': '2026-11-01T10:00:00.000', 'dur': 61},
+ {'d': '2026-11-02T10:00:00.000', 'dur': 40},
+ ],
+ 'routines': [
+ {'id': 'a', 'n': 'Push day'},
+ {'id': 'b', 'n': 'Pull'},
+ ],
+ 'live': {'ex': 9},
+ 'noteMedia': {'x.jpg': 'notes/x.jpg'},
+ };
+ final m = mergeStates(phone, web, incomingNewer: true);
+ expect(m['units'], 'lb');
+ expect([for (final s in m['sessions'] as List) (s as Map)['d']],
+ ['2026-11-01T10:00:00.000', '2026-11-02T10:00:00.000', '2026-11-03T10:00:00.000']);
+ expect(((m['sessions'] as List).first as Map)['dur'], 61);
+ expect([for (final r in m['routines'] as List) (r as Map)['n']], ['Push day', 'Pull']);
+ expect(m['live'], {'ex': 1});
+ expect(m.containsKey('noteMedia'), isFalse);
+ });
+
+ test('merging twice changes nothing', () {
+ final a = {
+ 'notes': [
+ {'id': '1', 't': 'a'},
+ ],
+ 'checkins': ['x'],
+ };
+ final b = {
+ 'notes': [
+ {'id': '2', 't': 'b'},
+ ],
+ 'checkins': ['y'],
+ };
+ final once = mergeStates(a, b, incomingNewer: false);
+ final twice = mergeStates(once, b, incomingNewer: false);
+ expect(sameState(once, twice), isTrue);
+ expect(once['checkins'], ['x', 'y']);
+ });
+
+ test('reads sync file names and skips its own', () {
+ final at = DateTime.utc(2026, 11, 11, 9, 5, 7);
+ final name = syncName('server', at);
+ expect(name, 'gymmane-auto-server-2026-11-11-090507.zip');
+ expect(SyncFile.parse(name)!.at, at);
+ expect(SyncFile.parse('gymmane-auto-2026-11-11-090507.zip'), isNull);
+ final newest = newestByDevice([
+ syncName('phone', at),
+ syncName('phone', at.add(const Duration(hours: 1))),
+ syncName('server', at),
+ ], self: 'server');
+ expect(newest.keys, ['phone']);
+ expect(newest['phone']!.at, at.add(const Duration(hours: 1)));
+ });
+
+ test('renames media references', () {
+ final out = renameStrings({
+ 'notes': [
+ {'m': ['old.jpg']},
+ ],
+ }, {'old.jpg': 'new.jpg'});
+ expect(stringsIn(out), contains('new.jpg'));
+ });
+}