Skip to content

Commit 9da3a6a

Browse files
committed
Move display_password_backend() to its view.
1 parent 4f9497e commit 9da3a6a

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

src/vorta/utils.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
from vorta.borg._compatibility import BorgCompatibility
2424
from vorta.i18n import trans_late
25-
from vorta.keyring.abc import VortaKeyring
2625
from vorta.log import logger
2726
from vorta.network_status.abc import NetworkStatusMonitor
2827

@@ -337,14 +336,3 @@ def validate_passwords(first_pass, second_pass):
337336
return trans_late('utils', "Passwords must be greater than 8 characters long.")
338337

339338
return ""
340-
341-
342-
def display_password_backend(encryption):
343-
''' Display password backend message based off current keyring '''
344-
# flake8: noqa E501
345-
if encryption != 'none':
346-
keyring = VortaKeyring.get_keyring()
347-
return trans_late('utils', "Storing the password in your password manager.") if keyring.is_system else trans_late(
348-
'utils', 'Saving the password to disk. To store password more securely install a supported secret store such as KeepassXC')
349-
else:
350-
return ""

src/vorta/views/repo_add_dialog.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
from PyQt5.QtWidgets import QLineEdit, QAction
44

55
from vorta.utils import get_private_keys, get_asset, choose_file_dialog, \
6-
borg_compat, validate_passwords, display_password_backend
6+
borg_compat, validate_passwords
77
from vorta.keyring.abc import VortaKeyring
88
from vorta.borg.init import BorgInitThread
99
from vorta.borg.info_repo import BorgInfoRepoThread
10-
from vorta.i18n import translate
10+
from vorta.i18n import translate, trans_late
1111
from vorta.views.utils import get_colored_icon
1212
from vorta.models import RepoModel
1313

@@ -65,7 +65,16 @@ def values(self):
6565
return out
6666

6767
def display_password_backend(self):
68-
self.passwordLabel.setText(translate('utils', display_password_backend(self.encryptionComboBox.currentData())))
68+
'''Display password backend message based off current keyring'''
69+
backend_msg = ''
70+
if self.encryptionComboBox.currentData() != 'none':
71+
keyring = VortaKeyring.get_keyring()
72+
if keyring.is_system:
73+
backend_msg = trans_late('utils', 'Storing password in your password manager.')
74+
else:
75+
backend_msg = trans_late('utils', 'Saving password with Vorta settings.')
76+
77+
self.passwordLabel.setText(backend_msg)
6978

7079
def choose_local_backup_folder(self):
7180
def receive():

0 commit comments

Comments
 (0)