aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/mixin.py
diff options
context:
space:
mode:
authorGabriel Saldana <gabriel@gabrielsaldana.org>2013-03-04 23:19:22 -0600
committerJoar Wandborg <joar@wandborg.se>2013-05-20 00:06:07 +0200
commitb3566e1dc768c883e7ac41ba00b0f93f17e55bc0 (patch)
treebd7778667e6d22a38155589b8f03503ddf8d2df0 /mediagoblin/db/mixin.py
parentc732f422ae9fd27de060468e8d9aa4f8c7dfe47e (diff)
downloadmediagoblin-b3566e1dc768c883e7ac41ba00b0f93f17e55bc0.tar.lz
mediagoblin-b3566e1dc768c883e7ac41ba00b0f93f17e55bc0.tar.xz
mediagoblin-b3566e1dc768c883e7ac41ba00b0f93f17e55bc0.zip
Changes to display all EXIF information
Diffstat (limited to 'mediagoblin/db/mixin.py')
-rw-r--r--mediagoblin/db/mixin.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py
index 388bac89..a0eeff61 100644
--- a/mediagoblin/db/mixin.py
+++ b/mediagoblin/db/mixin.py
@@ -229,15 +229,13 @@ class MediaEntryMixin(GenerateSlugMixin):
return licenses.get_license_by_url(self.license or "")
def exif_display_iter(self):
- from mediagoblin.tools.exif import USEFUL_TAGS
-
if not self.media_data:
return
exif_all = self.media_data.get("exif_all")
- for key in USEFUL_TAGS:
- if key in exif_all:
- yield key, exif_all[key]
+ for key in exif_all:
+ label = re.sub('(.)([A-Z][a-z]+)', r'\1 \2', key)
+ yield label.replace('EXIF', '').replace('Image', ''), exif_all[key]
class MediaCommentMixin(object):