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

Simplify some unnecessarily detailed log formats.

Browse source
This commit is contained in:
voussoir 2018-03-11 01:34:32 -08:00
parent 94e518068f
commit a86c27ceb4
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
etiquette/objects.py
View file

@ -346,7 +346,7 @@ class Album(ObjectBase, GroupableMixin):
@decorators.required_feature('album.edit') @decorators.required_feature('album.edit')
@decorators.transaction @decorators.transaction
def delete(self, *, delete_children=False, commit=True): def delete(self, *, delete_children=False, commit=True):
self.photodb.log.debug('Deleting album {album:r}'.format(album=self)) self.photodb.log.debug('Deleting %s', self)
GroupableMixin.delete(self, delete_children=delete_children, commit=False) GroupableMixin.delete(self, delete_children=delete_children, commit=False)
self.photodb.sql_delete(table='albums', pairs={'id': self.id}) self.photodb.sql_delete(table='albums', pairs={'id': self.id})
self.photodb.sql_delete(table='album_photo_rel', pairs={'albumid': self.id}) self.photodb.sql_delete(table='album_photo_rel', pairs={'albumid': self.id})
@ -623,7 +623,7 @@ class Photo(ObjectBase):
self.photodb.log.debug(message) self.photodb.log.debug(message)
self.remove_tag(parent) self.remove_tag(parent)
self.photodb.log.debug('Applying tag {tag:s} to photo {pho:s}'.format(tag=tag, pho=self)) self.photodb.log.debug('Applying %s to %s', tag, self)
data = { data = {
'photoid': self.id, 'photoid': self.id,
@ -665,7 +665,7 @@ class Photo(ObjectBase):
''' '''
Delete the Photo and its relation to any tags and albums. Delete the Photo and its relation to any tags and albums.
''' '''
self.photodb.log.debug('Deleting photo {photo:r}'.format(photo=self)) self.photodb.log.debug('Deleting %s', self)
self.photodb.sql_delete(table='photos', pairs={'id': self.id}) self.photodb.sql_delete(table='photos', pairs={'id': self.id})
self.photodb.sql_delete(table='photo_tag_rel', pairs={'photoid': self.id}) self.photodb.sql_delete(table='photo_tag_rel', pairs={'photoid': self.id})
self.photodb.sql_delete(table='album_photo_rel', pairs={'photoid': self.id}) self.photodb.sql_delete(table='album_photo_rel', pairs={'photoid': self.id})
@ -867,17 +867,16 @@ class Photo(ObjectBase):
self.ratio = None self.ratio = None
self.duration = None self.duration = None
self.photodb.log.debug('Reloading metadata for {photo:r}'.format(photo=self)) self.photodb.log.debug('Reloading metadata for %s', self)
if self.simple_mimetype == 'image': if self.simple_mimetype == 'image':
try: try:
image = PIL.Image.open(self.real_path.absolute_path) image = PIL.Image.open(self.real_path.absolute_path)
except (OSError, ValueError): except (OSError, ValueError):
self.photodb.log.debug('Failed to read image data for {photo:r}'.format(photo=self)) self.photodb.log.debug('Failed to read image data for %s', self)
else: else:
(self.width, self.height) = image.size (self.width, self.height) = image.size
image.close() image.close()
#self.photodb.log.debug('Loaded image data for {photo:r}'.format(photo=self))
elif self.simple_mimetype == 'video' and constants.ffmpeg: elif self.simple_mimetype == 'video' and constants.ffmpeg:
try: try:
@ -959,7 +958,7 @@ class Photo(ObjectBase):
def remove_tag(self, tag, *, commit=True): def remove_tag(self, tag, *, commit=True):
tag = self.photodb.get_tag(name=tag) tag = self.photodb.get_tag(name=tag)
self.photodb.log.debug('Removing tag {t} from photo {p}'.format(t=repr(tag), p=repr(self))) self.photodb.log.debug('Removing %s from %s', tag, self)
tags = list(tag.walk_children()) tags = list(tag.walk_children())
for tag in tags: for tag in tags:
@ -1208,7 +1207,7 @@ class Tag(ObjectBase, GroupableMixin):
@decorators.required_feature('tag.edit') @decorators.required_feature('tag.edit')
@decorators.transaction @decorators.transaction
def delete(self, *, delete_children=False, commit=True): def delete(self, *, delete_children=False, commit=True):
self.photodb.log.debug('Deleting tag {tag:r}'.format(tag=self)) self.photodb.log.debug('Deleting %s', self)
self.photodb._cached_frozen_children = None self.photodb._cached_frozen_children = None
GroupableMixin.delete(self, delete_children=delete_children, commit=False) GroupableMixin.delete(self, delete_children=delete_children, commit=False)
self.photodb.sql_delete(table='tags', pairs={'id': self.id}) self.photodb.sql_delete(table='tags', pairs={'id': self.id})