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-09 00:53:53 +02:00
parent b401741143
commit f4f83e456e
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -174,16 +174,9 @@ class MediaView(ListView):
""" """
if not sel_data: if not sel_data:
return return
#modern file managers provide URI_LIST. For Windows split sel_data.data
files = sel_data.get_uris() files = sel_data.get_uris()
for file in files: for file in files:
if win(): protocol, site, mfile, j, k, l = urlparse(file)
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)
if protocol == "file": if protocol == "file":
name = url2pathname(mfile) name = url2pathname(mfile)
mime = get_type(name) mime = get_type(name)