phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-10 11:47:27 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't try adding a folder if the user clicks cancel, and add additional logging

Browse source
This commit is contained in:
Micah Lee 2021-11-16 18:15:07 -08:00
parent 221eb1cbac
commit 236bc33bc8
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
desktop/src/onionshare/tab/mode/file_selection.py
View file

@ -435,6 +435,7 @@ class FileSelection(QtWidgets.QVBoxLayout):
""" """
file_dialog = AddFileDialog(self.common, caption=strings._("gui_choose_items")) file_dialog = AddFileDialog(self.common, caption=strings._("gui_choose_items"))
if file_dialog.exec_() == QtWidgets.QDialog.Accepted: if file_dialog.exec_() == QtWidgets.QDialog.Accepted:
self.common.log("FileSelection", "add", file_dialog.selectedFiles())
for filename in file_dialog.selectedFiles(): for filename in file_dialog.selectedFiles():
self.file_list.add_file(filename) self.file_list.add_file(filename)
@ -443,25 +444,34 @@ class FileSelection(QtWidgets.QVBoxLayout):
def add_files(self): def add_files(self):
""" """
Add files button clicked. Add Files button clicked.
""" """
files = QtWidgets.QFileDialog.getOpenFileNames( files = QtWidgets.QFileDialog.getOpenFileNames(
self.parent, caption=strings._("gui_choose_items") self.parent, caption=strings._("gui_choose_items")
) )
self.common.log("FileSelection", "add_files", files)
filenames = files[0] filenames = files[0]
for filename in filenames: for filename in filenames:
self.file_list.add_file(filename) self.file_list.add_file(filename)
self.file_list.setCurrentItem(None)
self.update()
def add_folder(self): def add_folder(self):
""" """
Add folder button clicked. Add Folder button clicked.
""" """
filename = QtWidgets.QFileDialog.getExistingDirectory( filename = QtWidgets.QFileDialog.getExistingDirectory(
self.parent, self.parent,
caption=strings._("gui_choose_items"), caption=strings._("gui_choose_items"),
options=QtWidgets.QFileDialog.ShowDirsOnly, options=QtWidgets.QFileDialog.ShowDirsOnly,
) )
self.file_list.add_file(filename) self.common.log("FileSelection", "add_folder", filename)
if filename:
self.file_list.add_file(filename)
self.file_list.setCurrentItem(None)
self.update()
def delete(self): def delete(self):
""" """