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

8445: Drag & Drop to add media: wrong handling of non-ascii characters

Browse Source
This commit is contained in:
Josip 2015-05-07 21:01:15 +02:00
parent 2701d51b62
commit c26fcf6d56
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gramps/gui/editors/displaytabs/gallerytab.py
View File

@ -514,17 +514,10 @@ class GalleryTab(ButtonTab, DbGUIElement):
elif self._DND_EXTRA and mytype == self._DND_EXTRA.drag_type:
self.handle_extra_type(mytype, obj)
except pickle.UnpicklingError:
#modern file managers provide URI_LIST. For Windows split sel_data.data
if win():
files = sel_data.get_data().split('\n')
else:
files = sel_data.get_uris()
files = sel_data.get_uris()
for file in files:
if win():
d = conv_to_unicode((file.replace('\0',' ').strip()), None)
else:
d = file
protocol, site, mfile, j, k, l = urlparse(d)
protocol, site, mfile, j, k, l = urlparse(file)
if protocol == "file":
name = url2pathname(mfile)
mime = get_type(name)

9
gramps/plugins/view/mediaview.py
View File

@ -181,16 +181,9 @@ class MediaView(ListView):
"""
if not sel_data:
return
#modern file managers provide URI_LIST. For Windows split sel_data.data
files = sel_data.get_uris()
for file in files:
if win():
clean_string = conv_to_unicode(
file.replace('\0',' ').replace("\r", " ").strip(),
None)
else:
clean_string = file
protocol, site, mfile, j, k, l = urlparse(clean_string)
protocol, site, mfile, j, k, l = urlparse(file)
if protocol == "file":
name = url2pathname(mfile)
mime = get_type(name)