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

Fix of issue 3534.

Browse Source 
svn: r14445
This commit is contained in:
Peter Landgren 2010-02-23 13:44:42 +00:00
parent 63430a1ce3
commit 5604a27bf4
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/view/mediaview.py
View File

@ -32,8 +32,9 @@ Media View.
from gen.ggettext import gettext as _ from gen.ggettext import gettext as _
import urlparse import urlparse
import os import os
import sys
import cPickle as pickle import cPickle as pickle
import urllib
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# GTK/Gnome modules # GTK/Gnome modules
@ -201,18 +202,11 @@ class MediaView(ListView):
for d in [item.strip() for item in data_list]: for d in [item.strip() for item in data_list]:
protocol, site, mfile, j, k, l = urlparse.urlparse(d) protocol, site, mfile, j, k, l = urlparse.urlparse(d)
if protocol == "file": if protocol == "file":
name = Utils.fix_encoding(mfile) name = unicode(urllib.url2pathname(mfile.encode(sys.getfilesystemencoding())))
mime = gen.mime.get_type(name) mime = gen.mime.get_type(name)
if not gen.mime.is_valid_type(mime): if not gen.mime.is_valid_type(mime):
return return
photo = gen.lib.MediaObject() photo = gen.lib.MediaObject()
#If in Windows, the url from urlparse.urlparse(d) above is incorrect
# It leaves a "/" first in the url and this is not a valid Windows path/file name.
if constfunc.win():
if name[0] == "/":
name = name[1:]
# Then replace all %20 with a space
name = name.replace('%20',' ')
photo.set_path(name) photo.set_path(name)
photo.set_mime_type(mime) photo.set_mime_type(mime)
basename = os.path.basename(name) basename = os.path.basename(name)