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

Revert of 21558 because of changes in the GTK package for Win

Browse Source 
svn: r21579
This commit is contained in:
Helge Herz 2013-03-07 23:22:59 +00:00
parent d7b4bab8a9
commit fab25576db
1 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gramps/plugins/lib/libmetadata.py
View File

@ -21,13 +21,6 @@
# #
# $Id$ # $Id$
# #
#-------------------------------------------------------------------------
#
# Python modules
#
#-------------------------------------------------------------------------
import sys
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# GNOME modules # GNOME modules
@ -35,7 +28,6 @@ import sys
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import GExiv2 from gi.repository import GExiv2
from gramps.gen.constfunc import win
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -180,46 +172,30 @@ class MetadataView(Gtk.TreeView):
""" """
self.sections = {} self.sections = {}
self.model.clear() self.model.clear()
if (sys.version_info[0] < 3) and win():
#May be it's also necessary for lin and sys.version_info[0] < 3 try:
#if so, remove 'and win()' metadata = GExiv2.Metadata(full_path)
#currently it's tested for Win only except:
metadata = GExiv2.Metadata.new() return False
try:
if not metadata.open_path(full_path):
return False
except:
# may be wrong file name
return False
else:
try:
metadata = GExiv2.Metadata(full_path)
except:
return False
get_human = metadata.get_exif_tag_interpreted_string get_human = metadata.get_exif_tag_interpreted_string
for section, key, key2, func in TAGS: for section, key, key2, func in TAGS:
if (sys.version_info[0] < 3) and win(): if not key in metadata.get_exif_tags():
#May be it's also necessary for lin and sys.version_info[0] < 3 continue
#if so, remove 'and win()'
#currently it's tested for Win only if func is not None:
human_value = get_human(key) if key2 is None:
else: human_value = func(metadata[key])
if not key in metadata.get_exif_tags():
continue
if func is not None:
if key2 is None:
human_value = func(metadata[key])
else:
if key2 in metadata.get_exif_tags():
human_value = func(metadata[key], metadata[key2])
else:
human_value = func(metadata[key], None)
else: else:
human_value = get_human(key)
if key2 in metadata.get_exif_tags(): if key2 in metadata.get_exif_tags():
human_value += ' ' + get_human(key2) human_value = func(metadata[key], metadata[key2])
else:
human_value = func(metadata[key], None)
else:
human_value = get_human(key)
if key2 in metadata.get_exif_tags():
human_value += ' ' + get_human(key2)
label = metadata.get_exif_tag_label(key) label = metadata.get_exif_tag_label(key)
node = self.__add_section(section) node = self.__add_section(section)