morgan/warehouse
1
0
Fork 0
mirror of https://github.com/morgan9e/warehouse synced 2026-04-14 00:04:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

Allow cancelling on snapshot list page's worker

Browse Source
This commit is contained in:
Heliguy
2024-09-28 23:43:17 -04:00
parent 8b6746d2e8
commit 3393ec783e
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/snapshot_page/snapshots_list_page.py
View File

@@ -29,7 +29,7 @@ class SnapshotsListPage(Adw.NavigationPage):
if len(self.snapshots_rows) == 0:
self.parent_page.refresh()
return
for i, row in enumerate(self.snapshots_rows):
self.listbox.append(row)
self.listbox.get_row_at_index(i).set_activatable(False)
@@ -37,7 +37,7 @@ class SnapshotsListPage(Adw.NavigationPage):
def set_snapshots(self, package_or_folder, refresh=False):
if package_or_folder == self.package_or_folder and not refresh:
return
folder = None
self.package_or_folder = package_or_folder
if type(package_or_folder) is str:
@@ -48,7 +48,7 @@ class SnapshotsListPage(Adw.NavigationPage):
folder = package_or_folder.info["id"]
self.set_title(_("{} Snapshots").format(package_or_folder.info["name"]))
self.new_button.set_sensitive(os.path.exists(package_or_folder.data_path))
self.current_folder = folder
self.snapshots_rows.clear()
self.listbox.remove_all()
@@ -71,14 +71,14 @@ class SnapshotsListPage(Adw.NavigationPage):
self.set_snapshots(self.package_or_folder, refresh=True)
def on_new(self, button):
dialog = NewSnapshotDialog(self.parent_page, self.parent_page.snapshotting_status, self.on_done, [self.package_or_folder])
dialog.present(HostInfo.main_window)
self.parent_page.new_snapshot_dialog = NewSnapshotDialog(self.parent_page, self.parent_page.snapshotting_status, self.on_done, [self.package_or_folder])
self.parent_page.new_snapshot_dialog.present(HostInfo.main_window)
def sort_func(self, row1, row2):
row1 = row1.get_child()
row2 = row2.get_child()
return row1.epoch > row2.epoch
def on_trash(self):
self.set_snapshots(self.package_or_folder, refresh=True)

2
src/snapshot_page/tar_worker.py
View File

@@ -29,11 +29,9 @@ class TarWorker:
self.stop = True # tell the check timeout to stop, because we know the file is done being made
except subprocess.CalledProcessError as cpe:
print("Called Error in Compress Thread")
self.do_cancel(cpe.stderr.decode()) # stderr is in bytes, so decode it
except Exception as e:
print("Exception in Compress Thread")
self.do_cancel(str(e))
def extract_thread(self, *args):