From 62bb7efade8f6967096da523c6dc8f91b20c7616 Mon Sep 17 00:00:00 2001
From: auouymous <au@qzx.com>
Date: Tue, 23 Mar 2021 16:49:57 -0600
Subject: [PATCH] Remove skip_locked to avoid accidental deletion of episodes

---
 bin/gpo                   | 23 +++++++++++------------
 src/gpodder/gtkui/main.py | 29 ++++++++++++-----------------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/bin/gpo b/bin/gpo
index 7e88b2b9..f188f767 100755
--- a/bin/gpo
+++ b/bin/gpo
@@ -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?',
@@ -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()
diff --git a/src/gpodder/gtkui/main.py b/src/gpodder/gtkui/main.py
index 4c199294..728bacf3 100644
--- a/src/gpodder/gtkui/main.py
+++ b/src/gpodder/gtkui/main.py
@@ -2817,22 +2817,20 @@ class gPodder(BuilderWidget, dbus.service.Object):
 
         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?',
@@ -2864,7 +2862,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
             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)
@@ -3579,10 +3577,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
 
     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