GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

when ensuring model unique, check id not obj

Browse source 
this should fix an issue where we were attaching a suffix to non-duplicate
names on sync
This commit is contained in:
Damien Elmes 2013-10-05 23:53:09 +09:00
parent f23392b6a3
commit f1837e7e0a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
anki/models.py
View file

@ -167,8 +167,10 @@ select id from cards where nid in (select id from notes where mid = ?)""",
self.save(m) self.save(m)
def ensureNameUnique(self, m): def ensureNameUnique(self, m):
if m['name'] in self.allNames(m): for mcur in self.all():
m['name'] += "-" + checksum(str(time.time()))[:5] if (mcur['name'] == m['name'] and
mcur['id'] != m['id']):
m['name'] += "-" + checksum(str(time.time()))[:5]
def update(self, m): def update(self, m):
"Add or update an existing model. Used for syncing and merging." "Add or update an existing model. Used for syncing and merging."

2
tests/test_sync.py
View file

@ -100,7 +100,7 @@ def test_models():
time.sleep(1) time.sleep(1)
deck1.models.save(cm) deck1.models.save(cm)
deck1.save() deck1.save()
assert deck2.models.get(cm['id'])['name'] == "Basic" assert deck2.models.get(cm['id'])['name'].startswith("Basic")
assert client.sync() == "success" assert client.sync() == "success"
assert deck2.models.get(cm['id'])['name'] == "new" assert deck2.models.get(cm['id'])['name'] == "new"
# deleting triggers a full sync # deleting triggers a full sync