Skip to content

Commit 455a15d

Browse files
raj bunsham3nu
raj bunsha
authored andcommitted
Added a function to MockFileDialog along with the change in original files to make sure multiple directories are added when directories are chosen
1 parent b684ff0 commit 455a15d

File tree

6 files changed

+17
-8
lines changed

6 files changed

+17
-8
lines changed

src/vorta/views/archive_tab.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,8 @@ def receive():
642642
self.app.jobs_manager.add_job(job)
643643

644644
dialog = choose_file_dialog(self, self.tr("Choose Mount Point"), want_folder=True)
645-
dialog.filesSelected.connect(receive)
646-
dialog.open()
645+
if dialog.exec():
646+
receive()
647647

648648
def mount_result(self, result):
649649
if result['returncode'] == 0:
@@ -789,8 +789,8 @@ def receive():
789789
self._set_status(params['message'])
790790

791791
dialog = choose_file_dialog(self, self.tr("Choose Extraction Point"), want_folder=True)
792-
dialog.filesSelected.connect(receive)
793-
dialog.open()
792+
if dialog.exec():
793+
receive()
794794

795795
window = ExtractDialog(archive, model)
796796
self._toggle_all_buttons(True)

src/vorta/views/repo_add_dialog.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ def receive():
7272
self.is_remote_repo = False
7373

7474
dialog = choose_file_dialog(self, self.tr("Choose Location of Borg Repository"))
75-
dialog.filesSelected.connect(receive)
76-
dialog.open()
75+
if dialog.exec():
76+
receive()
7777

7878
def use_remote_repo_action(self):
7979
self.repoURL.setText('')

src/vorta/views/source_tab.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ def receive():
302302

303303
msg = self.tr("Choose directory to back up") if want_folder else self.tr("Choose file(s) to back up")
304304
dialog = choose_file_dialog(self, msg, want_folder=want_folder)
305-
dialog.filesSelected.connect(receive)
306-
dialog.open()
305+
if dialog.exec():
306+
receive()
307307

308308
def source_copy(self, index=None):
309309
"""

tests/integration/conftest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ def __init__(self, *args, **kwargs):
189189

190190
def open(self, func):
191191
func()
192+
193+
def exec(self):
194+
return 1
192195

193196
def selectedFiles(self):
194197
if self.subdirectory:

tests/unit/conftest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ def __init__(self, *args, **kwargs):
8585

8686
def open(self, func):
8787
func()
88+
89+
def exec(self):
90+
return 1
8891

8992
def selectedFiles(self):
9093
return ['/tmp']

tests/unit/test_archives.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ class MockFileDialog:
1414
def open(self, func):
1515
func()
1616

17+
def exec(self):
18+
return 1
19+
1720
def selectedFiles(self):
1821
return ['/tmp']
1922

0 commit comments

Comments
 (0)