diff options
Diffstat (limited to 'mediagoblin/tools')
| -rw-r--r-- | mediagoblin/tools/exif.py | 15 | ||||
| -rw-r--r-- | mediagoblin/tools/files.py | 19 |
2 files changed, 29 insertions, 5 deletions
diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index c4fc1fe5..98c3de27 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -102,6 +102,10 @@ def clean_exif(exif): def _ifd_tag_to_dict(tag): + ''' + Takes an IFD tag object from the EXIF library and converts it to a dict + that can be stored as JSON in the database. + ''' data = { 'printable': tag.printable, 'tag': tag.tag, @@ -109,6 +113,11 @@ def _ifd_tag_to_dict(tag): 'field_offset': tag.field_offset, 'field_length': tag.field_length, 'values': None} + + if isinstance(tag.printable, str): + # Force it to be decoded as UTF-8 so that it'll fit into the DB + data['printable'] = tag.printable.decode('utf8', 'replace') + if type(tag.values) == list: data['values'] = [] for val in tag.values: @@ -118,7 +127,11 @@ def _ifd_tag_to_dict(tag): else: data['values'].append(val) else: - data['values'] = tag.values + if isinstance(tag.values, str): + # Force UTF-8, so that it fits into the DB + data['values'] = tag.values.decode('utf8', 'replace') + else: + data['values'] = tag.values return data diff --git a/mediagoblin/tools/files.py b/mediagoblin/tools/files.py index 25c1a6e6..fd38f05e 100644 --- a/mediagoblin/tools/files.py +++ b/mediagoblin/tools/files.py @@ -16,6 +16,7 @@ from mediagoblin import mg_globals + def delete_media_files(media): """ Delete all files associated with a MediaEntry @@ -23,10 +24,20 @@ def delete_media_files(media): Arguments: - media: A MediaEntry document """ + no_such_files = [] for listpath in media.media_files.itervalues(): - mg_globals.public_store.delete_file( - listpath) + try: + mg_globals.public_store.delete_file( + listpath) + except OSError: + no_such_files.append("/".join(listpath)) for attachment in media.attachment_files: - mg_globals.public_store.delete_file( - attachment['filepath']) + try: + mg_globals.public_store.delete_file( + attachment['filepath']) + except OSError: + no_such_files.append("/".join(attachment)) + + if no_such_files: + raise OSError(", ".join(no_such_files)) |