From caf5c71b883a3c44295094d1d6da12c0bbb90550 Mon Sep 17 00:00:00 2001 From: samyak-jain Date: Sun, 29 Nov 2020 21:23:24 +0530 Subject: [PATCH 1/2] Fix issue with arch linux client --- src/ankisyncd/sync_app.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ankisyncd/sync_app.py b/src/ankisyncd/sync_app.py index 1ecace3..2147232 100644 --- a/src/ankisyncd/sync_app.py +++ b/src/ankisyncd/sync_app.py @@ -62,11 +62,12 @@ class SyncCollectionHandler(Syncer): note = {"alpha": 0, "beta": 0, "rc": 0} client, version, platform = cv.split(',') - for name in note.keys(): - if name in version: - vs = version.split(name) - version = vs[0] - note[name] = int(vs[-1]) + if 'arch' not in version: + for name in note.keys(): + if name in version: + vs = version.split(name) + version = vs[0] + note[name] = int(vs[-1]) # convert the version string, ignoring non-numeric suffixes like in beta versions of Anki version_nosuffix = re.sub(r'[^0-9.].*$', '', version) From 4f6261204387a2ff3d5b33912ee9bfb262b3015c Mon Sep 17 00:00:00 2001 From: samyak-jain Date: Thu, 17 Dec 2020 06:48:31 +0530 Subject: [PATCH 2/2] Added unittest --- tests/test_sync_app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_sync_app.py b/tests/test_sync_app.py index d49adec..3147daf 100644 --- a/tests/test_sync_app.py +++ b/tests/test_sync_app.py @@ -43,6 +43,7 @@ class SyncCollectionHandlerTest(CollectionTestBase): ','.join(('ankidesktop', '2.1.0', 'lin::')), ','.join(('ankidesktop', '2.1.6-beta2', 'lin::')), ','.join(('ankidesktop', '2.1.9 (dev)', 'lin::')), + ','.join(('ankidesktop', '2.1.26 (arch-linux-2.1.26-1)', 'lin:arch:')), ','.join(('ankidroid', '2.2.3', '')), ','.join(('ankidroid', '2.3alpha4', '')), ','.join(('ankidroid', '2.3alpha5', '')),