voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove Tag._cached_synonyms. Not worthwhile.

Browse source
This commit is contained in:
voussoir 2019-04-05 23:26:11 -07:00
parent d24f93809b
commit fa97dd5d3c
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
etiquette/objects.py
View file

@ -1144,7 +1144,6 @@ class Tag(ObjectBase, GroupableMixin):
self.group_getter = self.photodb.get_tag self.group_getter = self.photodb.get_tag
self.group_getter_many = self.photodb.get_tags_by_id self.group_getter_many = self.photodb.get_tags_by_id
self._cached_synonyms = None
def __repr__(self): def __repr__(self):
return f'Tag:{self.id}:{self.name}' return f'Tag:{self.id}:{self.name}'
@ -1218,9 +1217,6 @@ class Tag(ObjectBase, GroupableMixin):
} }
self.photodb.sql_insert(table='tag_synonyms', data=data) self.photodb.sql_insert(table='tag_synonyms', data=data)
if self._cached_synonyms is not None:
self._cached_synonyms.add(synname)
if commit: if commit:
self.photodb.commit(message='add synonym') self.photodb.commit(message='add synonym')
@ -1248,8 +1244,6 @@ class Tag(ObjectBase, GroupableMixin):
'mastername': (self.name, mastertag.name), 'mastername': (self.name, mastertag.name),
} }
self.photodb.sql_update(table='tag_synonyms', pairs=data, where_key='mastername') self.photodb.sql_update(table='tag_synonyms', pairs=data, where_key='mastername')
if mastertag._cached_synonyms is not None:
mastertag._cached_synonyms.update(my_synonyms)
# Because these were two separate tags, perhaps in separate trees, it # Because these were two separate tags, perhaps in separate trees, it
# is possible for a photo to have both at the moment. # is possible for a photo to have both at the moment.
@ -1328,15 +1322,11 @@ class Tag(ObjectBase, GroupableMixin):
self.photodb.commit(message='edit tag') self.photodb.commit(message='edit tag')
def get_synonyms(self): def get_synonyms(self):
if self._cached_synonyms is not None:
return self._cached_synonyms.copy()
syn_rows = self.photodb.sql_select( syn_rows = self.photodb.sql_select(
'SELECT name FROM tag_synonyms WHERE mastername == ?', 'SELECT name FROM tag_synonyms WHERE mastername == ?',
[self.name] [self.name]
) )
synonyms = set(row[0] for row in syn_rows) synonyms = set(row[0] for row in syn_rows)
self._cached_synonyms = synonyms.copy()
return synonyms return synonyms
@decorators.required_feature('tag.edit') @decorators.required_feature('tag.edit')
@ -1371,8 +1361,6 @@ class Tag(ObjectBase, GroupableMixin):
self.photodb._cached_frozen_children = None self.photodb._cached_frozen_children = None
self.photodb.sql_delete(table='tag_synonyms', pairs={'name': synname}) self.photodb.sql_delete(table='tag_synonyms', pairs={'name': synname})
if self._cached_synonyms is not None:
self._cached_synonyms.remove(synname)
if commit: if commit:
self.photodb.commit(message='remove synonym') self.photodb.commit(message='remove synonym')