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

Take advantage of new sql_update to update where_keys.

master
voussoir 2018-02-17 14:02:11 -08:00
parent 9939f5da1d
commit 0d6faa8f6e
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
etiquette/objects.py
View File

@ -125,10 +125,11 @@ class GroupableMixin:
) )
else: else:
# Since this group was a child, its parent adopts all its children. # Since this group was a child, its parent adopts all its children.
cur.execute( data = {
'UPDATE %s SET parentid == ? WHERE parentid == ?' % self.group_table, 'parentid': (self.id, parent.id),
[parent.id, self.id] }
) self.photodb.sql_update(table=self.group_table, pairs=data, where_key='parentid')
# Note that this part comes after the deletion of children to prevent # Note that this part comes after the deletion of children to prevent
# issues of recursion. # issues of recursion.
cur.execute( cur.execute(
@ -1009,11 +1010,10 @@ class Photo(ObjectBase):
except OSError: except OSError:
spinal.copy_file(old_path, new_path) spinal.copy_file(old_path, new_path)
cur = self.photodb.sql.cursor() data = {
cur.execute( 'filepath': (old_path.absolute_path, new_path.absolute_path),
'UPDATE photos SET filepath = ? WHERE filepath == ?', }
[new_path.absolute_path, old_path.absolute_path] self.photodb.sql_update(table='photos', pairs=data, where_key='filepath')
)
if new_path.normcase == old_path.normcase: if new_path.normcase == old_path.normcase:
# If they are equivalent but differently cased, just rename. # If they are equivalent but differently cased, just rename.
@ -1127,14 +1127,15 @@ class Tag(ObjectBase, GroupableMixin):
# Migrate the old tag's synonyms to the new one # Migrate the old tag's synonyms to the new one
# UPDATE is safe for this operation because there is no chance of duplicates. # UPDATE is safe for this operation because there is no chance of duplicates.
self.photodb._cached_frozen_children = None self.photodb._cached_frozen_children = None
cur = self.photodb.sql.cursor()
cur.execute( data = {
'UPDATE tag_synonyms SET mastername = ? WHERE mastername == ?', 'mastername': (self.name, mastertag.name),
[mastertag.name, self.name] }
) self.photodb.sql_update(table='tag_synonyms', pairs=data, where_key='mastername')
# Iterate over all photos with the old tag, and swap them to the new tag # Iterate over all photos with the old tag, and swap them to the new tag
# if they don't already have it. # if they don't already have it.
cur = self.photodb.sql.cursor()
cur.execute('SELECT photoid FROM photo_tag_rel WHERE tagid == ?', [self.id]) cur.execute('SELECT photoid FROM photo_tag_rel WHERE tagid == ?', [self.id])
fetches = cur.fetchall() fetches = cur.fetchall()
@ -1301,12 +1302,11 @@ class Tag(ObjectBase, GroupableMixin):
} }
self.photodb.sql_update(table='tags', pairs=data, where_key='id') self.photodb.sql_update(table='tags', pairs=data, where_key='id')
cur = self.photodb.sql.cursor()
if apply_to_synonyms: if apply_to_synonyms:
cur.execute( data = {
'UPDATE tag_synonyms SET mastername = ? WHERE mastername = ?', 'mastername': (old_name, new_name),
[new_name, old_name] }
) self.photodb.sql_update(table='tag_synonyms', pairs=data, where_key='mastername')
self.name = new_name self.name = new_name
self._uncache() self._uncache()