GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-25 01:06:35 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Revert "Merge pull request #345 from Arthur-Milchior/noFullSyncWhenEditingNewModel"

Browse source 
This reverts commit 0ffb308004, reversing
changes made to fed2f2fa3d.

This approach is flawed. Any minor change to the note type will set usn
to -1, causing the schema not to be modified when it should be.
This commit is contained in:
Damien Elmes 2019-10-27 21:37:21 +10:00
parent 0ffb308004
commit 0577157970
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
anki/models.py
View file

@ -150,12 +150,11 @@ class ModelManager:
m['tmpls'] = [] m['tmpls'] = []
m['tags'] = [] m['tags'] = []
m['id'] = None m['id'] = None
m['usn'] = self.col.usn()
return m return m
def rem(self, m): def rem(self, m):
"Delete model, and all its cards/notes." "Delete model, and all its cards/notes."
self._modSchemaIfRequired(m) self.col.modSchema(check=True)
current = self.current()['id'] == m['id'] current = self.current()['id'] == m['id']
# delete notes/cards # delete notes/cards
self.col.remCards(self.col.db.list(""" self.col.remCards(self.col.db.list("""
@ -226,7 +225,6 @@ and notes.mid = ? and cards.ord = ?""", m['id'], ord)
m2 = copy.deepcopy(m) m2 = copy.deepcopy(m)
m2['name'] = _("%s copy") % m2['name'] m2['name'] = _("%s copy") % m2['name']
self.add(m2) self.add(m2)
m['usn'] = self.col.usn()
return m2 return m2
# Fields # Fields
@ -249,13 +247,15 @@ and notes.mid = ? and cards.ord = ?""", m['id'], ord)
def setSortIdx(self, m, idx): def setSortIdx(self, m, idx):
assert 0 <= idx < len(m['flds']) assert 0 <= idx < len(m['flds'])
self._modSchemaIfRequired(m) self.col.modSchema(check=True)
m['sortf'] = idx m['sortf'] = idx
self.col.updateFieldCache(self.nids(m)) self.col.updateFieldCache(self.nids(m))
self.save(m) self.save(m)
def addField(self, m, field): def addField(self, m, field):
self._modSchemaIfRequired(m) # only mod schema if model isn't new
if m['id']:
self.col.modSchema(check=True)
m['flds'].append(field) m['flds'].append(field)
self._updateFieldOrds(m) self._updateFieldOrds(m)
self.save(m) self.save(m)
@ -265,7 +265,7 @@ and notes.mid = ? and cards.ord = ?""", m['id'], ord)
self._transformFields(m, add) self._transformFields(m, add)
def remField(self, m, field): def remField(self, m, field):
self._modSchemaIfRequired(m) self.col.modSchema(check=True)
# save old sort field # save old sort field
sortFldName = m['flds'][m['sortf']]['name'] sortFldName = m['flds'][m['sortf']]['name']
idx = m['flds'].index(field) idx = m['flds'].index(field)
@ -288,7 +288,7 @@ and notes.mid = ? and cards.ord = ?""", m['id'], ord)
self.renameField(m, field, None) self.renameField(m, field, None)
def moveField(self, m, field, idx): def moveField(self, m, field, idx):
self._modSchemaIfRequired(m) self.col.modSchema(check=True)
oldidx = m['flds'].index(field) oldidx = m['flds'].index(field)
if oldidx == idx: if oldidx == idx:
return return
@ -309,7 +309,7 @@ and notes.mid = ? and cards.ord = ?""", m['id'], ord)
self._transformFields(m, move) self._transformFields(m, move)
def renameField(self, m, field, newName): def renameField(self, m, field, newName):
self._modSchemaIfRequired(m) self.col.modSchema(check=True)
pat = r'{{([^{}]*)([:#^/]|[^:#/^}][^:}]*?:|)%s}}' pat = r'{{([^{}]*)([:#^/]|[^:#/^}][^:}]*?:|)%s}}'
def wrap(txt): def wrap(txt):
def repl(match): def repl(match):
@ -352,7 +352,8 @@ and notes.mid = ? and cards.ord = ?""", m['id'], ord)
def addTemplate(self, m, template): def addTemplate(self, m, template):
"Note: should col.genCards() afterwards." "Note: should col.genCards() afterwards."
self._modSchemaIfRequired(m) if m['id']:
self.col.modSchema(check=True)
m['tmpls'].append(template) m['tmpls'].append(template)
self._updateTemplOrds(m) self._updateTemplOrds(m)
self.save(m) self.save(m)
@ -375,7 +376,7 @@ having count() < 2
limit 1""" % ids2str(cids)): limit 1""" % ids2str(cids)):
return False return False
# ok to proceed; remove cards # ok to proceed; remove cards
self._modSchemaIfRequired(m) self.col.modSchema(check=True)
self.col.remCards(cids) self.col.remCards(cids)
# shift ordinals # shift ordinals
self.col.db.execute(""" self.col.db.execute("""
@ -419,7 +420,7 @@ select id from notes where mid = ?)""" % " ".join(map),
# - newModel should be self if model is not changing # - newModel should be self if model is not changing
def change(self, m, nids, newModel, fmap, cmap): def change(self, m, nids, newModel, fmap, cmap):
self._modSchemaIfRequired(m) self.col.modSchema(check=True)
assert newModel['id'] == m['id'] or (fmap and cmap) assert newModel['id'] == m['id'] or (fmap and cmap)
if fmap: if fmap:
self._changeNotes(nids, newModel, fmap) self._changeNotes(nids, newModel, fmap)
@ -473,10 +474,6 @@ select id from notes where mid = ?)""" % " ".join(map),
d) d)
self.col.remCards(deleted) self.col.remCards(deleted)
def _modSchemaIfRequired(self, m):
if m['id'] and m["usn"] != -1:
self.col.modSchema(check=True)
# Schema hash # Schema hash
########################################################################## ##########################################################################