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

Make sure easybake uses the normalized name in return notes.

master
voussoir 2017-04-20 18:28:11 -07:00
parent 24b6970617
commit cc0c847eb5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etiquette/objects.py
View File

@ -929,6 +929,8 @@ class Tag(ObjectBase, GroupableMixin):
self.photodb.log.debug('Committing - add synonym') self.photodb.log.debug('Committing - add synonym')
self.photodb.commit() self.photodb.commit()
return synname
def convert_to_synonym(self, mastertag, *, commit=True): def convert_to_synonym(self, mastertag, *, commit=True):
''' '''
Convert this tag into a synonym for a different tag. Convert this tag into a synonym for a different tag.

5
etiquette/photodb.py
View File

@ -1354,8 +1354,9 @@ class PhotoDB(PDBAlbumMixin, PDBBookmarkMixin, PDBPhotoMixin, PDBTagMixin, PDBUs
if rename_to: if rename_to:
tag = self.get_tag(tag) tag = self.get_tag(tag)
note = ('rename', '%s=%s' % (tag.name, rename_to)) old_name = tag.name
tag.rename(rename_to) tag.rename(rename_to)
note = ('rename', '%s=%s' % (old_name, tag.name))
output_notes.append(note) output_notes.append(note)
else: else:
tag_parts = tag.split('.') tag_parts = tag.split('.')
@ -1370,7 +1371,7 @@ class PhotoDB(PDBAlbumMixin, PDBBookmarkMixin, PDBPhotoMixin, PDBTagMixin, PDBUs
tag = tags[-1] tag = tags[-1]
if synonym: if synonym:
tag.add_synonym(synonym) synonym = tag.add_synonym(synonym)
note = ('new_synonym', '%s+%s' % (tag.name, synonym)) note = ('new_synonym', '%s+%s' % (tag.name, synonym))
output_notes.append(note) output_notes.append(note)
print('New syn %s' % synonym) print('New syn %s' % synonym)