Skip to content

Commit

Permalink
Fix uri quote issue with destination folder
Browse files Browse the repository at this point in the history
Closes lp:1594698, thanks Richard.
  • Loading branch information
kassoulet committed Sep 2, 2016
1 parent b65d4f0 commit 3a17d98
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion soundconverter/fileoperations.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def filename_to_uri(filename):
# convert local filename to uri
filename = 'file://' + urllib.request.pathname2url(os.path.abspath(filename))

uri = Gio.file_parse_name(urllib.parse.quote(filename, '/:%@')).get_uri()
uri = Gio.file_parse_name(filename).get_uri()
return uri


Expand Down
2 changes: 1 addition & 1 deletion soundconverter/namegenerator.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def get_target_name(self, sound_file):
if self.folder is None:
folder = root
else:
folder = urllib.parse.quote(self.folder, '/:%@')
folder = urllib.parse.quote(self.folder, safe='/:%@')

if '/' in pattern:
# we are creating folders using tags, disable basefolder handling
Expand Down
3 changes: 2 additions & 1 deletion soundconverter/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ def set_widget_initial_values(self, builder):
w = self.into_selected_folder
w.set_active(True)

uri = filename_to_uri(self.get_string('selected-folder'))
uri = filename_to_uri(urllib.parse.quote(self.get_string('selected-folder'), safe='/:@'))
self.target_folder_chooser.set_uri(uri)
self.update_selected_folder()

Expand Down Expand Up @@ -701,6 +701,7 @@ def generate_filename(self, sound_file, for_display=False):

if not self.get_int('same-folder-as-input'):
folder = self.get_string('selected-folder')
folder = urllib.parse.quote(folder, safe='/:@')
folder = filename_to_uri(folder)
generator.folder = folder

Expand Down

0 comments on commit 3a17d98

Please sign in to comment.