mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-07 08:58:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[GTK] Fix Add-torrent-dialog not respecting dirs

Browse source 
When adding a new torrent, there is a problem changing the path on
Windows machines, due to the difference between the way the files are
being read from the torrent and how we handle them in addtorrentdialog.
This effects both changing and showing the files in the UI.

Now, all path seperator is being considered and converted to slash '/'.

Closes: https://dev.deluge-torrent.org/ticket/3541
Closes: https://github.com/deluge-torrent/deluge/pull/395
This commit is contained in:
DjLegolas 2022-08-06 23:10:06 +03:00 • committed by Calum Lind
commit 6c924e6128
No known key found for this signature in database
GPG key ID: 90597A687B836BA3
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
deluge/ui/gtk3/addtorrentdialog.py
View file

@ -379,7 +379,7 @@ class AddTorrentDialog(component.Component):
self.listview_files.expand_row(root, False) self.listview_files.expand_row(root, False)
def prepare_file(self, _file, file_name, file_num, download, files_storage): def prepare_file(self, _file, file_name, file_num, download, files_storage):
first_slash_index = file_name.find(os.path.sep) first_slash_index = file_name.find('/')
if first_slash_index == -1: if first_slash_index == -1:
files_storage[file_name] = (file_num, _file, download) files_storage[file_name] = (file_num, _file, download)
else: else:
@ -397,7 +397,7 @@ class AddTorrentDialog(component.Component):
def add_files(self, parent_iter, split_files): def add_files(self, parent_iter, split_files):
ret = 0 ret = 0
for key, value in split_files.items(): for key, value in split_files.items():
if key.endswith(os.path.sep): if key.endswith('/'):
chunk_iter = self.files_treestore.append( chunk_iter = self.files_treestore.append(
parent_iter, [True, key, 0, -1, False, 'folder-symbolic'] parent_iter, [True, key, 0, -1, False, 'folder-symbolic']
) )
@ -584,7 +584,7 @@ class AddTorrentDialog(component.Component):
self.build_priorities( self.build_priorities(
self.files_treestore.iter_children(_iter), priorities self.files_treestore.iter_children(_iter), priorities
) )
elif not self.files_treestore.get_value(_iter, 1).endswith(os.path.sep): elif not self.files_treestore.get_value(_iter, 1).endswith('/'):
priorities[ priorities[
self.files_treestore.get_value(_iter, 3) self.files_treestore.get_value(_iter, 3)
] = self.files_treestore.get_value(_iter, 0) ] = self.files_treestore.get_value(_iter, 0)
@ -985,7 +985,10 @@ class AddTorrentDialog(component.Component):
def _on_filename_edited(self, renderer, path, new_text): def _on_filename_edited(self, renderer, path, new_text):
index = self.files_treestore[path][3] index = self.files_treestore[path][3]
new_text = new_text.strip(os.path.sep).strip() # Ensure agnostic path separator
new_text = new_text.replace('\\', '/')
new_text = new_text.strip('/').strip()
# Return if the text hasn't changed # Return if the text hasn't changed
if new_text == self.files_treestore[path][1]: if new_text == self.files_treestore[path][1]:
@ -1012,10 +1015,10 @@ class AddTorrentDialog(component.Component):
for row in self.files_treestore[parent].iterchildren(): for row in self.files_treestore[parent].iterchildren():
if new_text == row[1]: if new_text == row[1]:
return return
if os.path.sep in new_text: if '/' in new_text:
# There are folders in this path, so we need to create them # There are folders in this path, so we need to create them
# and then move the file iter to top # and then move the file iter to top
split_text = new_text.split(os.path.sep) split_text = new_text.split('/')
for s in split_text[:-1]: for s in split_text[:-1]:
parent = self.files_treestore.append( parent = self.files_treestore.append(
parent, [True, s, 0, -1, False, 'folder-symbolic'] parent, [True, s, 0, -1, False, 'folder-symbolic']
@ -1068,19 +1071,19 @@ class AddTorrentDialog(component.Component):
# we can construct the new proper paths # we can construct the new proper paths
# We need to check if this folder has been split # We need to check if this folder has been split
if os.path.sep in new_text: if '/' in new_text:
# It's been split, so we need to add new folders and then re-parent # It's been split, so we need to add new folders and then re-parent
# itr. # itr.
parent = self.files_treestore.iter_parent(itr) parent = self.files_treestore.iter_parent(itr)
split_text = new_text.split(os.path.sep) split_text = new_text.split('/')
for s in split_text[:-1]: for s in split_text[:-1]:
# We don't iterate over the last item because we'll just use # We don't iterate over the last item because we'll just use
# the existing itr and change the text # the existing itr and change the text
parent = self.files_treestore.append( parent = self.files_treestore.append(
parent, [True, s + os.path.sep, 0, -1, False, 'folder-symbolic'] parent, [True, s + '/', 0, -1, False, 'folder-symbolic']
) )
self.files_treestore[itr][1] = split_text[-1] + os.path.sep self.files_treestore[itr][1] = split_text[-1] + '/'
# Now re-parent itr to parent # Now re-parent itr to parent
reparent_iter(self.files_treestore, itr, parent) reparent_iter(self.files_treestore, itr, parent)
@ -1093,7 +1096,7 @@ class AddTorrentDialog(component.Component):
else: else:
# This was a simple folder rename without any splits, so just # This was a simple folder rename without any splits, so just
# change the path for itr # change the path for itr
self.files_treestore[itr][1] = new_text + os.path.sep self.files_treestore[itr][1] = new_text + '/'
# Walk through the tree from 'itr' and add all the new file paths # Walk through the tree from 'itr' and add all the new file paths
# to the 'mapped_files' option # to the 'mapped_files' option