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

Fix bugs from moving variables

Browse source
This commit is contained in:
voussoir 2016-12-16 19:08:34 -08:00
parent a1894edcca
commit 0160af57dd
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
helpers.py
View file

@ -262,7 +262,7 @@ def _setify_tags(photodb, tags, warn_bad_tags=False):
try: try:
tag = photodb.get_tag(tag) tag = photodb.get_tag(tag)
tagset.add(tag) tagset.add(tag)
except NoSuchTag: except exceptions.NoSuchTag:
if warn_bad_tags: if warn_bad_tags:
warnings.warn(constants.WARNING_NO_SUCH_TAG.format(tag=tag)) warnings.warn(constants.WARNING_NO_SUCH_TAG.format(tag=tag))
continue continue

11
phototagger.py
View file

@ -1759,8 +1759,8 @@ class Photo(ObjectBase):
(new_width, new_height) = helpers.fit_into_bounds( (new_width, new_height) = helpers.fit_into_bounds(
image_width=width, image_width=width,
image_height=height, image_height=height,
frame_width=self.config['thumbnail_width'], frame_width=self.photodb.config['thumbnail_width'],
frame_height=self.config['thumbnail_height'], frame_height=self.photodb.config['thumbnail_height'],
) )
if new_width < width: if new_width < width:
image = image.resize((new_width, new_height)) image = image.resize((new_width, new_height))
@ -1775,8 +1775,8 @@ class Photo(ObjectBase):
size = helpers.fit_into_bounds( size = helpers.fit_into_bounds(
image_width=probe.video.video_width, image_width=probe.video.video_width,
image_height=probe.video.video_height, image_height=probe.video.video_height,
frame_width=self.config['thumbnail_width'], frame_width=self.photodb.config['thumbnail_width'],
frame_height=self.config['thumbnail_height'], frame_height=self.photodb.config['thumbnail_height'],
) )
size = '%dx%d' % size size = '%dx%d' % size
duration = probe.video.duration duration = probe.video.duration
@ -1997,6 +1997,9 @@ class Tag(ObjectBase, GroupableMixin):
self.group_getter = self.photodb.get_tag self.group_getter = self.photodb.get_tag
self._cached_qualified_name = None self._cached_qualified_name = None
def __eq__(self, other):
return self.name == other or ObjectBase.__eq__(self, other)
def __hash__(self): def __hash__(self):
return hash(self.name) return hash(self.name)