Skip to content

fix: remove entry even if deleting it's file failed #1246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheBobBobs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: remove entry even if deleting it's file failed #1246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 24 additions & 32 deletions src/tagstudio/qt/ts_qt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,7 @@ def delete_files_callback(self, origin_path: str | Path, origin_id: int | None =
deleted_count: int = 0

selected = self.selected
library_dir = unwrap(self.lib.library_dir)

if len(selected) <= 1 and origin_path:
origin_id_ = origin_id
Expand All @@ -903,7 +904,7 @@ def delete_files_callback(self, origin_path: str | Path, origin_id: int | None =
origin_id_ = selected[0]

pending.append((origin_id_, Path(origin_path)))
elif (len(selected) > 1) or (len(selected) <= 1):
else:
for item in selected:
entry = self.lib.get_entry(item)
filepath: Path = entry.path
Expand All @@ -920,39 +921,30 @@ def delete_files_callback(self, origin_path: str | Path, origin_id: int | None =
e_id, f = tup
if (origin_path == f) or (not origin_path):
self.main_window.preview_panel.preview_thumb.media_player.stop()
if delete_file(self.lib.library_dir / f):
self.main_window.status_bar.showMessage(
Translations.format(
"status.deleting_file", i=i, count=len(pending), path=f
)
)
self.main_window.status_bar.repaint()
self.lib.remove_entries([e_id])

msg = Translations.format(
"status.deleting_file", i=i, count=len(pending), path=f
)
self.main_window.status_bar.showMessage(msg)
self.main_window.status_bar.repaint()

self.lib.remove_entries([e_id])
if delete_file(library_dir / f):
deleted_count += 1
selected.clear()
self.clear_select_action_callback()

if deleted_count > 0:
self.update_browsing_state()
self.main_window.preview_panel.set_selection(selected)

if len(selected) <= 1 and deleted_count == 0:
self.main_window.status_bar.showMessage(Translations["status.deleted_none"])
elif len(selected) <= 1 and deleted_count == 1:
self.main_window.status_bar.showMessage(
Translations.format("status.deleted_file_plural", count=deleted_count)
)
elif len(selected) > 1 and deleted_count == 0:
self.main_window.status_bar.showMessage(Translations["status.deleted_none"])
elif len(selected) > 1 and deleted_count < len(selected):
self.main_window.status_bar.showMessage(
Translations.format("status.deleted_partial_warning", count=deleted_count)
)
elif len(selected) > 1 and deleted_count == len(selected):
self.main_window.status_bar.showMessage(
Translations.format("status.deleted_file_plural", count=deleted_count)
)

self.clear_select_action_callback()
self.update_browsing_state()

if deleted_count > 0 and deleted_count != len(pending):
msg = Translations.format("status.deleted_partial_warning", count=deleted_count)
else:
index = min(deleted_count, 2)
msg = (
Translations["status.deleted_none"],
Translations["status.deleted_file_singular"],
Translations.format("status.deleted_file_plural", count=deleted_count),
)[index]
self.main_window.status_bar.showMessage(msg)
self.main_window.status_bar.repaint()

def delete_file_confirmation(self, count: int, filename: Path | None = None) -> int:
Expand Down