Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed an issue when trying to get media full path. Thank you Peter Landgren...

Browse Source 
svn: r17321
This commit is contained in:
Rob G. Healey 2011-04-28 14:38:04 +00:00
parent 09fe9cb89c
commit 9e4deb6254
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/gramplet/EditExifMetadata.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
#!/usr/bin/python #!/usr/bin/python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
@ -273,7 +274,6 @@ class EditExifMetadata(Gramplet):
self.image_path = False self.image_path = False
self.plugin_image = False self.plugin_image = False
self.MediaDataTags = False self.MediaDataTags = False
self.SavedEntries = False
self.connect_signal("Media", self.update) self.connect_signal("Media", self.update)
@ -394,21 +394,25 @@ class EditExifMetadata(Gramplet):
""" """
Return True if the gramplet has data, else return False. Return True if the gramplet has data, else return False.
""" """
if self.orig_image is None: if media is None:
return False
full_path = Utils.media_path_full(self.dbstate.db, media.get_path() )
if not os.join.isfile(full_path):
return False return False
if LesserVersion: # prior to v0.2.0 if LesserVersion: # prior to v0.2.0
metadata = pyexiv2.Image(full_path)
try: try:
metadata = pyexiv2.Image(self.image_path) metadata.readMetadata()
except (IOError, OSError): except (IOError, OSError):
return False return False
metadata.readMetadata()
if metadata.exifKeys(): if metadata.exifKeys():
return True return True
else: # v0.2.0 and above else: # v0.2.0 and above
metadata = pyexiv2.ImageMetadata(self.image_path) metadata = pyexiv2.ImageMetadata(full_path)
try: try:
metadata.read() metadata.read()
except (IOError, OSError): except (IOError, OSError):
@ -488,7 +492,7 @@ class EditExifMetadata(Gramplet):
self.activate_buttons(["Convert"]) self.activate_buttons(["Convert"])
# displays the imge Exif metadata # displays the imge Exif metadata
self.display_exif_tags(self.image_path) self.display_exif_tags(self.orig_image)
else: else:
self.exif_widgets["Message:Area"].set_text(_("Choose a different image...")) self.exif_widgets["Message:Area"].set_text(_("Choose a different image..."))
@ -697,7 +701,7 @@ class EditExifMetadata(Gramplet):
return KeyValue return KeyValue
def display_exif_tags(self, full_path): def display_exif_tags(self, obj):
""" """
once the pyexiv2.Image has been created, we display once the pyexiv2.Image has been created, we display
all of the image Exif metadata... all of the image Exif metadata...
@ -1138,10 +1142,11 @@ class EditExifMetadata(Gramplet):
if datatags: if datatags:
# set Message Area to Saved... # set Message Area to Saved...
self.exif_widgets["Message:Area"].set_text(_("Saving Exif metadata to image...")) self.exif_widgets["Message:Area"].set_text(_("Saving Exif metadata to the image..."))
else: else:
# set Message Area to Cleared... # set Message Area to Cleared...
self.exif_widgets["Message:Area"].set_text(_("Image Exif metadatafi has been cleared...")) self.exif_widgets["Message:Area"].set_text(_("Image Exif metadatafi has been cleared "
"from this image..."))
# writes all Exif Metadata to image even if the fields are all empty... # writes all Exif Metadata to image even if the fields are all empty...
self.write_metadata(self.plugin_image) self.write_metadata(self.plugin_image)