ouczbs/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Simplify version suffix patch"

Browse Source 
95ccbfdd36 broke it

This reverts commit 61b4582364.
This commit is contained in:
flan 2019-02-19 00:44:26 +01:00
parent c85f50460a
commit 970664e6a9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ankisyncd/sync_app.py
View File

@ -61,11 +61,12 @@ class SyncCollectionHandler(anki.sync.Syncer):
for name in note.keys(): for name in note.keys():
if name in version: if name in version:
vs = version.split(name) vs = version.split(name)
# remove potential suffix separators like "-" in "2.1.6-beta2" version = vs[0]
version = re.sub("[^0-9]$", "", vs[0])
note[name] = int(vs[-1]) note[name] = int(vs[-1])
version_int = [int(x) for x in version.split('.')] # convert the version string, ignoring non-numeric suffixes like in beta versions of Anki
version_nosuffix = re.sub(r'[^0-9.].*$', '', version)
version_int = [int(x) for x in version_nosuffix.split('.')]
if client == 'ankidesktop': if client == 'ankidesktop':
return version_int < [2, 0, 27] return version_int < [2, 0, 27]

1
tests/test_sync_app.py
View File

@ -39,6 +39,7 @@ class SyncCollectionHandlerTest(CollectionTestBase):
','.join(('ankidesktop', '2.0.32', 'lin::')), ','.join(('ankidesktop', '2.0.32', 'lin::')),
','.join(('ankidesktop', '2.1.0', 'lin::')), ','.join(('ankidesktop', '2.1.0', 'lin::')),
','.join(('ankidesktop', '2.1.6-beta2', 'lin::')), ','.join(('ankidesktop', '2.1.6-beta2', 'lin::')),
','.join(('ankidesktop', '2.1.9 (dev)', 'lin::')),
','.join(('ankidroid', '2.2.3', '')), ','.join(('ankidroid', '2.2.3', '')),
','.join(('ankidroid', '2.3alpha4', '')), ','.join(('ankidroid', '2.3alpha4', '')),
','.join(('ankidroid', '2.3alpha5', '')), ','.join(('ankidroid', '2.3alpha5', '')),