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

7258 7618 7837: let the win() stuff to windows, fix url/uri handling with non-ascii characters under linux and mac (not tested under mac)

Browse Source
This commit is contained in:
Jérôme Rapinat 2014-07-17 15:20:47 +02:00
parent 42ce347ff5
commit 66b051d3f0
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,7 +520,10 @@ class GalleryTab(ButtonTab, DbGUIElement):
else: else:
files = sel_data.get_uris() files = sel_data.get_uris()
for file in files: for file in files:
d = conv_to_unicode((file.replace('\0',' ').strip()), None) 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(d)
if protocol == "file": if protocol == "file":
name = url2pathname(mfile) name = url2pathname(mfile)

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

@ -184,9 +184,12 @@ class MediaView(ListView):
#modern file managers provide URI_LIST. For Windows split sel_data.data #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:
clean_string = conv_to_unicode( if win():
file.replace('\0',' ').replace("\r", " ").strip(), clean_string = conv_to_unicode(
None) 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(clean_string)
if protocol == "file": if protocol == "file":
name = url2pathname(mfile) name = url2pathname(mfile)