From e305834f5a745ab807e5ff5ba11cff5e99ae5fd6 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sat, 2 Jul 2011 17:29:59 +0000 Subject: [PATCH] Update Metadata Viewer gramplet to use a tree view svn: r17892 --- src/plugins/gramplet/MetadataViewer.py | 131 +++++++++++++++++-------- 1 file changed, 90 insertions(+), 41 deletions(-) diff --git a/src/plugins/gramplet/MetadataViewer.py b/src/plugins/gramplet/MetadataViewer.py index 1ff916a41..2de033c22 100644 --- a/src/plugins/gramplet/MetadataViewer.py +++ b/src/plugins/gramplet/MetadataViewer.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2011 Nick Hall @@ -20,7 +22,7 @@ # $Id$ # -from ListModel import ListModel, NOSORT +from ListModel import ListModel from gen.plug import Gramplet from gen.ggettext import gettext as _ import gen.lib @@ -28,15 +30,60 @@ import DateHandler import datetime import gtk import Utils -import sys import pyexiv2 # v0.1 has a different API to v0.2 and above if hasattr(pyexiv2, 'version_info'): - LesserVersion = False + OLD_API = False else: # version_info attribute does not exist prior to v0.2.0 - LesserVersion = True + OLD_API = True + +def format_datetime(exif_dt): + """ + Convert a python datetime object into a string for display, using the + standard Gramps date format. + """ + if type(exif_dt) != datetime.datetime: + return '' + date_part = gen.lib.Date() + date_part.set_yr_mon_day(exif_dt.year, exif_dt.month, exif_dt.day) + date_str = DateHandler.displayer.display(date_part) + time_str = _('%(hr)02d:%(min)02d:%(sec)02d') % {'hr': exif_dt.hour, + 'min': exif_dt.minute, + 'sec': exif_dt.second} + return _('%(date)s %(time)s') % {'date': date_str, 'time': time_str} + +def format_gps(tag_value): + """ + Convert a (degrees, minutes, seconds) tuple into a string for display. + """ + return "%d°%02d'%05.2f\"" % (tag_value[0], tag_value[1], tag_value[2]) + +IMAGE = _('Image') +CAMERA = _('Camera') +GPS = _('GPS') + +TAGS = [(IMAGE, 'Exif.Image.ImageDescription', None, None), + (IMAGE, 'Exif.Image.Rating', None, None), + (IMAGE, 'Exif.Photo.DateTimeOriginal', None, format_datetime), + (IMAGE, 'Exif.Image.Artist', None, None), + (IMAGE, 'Exif.Image.Copyright', None, None), + (IMAGE, 'Exif.Photo.PixelXDimension', None, None), + (IMAGE, 'Exif.Photo.PixelYDimension', None, None), + (CAMERA, 'Exif.Image.Make', None, None), + (CAMERA, 'Exif.Image.Model', None, None), + (CAMERA, 'Exif.Photo.FNumber', None, None), + (CAMERA, 'Exif.Photo.ExposureTime', None, None), + (CAMERA, 'Exif.Photo.ISOSpeedRatings', None, None), + (CAMERA, 'Exif.Photo.FocalLength', None, None), + (CAMERA, 'Exif.Photo.MeteringMode', None, None), + (CAMERA, 'Exif.Photo.ExposureProgram', None, None), + (CAMERA, 'Exif.Photo.Flash', None, None), + (GPS, 'Exif.GPSInfo.GPSLatitude', + 'Exif.GPSInfo.GPSLatitudeRef', format_gps), + (GPS, 'Exif.GPSInfo.GPSLongitude', + 'Exif.GPSInfo.GPSLongitudeRef', format_gps)] class MetadataViewer(Gramplet): """ @@ -56,13 +103,14 @@ class MetadataViewer(Gramplet): top = gtk.TreeView() titles = [(_('Key'), 1, 250), (_('Value'), 2, 350)] - self.model = ListModel(top, titles) + self.model = ListModel(top, titles, list_mode="tree") return top def main(self): active_handle = self.get_active('Media') media = self.dbstate.db.get_object_from_handle(active_handle) + self.sections = {} self.model.clear() if media: self.display_exif_tags(media) @@ -78,12 +126,13 @@ class MetadataViewer(Gramplet): """ Return True if the gramplet has data, else return False. """ + # pylint: disable-msg=E1101 if media is None: return False full_path = Utils.media_path_full(self.dbstate.db, media.get_path()) - if LesserVersion: # prior to v0.2.0 + if OLD_API: # prior to v0.2.0 try: metadata = pyexiv2.Image(full_path) except IOError: @@ -107,24 +156,32 @@ class MetadataViewer(Gramplet): """ Display the exif tags. """ + # pylint: disable-msg=E1101 full_path = Utils.media_path_full(self.dbstate.db, media.get_path()) - if LesserVersion: # prior to v0.2.0 + if OLD_API: # prior to v0.2.0 try: metadata = pyexiv2.Image(full_path) except IOError: self.set_has_data(False) return metadata.readMetadata() - for key in metadata.exifKeys(): - label = metadata.tagDetails(key)[0] - if key in ("Exif.Image.DateTime", - "Exif.Photo.DateTimeOriginal", - "Exif.Photo.DateTimeDigitized"): - human_value = format_datetime(metadata[key]) - else: - human_value = metadata.interpretedExifValue(key) - self.model.add((label, human_value)) + for section, key, key2, func in TAGS: + if key in metadata.exifKeys(): + if section not in self.sections: + node = self.model.add([section, '']) + self.sections[section] = node + else: + node = self.sections[section] + label = metadata.tagDetails(key)[0] + if func: + human_value = func(metadata[key]) + else: + human_value = metadata.interpretedExifValue(key) + if key2: + human_value += ' ' + metadata.interpretedExifValue(key2) + self.model.add((label, human_value), node=node) + self.model.tree.expand_all() else: # v0.2.0 and above metadata = pyexiv2.ImageMetadata(full_path) @@ -133,29 +190,21 @@ class MetadataViewer(Gramplet): except IOError: self.set_has_data(False) return - for key in metadata.exif_keys: - tag = metadata[key] - if key in ("Exif.Image.DateTime", - "Exif.Photo.DateTimeOriginal", - "Exif.Photo.DateTimeDigitized"): - human_value = format_datetime(tag.value) - else: - human_value = tag.human_value - self.model.add((tag.label, human_value)) - - self.set_has_data(self.model.count > 0) + for section, key, key2, func in TAGS: + if key in metadata.exif_keys: + if section not in self.sections: + node = self.model.add([section, '']) + self.sections[section] = node + else: + node = self.sections[section] + tag = metadata[key] + if func: + human_value = func(tag.value) + else: + human_value = tag.human_value + if key2: + human_value += ' ' + metadata[key2].human_value + self.model.add((tag.label, human_value), node=node) + self.model.tree.expand_all() -def format_datetime(exif_dt): - """ - Convert a python datetime object into a string for display, using the - standard Gramps date format. - """ - if type(exif_dt) != datetime.datetime: - return '' - date_part = gen.lib.Date() - date_part.set_yr_mon_day(exif_dt.year, exif_dt.month, exif_dt.day) - date_str = DateHandler.displayer.display(date_part) - time_str = _('%(hr)02d:%(min)02d:%(sec)02d') % {'hr': exif_dt.hour, - 'min': exif_dt.minute, - 'sec': exif_dt.second} - return _('%(date)s %(time)s') % {'date': date_str, 'time': time_str} + self.set_has_data(self.model.count > 0)