From 606a66cbf9438ac865e50fa3fa776a1c34abdbda Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Sat, 17 Feb 2018 15:19:36 -0800 Subject: [PATCH] Remove Photo.filepath and real_filepath in favor of real_path. --- etiquette/helpers.py | 5 ++-- etiquette/objects.py | 24 +++++++++---------- etiquette/photodb.py | 2 +- .../endpoints/photo_endpoints.py | 4 ++-- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/etiquette/helpers.py b/etiquette/helpers.py index a49e47a..9668659 100644 --- a/etiquette/helpers.py +++ b/etiquette/helpers.py @@ -49,10 +49,11 @@ def album_zip_filenames(album, recursive=True): for (album, directory) in directories.items(): photos = album.get_photos() for photo in photos: - if photo.real_filepath in arcnames: + filepath = photo.real_path.absolute_path + if filepath in arcnames: continue photo_name = '%s - %s' % (photo.id, photo.basename) - arcnames[photo.real_filepath] = os.path.join(directory, photo_name) + arcnames[filepath] = os.path.join(directory, photo_name) return arcnames diff --git a/etiquette/objects.py b/etiquette/objects.py index 3c3750b..077852d 100644 --- a/etiquette/objects.py +++ b/etiquette/objects.py @@ -544,13 +544,13 @@ class Photo(ObjectBase): if isinstance(db_row, (list, tuple)): db_row = dict(zip(constants.SQL_COLUMNS['photos'], db_row)) - self.real_filepath = helpers.remove_path_badchars(db_row['filepath'], allowed=':\\/') - self.real_path = pathclass.Path(self.real_filepath) + self.real_path = db_row['filepath'] + self.real_path = helpers.remove_path_badchars(self.real_path, allowed=':\\/') + self.real_path = pathclass.Path(self.real_path) self.id = db_row['id'] self.created = db_row['created'] self.author_id = db_row['author_id'] - self.filepath = db_row['override_filename'] or self.real_path.absolute_path self.basename = db_row['override_filename'] or self.real_path.basename self.extension = db_row['extension'] self.tagged_at = db_row['tagged_at'] @@ -573,7 +573,7 @@ class Photo(ObjectBase): else: self.bitrate = None - self.mimetype = helpers.get_mimetype(self.real_filepath) + self.mimetype = helpers.get_mimetype(self.real_path.basename) if self.mimetype is None: self.simple_mimetype = None else: @@ -694,9 +694,9 @@ class Photo(ObjectBase): return_filepath = None if self.simple_mimetype == 'image': - self.photodb.log.debug('Thumbnailing %s' % self.real_filepath) + self.photodb.log.debug('Thumbnailing %s' % self.real_path.absolute_path) try: - image = PIL.Image.open(self.real_filepath) + image = PIL.Image.open(self.real_path.absolute_path) except (OSError, ValueError): pass else: @@ -728,7 +728,7 @@ class Photo(ObjectBase): elif self.simple_mimetype == 'video' and constants.ffmpeg: #print('video') - probe = constants.ffmpeg.probe(self.real_filepath) + probe = constants.ffmpeg.probe(self.real_path.absolute_path) try: if probe.video: size = helpers.fit_into_bounds( @@ -747,7 +747,7 @@ class Photo(ObjectBase): else: timestamp = 2 constants.ffmpeg.thumbnail( - self.real_filepath, + self.real_path.absolute_path, outfile=hopeful_filepath, quality=2, size=size, @@ -851,7 +851,7 @@ class Photo(ObjectBase): ''' Load the file's height, width, etc as appropriate for this type of file. ''' - self.bytes = os.path.getsize(self.real_filepath) + self.bytes = self.real_path.size self.width = None self.height = None self.area = None @@ -862,7 +862,7 @@ class Photo(ObjectBase): if self.simple_mimetype == 'image': try: - image = PIL.Image.open(self.real_filepath) + image = PIL.Image.open(self.real_path.absolute_path) except (OSError, ValueError): self.photodb.log.debug('Failed to read image data for {photo:r}'.format(photo=self)) else: @@ -872,7 +872,7 @@ class Photo(ObjectBase): elif self.simple_mimetype == 'video' and constants.ffmpeg: try: - probe = constants.ffmpeg.probe(self.real_filepath) + probe = constants.ffmpeg.probe(self.real_path.absolute_path) if probe and probe.video: self.duration = probe.format.duration or probe.video.duration self.width = probe.video.video_width @@ -882,7 +882,7 @@ class Photo(ObjectBase): elif self.simple_mimetype == 'audio' and constants.ffmpeg: try: - probe = constants.ffmpeg.probe(self.real_filepath) + probe = constants.ffmpeg.probe(self.real_path.absolute_path) if probe and probe.audio: self.duration = probe.audio.duration except Exception: diff --git a/etiquette/photodb.py b/etiquette/photodb.py index a8b0b2b..23adbbe 100644 --- a/etiquette/photodb.py +++ b/etiquette/photodb.py @@ -314,7 +314,7 @@ class PDBPhotoMixin: photos = self.get_photos_by_recent() for photo in photos: - if os.path.exists(photo.real_filepath): + if photo.real_path.exists: continue photo.delete(commit=False) if commit: diff --git a/frontends/etiquette_flask/etiquette_flask/endpoints/photo_endpoints.py b/frontends/etiquette_flask/etiquette_flask/endpoints/photo_endpoints.py index a658b4d..06ab579 100644 --- a/frontends/etiquette_flask/etiquette_flask/endpoints/photo_endpoints.py +++ b/frontends/etiquette_flask/etiquette_flask/endpoints/photo_endpoints.py @@ -49,11 +49,11 @@ def get_file(photo_id): download_as = etiquette.helpers.remove_path_badchars(download_as) download_as = urllib.parse.quote(download_as) - response = flask.make_response(common.send_file(photo.real_filepath)) + response = flask.make_response(common.send_file(photo.real_path.absolute_path)) response.headers['Content-Disposition'] = 'attachment; filename*=UTF-8\'\'%s' % download_as return response else: - return common.send_file(photo.real_filepath, override_mimetype=photo.mimetype) + return common.send_file(photo.real_path.absolute_path, override_mimetype=photo.mimetype) @site.route('/thumbnail/') def get_thumbnail(photo_id):