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

Fix a few bugs when photo.bytes is None.

master
voussoir 2017-06-15 23:08:20 -07:00
parent 6bed300496
commit 707a9ab7c2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etiquette/objects.py
View File

@ -417,7 +417,8 @@ class Album(ObjectBase, GroupableMixin):
def sum_bytes(self, recurse=True, string=False): def sum_bytes(self, recurse=True, string=False):
if self._sum_bytes_photos is None: if self._sum_bytes_photos is None:
self._sum_bytes_photos = sum(photo.bytes for photo in self.photos()) photos = (photo.bytes for photo in self.photos() if photo.bytes is not None)
self._sum_bytes_photos = sum(photos)
total = self._sum_bytes_photos total = self._sum_bytes_photos
if recurse: if recurse:
@ -518,7 +519,7 @@ class Photo(ObjectBase):
self.ratio = db_row['ratio'] self.ratio = db_row['ratio']
self.thumbnail = db_row['thumbnail'] self.thumbnail = db_row['thumbnail']
if self.duration: if self.duration and self.bytes is not None:
self.bitrate = (self.bytes / 128) / self.duration self.bitrate = (self.bytes / 128) / self.duration
else: else:
self.bitrate = None self.bitrate = None
@ -592,7 +593,9 @@ class Photo(ObjectBase):
return self.photodb.get_user(id=self.author_id) return self.photodb.get_user(id=self.author_id)
def bytestring(self): def bytestring(self):
if self.bytes is not None:
return bytestring.bytestring(self.bytes) return bytestring.bytestring(self.bytes)
return '??? b'
@decorators.required_feature('enable_photo_add_remove_tag') @decorators.required_feature('enable_photo_add_remove_tag')
def copy_tags(self, other_photo): def copy_tags(self, other_photo):