Sitelet https://github.com/gpodder/gpodder/pull/990/files
Skip to content

Remove skip_locked to avoid accidental deletion of episodes #990

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

Merged
elelay merged 1 commit into from
Apr 23, 2021
Merged

Remove skip_locked to avoid accidental deletion of episodes #990

Show file tree
Hide file tree
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
23 changes: 11 additions & 12 deletions bin/gpo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,21 +828,20 @@ class gPodderCli(object):
line = input(msg)
return not line or (line.lower() == _('yes'))

def _delete_episode_list(episodes, confirm=True, skip_locked=True, callback=None):
def _delete_episode_list(episodes, confirm=True, callback=None):
if not episodes:
return False

if skip_locked:
episodes = [e for e in episodes if not e.archive]
episodes = [e for e in episodes if not e.archive]

if not episodes:
title = _('Episodes are locked')
message = _(
'The selected episodes are locked. Please unlock the '
'episodes that you want to delete before trying '
'to delete them.')
_notification(message, title)
return False
if not episodes:
title = _('Episodes are locked')
message = _(
'The selected episodes are locked. Please unlock the '
'episodes that you want to delete before trying '
'to delete them.')
_notification(message, title)
return False

count = len(episodes)
title = N_('Delete %(count)d episode?', 'Delete %(count)d episodes?',
Expand All @@ -863,7 +862,7 @@ class gPodderCli(object):

episodes_status_update = []
for idx, episode in enumerate(episodes):
if not episode.archive or not skip_locked:
if not episode.archive:
self._start_action(_('Deleting episode: %(episode)s') % {
'episode': episode.title})
episode.delete_from_disk()
Expand Down
29 changes: 12 additions & 17 deletions src/gpodder/gtkui/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2817,22 +2817,20 @@ def close_gpodder(self):

self.application.remove_window(self.gPodder)

def delete_episode_list(self, episodes, confirm=True, skip_locked=True,
callback=None):
def delete_episode_list(self, episodes, confirm=True, callback=None):
if not episodes:
return False

if skip_locked:
episodes = [e for e in episodes if not e.archive]
episodes = [e for e in episodes if not e.archive]

if not episodes:
title = _('Episodes are locked')
message = _(
'The selected episodes are locked. Please unlock the '
'episodes that you want to delete before trying '
'to delete them.')
self.notification(message, title, widget=self.treeAvailable)
return False
if not episodes:
title = _('Episodes are locked')
message = _(
'The selected episodes are locked. Please unlock the '
'episodes that you want to delete before trying '
'to delete them.')
self.notification(message, title, widget=self.treeAvailable)
return False

count = len(episodes)
title = N_('Delete %(count)d episode?', 'Delete %(count)d episodes?',
Expand Down Expand Up @@ -2864,7 +2862,7 @@ def thread_proc():
episodes_status_update = []
for idx, episode in enumerate(episodes):
progress.on_progress(idx / len(episodes))
if not episode.archive or not skip_locked:
if not episode.archive:
progress.on_message(episode.title)
episode.delete_from_disk()
episode_urls.add(episode.url)
Expand Down Expand Up @@ -3579,10 +3577,7 @@ def on_btnCancelAll_clicked(self, widget, *args):

def on_btnDownloadedDelete_clicked(self, widget, *args):
episodes = self.get_selected_episodes()
if len(episodes) == 1:
self.delete_episode_list(episodes, skip_locked=False)
else:
self.delete_episode_list(episodes)
self.delete_episode_list(episodes)

def on_key_press(self, widget, event):
# Allow tab switching with Ctrl + PgUp/PgDown/Tab
Expand Down