about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorWojciech Siewierski <wojciech.siewierski@onet.pl>2016-01-23 21:57:22 +0100
committerWojciech Siewierski <wojciech.siewierski@onet.pl>2016-01-23 21:57:22 +0100
commitb3c6256252c64eea4ab2e4649d0634fb8b08948e (patch)
treef5be3c21b42e5c450e979fcd8299c62b9d31ade7
parent72e783db75348aa7a5e5f721a2a2086c45a666c6 (diff)
downloadranger-b3c6256252c64eea4ab2e4649d0634fb8b08948e.tar.gz
config/commands.py: Reduce code duplication in :delete
-rw-r--r--ranger/config/commands.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/ranger/config/commands.py b/ranger/config/commands.py
index 40377547..86db4bea 100644
--- a/ranger/config/commands.py
+++ b/ranger/config/commands.py
@@ -536,18 +536,18 @@ class delete(Command):
                 self._question_callback, ('n', 'N', 'y', 'Y'))
         else:
             # no need for a confirmation, just delete
-            for f in self.fm.tags.tags:
-                if str(f).startswith(self.fm.thisfile.path):
-                    self.fm.tags.remove(f)
-            self.fm.delete()
+            self._delete_with_tags()
+
+    def _delete_with_tags(self):
+        # Delete the selected files and untag them.
+        for f in self.fm.tags.tags:
+            if str(f).startswith(self.fm.thisfile.path):
+                self.fm.tags.remove(f)
+        self.fm.delete()
 
     def _question_callback(self, answer):
         if answer == 'y' or answer == 'Y':
-            for f in self.fm.tags.tags:
-                if str(f).startswith(self.fm.thisfile.path):
-                    self.fm.tags.remove(f)
-            self.fm.delete()
-
+            self._delete_with_tags()
 
 class mark_tag(Command):
     """:mark_tag [<tags>]
'#n156'>156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298