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

Remove @transaction from mixin methods, apply it to object methods.

Browse source
This commit is contained in:
voussoir 2020-02-19 23:10:49 -08:00
parent 953a85c998
commit 7f3602d673
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
etiquette/objects.py
View file

@ -89,7 +89,6 @@ class GroupableMixin:
for parent in parents: for parent in parents:
parent.add_children(children) parent.add_children(children)
@decorators.transaction
def add_child(self, member, *, commit=False): def add_child(self, member, *, commit=False):
self.assert_same_type(member) self.assert_same_type(member)
@ -113,7 +112,6 @@ class GroupableMixin:
self.photodb._cached_frozen_children = None self.photodb._cached_frozen_children = None
@decorators.transaction
def add_children(self, members, *, commit=False): def add_children(self, members, *, commit=False):
for member in members: for member in members:
self.add_child(member) self.add_child(member)
@ -124,7 +122,6 @@ class GroupableMixin:
if self.photodb != other.photodb: if self.photodb != other.photodb:
raise TypeError(f'Objects must belong to the same PhotoDB.') raise TypeError(f'Objects must belong to the same PhotoDB.')
@decorators.transaction
def delete(self, *, delete_children=False, commit=False): def delete(self, *, delete_children=False, commit=False):
''' '''
Delete this object's relationships to other groupables. Delete this object's relationships to other groupables.
@ -187,7 +184,6 @@ class GroupableMixin:
row = self.photodb.sql_select_one(query, [self.id, member.id]) row = self.photodb.sql_select_one(query, [self.id, member.id])
return row is not None return row is not None
@decorators.transaction
def remove_child(self, member, *, commit=False): def remove_child(self, member, *, commit=False):
if not self.has_child(member): if not self.has_child(member):
return return
@ -276,12 +272,12 @@ class Album(ObjectBase, GroupableMixin):
self.photodb.caches['album'].remove(self.id) self.photodb.caches['album'].remove(self.id)
@decorators.required_feature('album.edit') @decorators.required_feature('album.edit')
# GroupableMixin.add_child already has @transaction. @decorators.transaction
def add_child(self, *args, **kwargs): def add_child(self, *args, **kwargs):
return super().add_child(*args, **kwargs) return super().add_child(*args, **kwargs)
@decorators.required_feature('album.edit') @decorators.required_feature('album.edit')
# GroupableMixin.add_children already has @transaction. @decorators.transaction
def add_children(self, *args, **kwargs): def add_children(self, *args, **kwargs):
return super().add_children(*args, **kwargs) return super().add_children(*args, **kwargs)
@ -458,7 +454,7 @@ class Album(ObjectBase, GroupableMixin):
return row is not None return row is not None
@decorators.required_feature('album.edit') @decorators.required_feature('album.edit')
# GroupableMixin.remove_child already has @transaction. @decorators.transaction
def remove_child(self, *args, **kwargs): def remove_child(self, *args, **kwargs):
return super().remove_child(*args, **kwargs) return super().remove_child(*args, **kwargs)
@ -717,8 +713,8 @@ class Photo(ObjectBase):
return bytestring.bytestring(self.bytes) return bytestring.bytestring(self.bytes)
return '??? b' return '??? b'
# Photo.add_tag already has required_feature add_remove_tag # Photo.add_tag already has @required_feature add_remove_tag
# Photo.add_tag already has @transaction. @decorators.transaction
def copy_tags(self, other_photo, *, commit=False): def copy_tags(self, other_photo, *, commit=False):
''' '''
Take all of the tags owned by other_photo and apply them to this photo. Take all of the tags owned by other_photo and apply them to this photo.
@ -873,7 +869,7 @@ class Photo(ObjectBase):
return hopeful_filepath return hopeful_filepath
# Photo.rename_file already has @required_feature # Photo.rename_file already has @required_feature
# Photo.rename_file already has @transaction @decorators.transaction
def move_file(self, directory, commit=False): def move_file(self, directory, commit=False):
directory = pathclass.Path(directory) directory = pathclass.Path(directory)
directory.assert_is_directory() directory.assert_is_directory()
@ -1147,12 +1143,12 @@ class Tag(ObjectBase, GroupableMixin):
self.photodb.caches['tag'].remove(self.id) self.photodb.caches['tag'].remove(self.id)
@decorators.required_feature('tag.edit') @decorators.required_feature('tag.edit')
# GroupableMixin.add_child already has @transaction. @decorators.transaction
def add_child(self, *args, **kwargs): def add_child(self, *args, **kwargs):
return super().add_child(*args, **kwargs) return super().add_child(*args, **kwargs)
@decorators.required_feature('tag.edit') @decorators.required_feature('tag.edit')
# GroupableMixin.add_children already has @transaction. @decorators.transaction
def add_children(self, *args, **kwargs): def add_children(self, *args, **kwargs):
return super().add_children(*args, **kwargs) return super().add_children(*args, **kwargs)
@ -1280,8 +1276,7 @@ class Tag(ObjectBase, GroupableMixin):
return synonyms return synonyms
@decorators.required_feature('tag.edit') @decorators.required_feature('tag.edit')
@decorators.required_feature('tag.edit') @decorators.transaction
# GroupableMixin.remove_child already has @transaction.
def remove_child(self, *args, **kwargs): def remove_child(self, *args, **kwargs):
return super().remove_child(*args, **kwargs) return super().remove_child(*args, **kwargs)