Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/vorta/assets/UI/archivetab.ui
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,10 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>Refresh selected archive</string>
<string>Recalculate selected archive's size(s)</string>
</property>
<property name="text">
<string>Refresh</string>
<string>Recalculate</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
Expand Down
69 changes: 44 additions & 25 deletions src/vorta/views/archive_tab.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,15 @@ def __init__(self, parent=None, app=None):
self.app = app
self.toolBox.setCurrentIndex(0)
self.repoactions_enabled = True
self.remaining_refresh_archives = (
0 # number of archives that are left to refresh before action buttons are enabled again
)

#: Tooltip dict to save the tooltips set in the designer
self.tooltip_dict: Dict[QWidget, str] = {}
self.tooltip_dict[self.bDiff] = self.bDiff.toolTip()
self.tooltip_dict[self.bDelete] = self.bDelete.toolTip()
self.tooltip_dict[self.bRefreshArchive] = self.bRefreshArchive.toolTip()
self.tooltip_dict[self.compactButton] = self.compactButton.toolTip()

header = self.archiveTable.horizontalHeader()
Expand Down Expand Up @@ -320,7 +324,8 @@ def populate_from_profile(self):
self.archiveTable.scrollToItem(item)

self.archiveTable.selectionModel().clearSelection()
self._toggle_all_buttons(enabled=True)
if self.remaining_refresh_archives == 0:
self._toggle_all_buttons(enabled=True)
else:
self.mount_points = {}
self.archiveTable.setRowCount(0)
Expand Down Expand Up @@ -355,6 +360,10 @@ def on_selection_change(self, selected=None, deselected=None):
# handle selection of more than 2 rows
selectionModel: QItemSelectionModel = self.archiveTable.selectionModel()
indexes = selectionModel.selectedRows()
# actions that are enabled only when a single archive is selected
single_archive_action_buttons = [self.bMountArchive, self.bExtract, self.bRename]
# actions that are enabled when at least one archive is selected
multi_archive_action_buttons = [self.bDelete, self.bRefreshArchive]

# Toggle archive actions frame
layout: QLayout = self.fArchiveActions.layout()
Expand All @@ -364,14 +373,15 @@ def on_selection_change(self, selected=None, deselected=None):
if not self.repoactions_enabled:
reason = self.tr("(borg already running)")

# toggle delete button
# Disable the delete and refresh buttons if no archive is selected
if self.repoactions_enabled and len(indexes) > 0:
self.bDelete.setEnabled(True)
self.bDelete.setToolTip(self.tooltip_dict.get(self.bDelete, ""))
for button in multi_archive_action_buttons:
button.setEnabled(True)
button.setToolTip(self.tooltip_dict.get(button, ""))
else:
self.bDelete.setEnabled(False)
tooltip = self.tooltip_dict[self.bDelete]
self.bDelete.setToolTip(tooltip + " " + reason or self.tr("(Select minimum one archive)"))
for button in multi_archive_action_buttons:
button.setEnabled(False)
button.setToolTip(self.tooltip_dict.get(button, "") + " " + self.tr("(Select minimum one archive)"))

# Toggle diff button
if self.repoactions_enabled and len(indexes) == 2:
Expand All @@ -387,7 +397,8 @@ def on_selection_change(self, selected=None, deselected=None):

if self.repoactions_enabled and len(indexes) == 1:
# Enable archive actions
self.fArchiveActions.setEnabled(True)
for widget in single_archive_action_buttons:
widget.setEnabled(True)

for index in range(layout.count()):
widget = layout.itemAt(index).widget()
Expand All @@ -399,14 +410,11 @@ def on_selection_change(self, selected=None, deselected=None):
reason = reason or self.tr("(Select exactly one archive)")

# too few or too many selected.
self.fArchiveActions.setEnabled(False)

for index in range(layout.count()):
widget = layout.itemAt(index).widget()
for widget in single_archive_action_buttons:
tooltip = widget.toolTip()

tooltip = self.tooltip_dict.setdefault(widget, tooltip)
widget.setToolTip(tooltip + " " + reason)
widget.setEnabled(False)

# special treatment for dynamic mount/unmount button.
self.bmountarchive_refresh()
Expand Down Expand Up @@ -522,20 +530,31 @@ def list_result(self, result):
self.populate_from_profile()

def refresh_archive_info(self):
archive_name = self.selected_archive_name()
if archive_name is not None:
params = BorgInfoArchiveJob.prepare(self.profile(), archive_name)
if params['ok']:
job = BorgInfoArchiveJob(params['cmd'], params, self.profile().repo.id)
job.updated.connect(self._set_status)
job.result.connect(self.info_result)
self._toggle_all_buttons(False)
self.app.jobs_manager.add_job(job)
selected_archives = self.archiveTable.selectionModel().selectedRows()

archive_names = []
for index in selected_archives:
archive_names.append(self.archiveTable.item(index.row(), 4).text())

self.remaining_refresh_archives = len(archive_names) # number of archives to refresh
self._toggle_all_buttons(False)
for archive_name in archive_names:
if archive_name is not None:
params = BorgInfoArchiveJob.prepare(self.profile(), archive_name)
if params['ok']:
Comment thread
diivi marked this conversation as resolved.
job = BorgInfoArchiveJob(params['cmd'], params, self.profile().repo.id)
job.updated.connect(self._set_status)
job.result.connect(self.info_result)
self.app.jobs_manager.add_job(job)
else:
self._set_status(params['message'])
return

def info_result(self, result):
self._toggle_all_buttons(True)
if result['returncode'] == 0:
self._set_status(self.tr('Refreshed archive.'))
self.remaining_refresh_archives -= 1
if result['returncode'] == 0 and self.remaining_refresh_archives == 0:
self._toggle_all_buttons(True)
self._set_status(self.tr('Refreshed archives.'))
self.populate_from_profile()

def selected_archive_name(self):
Expand Down
4 changes: 3 additions & 1 deletion src/vorta/views/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ def backup_finished_event(self):
self.repoTab.init_repo_stats()
self.scheduleTab.populate_logs()

if not self.app.jobs_manager.is_worker_running():
if not self.app.jobs_manager.is_worker_running() and (
self.archiveTab.remaining_refresh_archives == 0 or self.archiveTab.remaining_refresh_archives == 1
): # Either the refresh is done or this is the last archive to refresh.
self._toggle_buttons(create_enabled=True)
self.archiveTab._toggle_all_buttons(enabled=True)

Expand Down