diff options
| author | Brett Smith <brettcsmith@brettcsmith.org> | 2012-07-08 11:07:02 -0400 |
|---|---|---|
| committer | Brett Smith <brettcsmith@brettcsmith.org> | 2012-07-08 11:07:02 -0400 |
| commit | 81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d (patch) | |
| tree | 0361e85a142b3574b0de28f172fdcf57f21bb6ee /mediagoblin/tools/exif.py | |
| parent | 9c7688667e9a5e96fbf54900976834b4ecf2b033 (diff) | |
| parent | a122357ee75d0abf215b552f0923de1fd722f6de (diff) | |
| download | mediagoblin-81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d.tar.lz mediagoblin-81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d.tar.xz mediagoblin-81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d.zip | |
Merge branch 'master' into 201207-testfixes
Diffstat (limited to 'mediagoblin/tools/exif.py')
| -rw-r--r-- | mediagoblin/tools/exif.py | 15 |
1 files changed, 14 insertions, 1 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 |