rummage 4.21.2__tar.gz → 4.22__tar.gz

{rummage-4.21.2 → rummage-4.22}/LICENSE.md

@@ -1,6 +1,6 @@
 MIT license.
 
-Copyright (c) 2013 - 2024 Isaac Muse <isaacmuse@gmail.com>
+Copyright (c) 2013 - 2025 Isaac Muse <isaacmuse@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

{rummage-4.21.2 → rummage-4.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rummage
-Version: 4.21.2
+Version: 4.22
 Summary: A GUI search and replace app.
 Project-URL: Homepage, https://github.com/facelessuser/Rummage
 Author-email: Isaac Muse <Isaac.Muse@gmail.com>
@@ -13,7 +13,6 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -23,25 +22,24 @@ Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Text Processing :: Filters
 Classifier: Topic :: Text Processing :: Markup :: HTML
-Requires-Python: >=3.7
-Requires-Dist: backrefs>=5.7
-Requires-Dist: bracex>=2.4
+Requires-Python: >=3.9
+Requires-Dist: backrefs>=6.0.1
+Requires-Dist: bracex>=2.6
 Requires-Dist: chardet>=5.1.0
-Requires-Dist: coloraide>=4.0
+Requires-Dist: coloraide>=4.7.2
 Requires-Dist: filelock>=3.16
-Requires-Dist: markdown>=3.7
-Requires-Dist: pygments>=2.14.1
-Requires-Dist: pymdown-extensions>=10.11
+Requires-Dist: markdown>=3.8.2
+Requires-Dist: pygments>=2.19.2
+Requires-Dist: pymdown-extensions>=10.16.1
 Requires-Dist: send2trash>=1.8.3
 Requires-Dist: wcmatch<11.0,>=10.0
 Requires-Dist: wxpython>=4.1.0
 Provides-Extra: extras
 Requires-Dist: faust-cchardet>=2.1.18; extra == 'extras'
-Requires-Dist: regex>=2024.9.11; extra == 'extras'
+Requires-Dist: regex>=2025.7.34; extra == 'extras'
 Description-Content-Type: text/markdown
 
 [![Donate via PayPal][donate-image]][donate-link]
-[![Build][github-ci-image]][github-ci-link]
 [![Coverage][codecov-image]][codecov-link]
 [![PyPI Version][pypi-image]][pypi-link]
 [![PyPI - Python Version][python-image]][pypi-link]
@@ -72,8 +70,6 @@ License
 
 Rummage is released under the MIT license.
 
-[github-ci-image]: https://github.com/facelessuser/Rummage/workflows/build/badge.svg
-[github-ci-link]: https://github.com/facelessuser/Rummage/actions?workflow=build
 [codecov-image]: https://img.shields.io/codecov/c/github/facelessuser/Rummage/master.svg?logo=codecov&logoColor=aaaaaa&labelColor=333333
 [codecov-link]: https://codecov.io/github/facelessuser/Rummage
 [pypi-image]: https://img.shields.io/pypi/v/Rummage.svg?logo=pypi&logoColor=aaaaaa&labelColor=333333

{rummage-4.21.2 → rummage-4.22}/README.md

@@ -1,5 +1,4 @@
 [![Donate via PayPal][donate-image]][donate-link]
-[![Build][github-ci-image]][github-ci-link]
 [![Coverage][codecov-image]][codecov-link]
 [![PyPI Version][pypi-image]][pypi-link]
 [![PyPI - Python Version][python-image]][pypi-link]
@@ -30,8 +29,6 @@ License
 
 Rummage is released under the MIT license.
 
-[github-ci-image]: https://github.com/facelessuser/Rummage/workflows/build/badge.svg
-[github-ci-link]: https://github.com/facelessuser/Rummage/actions?workflow=build
 [codecov-image]: https://img.shields.io/codecov/c/github/facelessuser/Rummage/master.svg?logo=codecov&logoColor=aaaaaa&labelColor=333333
 [codecov-link]: https://codecov.io/github/facelessuser/Rummage
 [pypi-image]: https://img.shields.io/pypi/v/Rummage.svg?logo=pypi&logoColor=aaaaaa&labelColor=333333

{rummage-4.21.2 → rummage-4.22}/docs/src/markdown/about/changelog.md

@@ -1,10 +1,18 @@
 # Changelog
 
+## 4.22
+
+-   **NEW**: Drop Python 3.8 support.
+-   **NEW**: Upgrade dependencies to pick up bug fixes.
+-   **NEW**: Add a command under the main menu to delete backups recursively under the current working directory.
+-   **FIX**: Custom focus is not needed to focus the app from macOS dock anymore.
+-   **FIX**: Fix some issues with context menu right click selection in list controls.
+
 ## 4.21.2
 
--  **FIX**: Use a different wxPython time control on macOS as the previous one would crash on the M series chips.
--  **FIX**: Fix an issue with local time to UTC conversion.
--  **FIX**: Fix an issue where created time comparisons was actually being done on modified times.
+-   **FIX**: Use a different wxPython time control on macOS as the previous one would crash on the M series chips.
+-   **FIX**: Fix an issue with local time to UTC conversion.
+-   **FIX**: Fix an issue where created time comparisons was actually being done on modified times.
 
 ## 4.21.1
 

{rummage-4.21.2 → rummage-4.22}/docs/src/markdown/preferences.md

@@ -186,6 +186,8 @@ The **Backups** panel allows you to configure where Rummage creates backups. You
 placed in the same folder as the original source, or if they are put into a subfolder. You can also configure the name
 of the subfolder used or the extension used when not writing to a subfolder.
 
+If you need to quickly delete all backups, you can select `File -> Delete Backups` from the main menu.
+
 ## Import/Export Settings
 
 If desired, Rummage's settings can be exported to a JSON file or imported from a JSON file.  This can be particularly

{rummage-4.21.2 → rummage-4.22}/gui.fbp

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <wxFormBuilder_Project>
   <FileVersion major="1" minor="18"/>
-  <object class="Project" expanded="true">
+  <object class="Project" expanded="false">
     <property name="code_generation">Python</property>
     <property name="cpp_class_decoration"></property>
     <property name="cpp_disconnect_events">1</property>
@@ -5103,6 +5103,24 @@
             <property name="name">m_separator41</property>
             <property name="permission">none</property>
           </object>
+          <object class="wxMenuItem" expanded="false">
+            <property name="bitmap"></property>
+            <property name="checked">0</property>
+            <property name="enabled">1</property>
+            <property name="help"></property>
+            <property name="id">wxID_ANY</property>
+            <property name="kind">wxITEM_NORMAL</property>
+            <property name="label">Delete Backups</property>
+            <property name="name">m_delete_backups_menuitem</property>
+            <property name="permission">none</property>
+            <property name="shortcut"></property>
+            <property name="unchecked_bitmap"></property>
+            <event name="OnMenuSelection">on_delete_backups</event>
+          </object>
+          <object class="separator" expanded="false">
+            <property name="name">m_separator5</property>
+            <property name="permission">none</property>
+          </object>
           <object class="wxMenuItem" expanded="false">
             <property name="bitmap"></property>
             <property name="checked">0</property>

{rummage-4.21.2 → rummage-4.22}/hatch_build.py

@@ -43,7 +43,6 @@ class CustomMetadataHook(MetadataHookInterface):
             "License :: OSI Approved :: MIT License",
             "Operating System :: OS Independent",
             "Programming Language :: Python :: 3",
-            "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
             "Programming Language :: Python :: 3.11",

{rummage-4.21.2 → rummage-4.22}/mkdocs.yml

@@ -4,7 +4,7 @@ repo_url: https://github.com/facelessuser/Rummage
 edit_uri: tree/master/docs/src/markdown
 site_description: A search and replace tool written in Python.
 copyright: |
-  Copyright &copy; 2013 - 2024 <a href="https://github.com/facelessuser" target="_blank" rel="noopener">Isaac Muse</a>
+  Copyright &copy; 2013 - 2025 <a href="https://github.com/facelessuser" target="_blank" rel="noopener">Isaac Muse</a>
 
 docs_dir: docs/src/markdown
 theme:

{rummage-4.21.2 → rummage-4.22}/pyproject.toml

@@ -9,7 +9,7 @@ name = "rummage"
 description = "A GUI search and replace app."
 readme = "README.md"
 license = "MIT"
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 authors = [
     { name = "Isaac Muse", email = "Isaac.Muse@gmail.com" },
 ]
@@ -153,7 +153,7 @@ legacy_tox_ini = """
 [tox]
 skipsdist=true
 envlist=
-    {py38,py39,py310,py311,py312,py313},
+    {py39,py310,py311,py312,py313},
     lint
 
 [testenv]

{rummage-4.21.2 → rummage-4.22}/requirements/extras.txt

@@ -1,2 +1,2 @@
 faust-cchardet>=2.1.18
-regex>=2024.9.11
+regex>=2025.7.34

{rummage-4.21.2 → rummage-4.22}/requirements/project.txt

@@ -1,11 +1,11 @@
 chardet>=5.1.0
-backrefs>=5.7
-bracex>=2.4
+backrefs>=6.0.1
+bracex>=2.6
 wcmatch>=10.0,<11.0
 wxpython>=4.1.0
 filelock>=3.16
 send2trash>=1.8.3
-markdown>=3.7
-pymdown-extensions>=10.11
-pygments>=2.14.1
-coloraide>=4.0
+markdown>=3.8.2
+pymdown-extensions>=10.16.1
+pygments>=2.19.2
+coloraide>=4.7.2

{rummage-4.21.2 → rummage-4.22}/requirements/test-project.txt

@@ -1,3 +1,3 @@
 chardet>=5.1.0
-backrefs>=5.7
+backrefs>=6.0.1
 wcmatch>=10.0,<11.0

{rummage-4.21.2 → rummage-4.22}/rummage/lib/__meta__.py

@@ -189,7 +189,7 @@ def parse_version(ver):
 
 
 #   (major, minor, micro, release type, pre-release build, post-release build, development-release)
-__version_info__ = Version(4, 21, 2, 'final')
+__version_info__ = Version(4, 22, 0, 'final')
 __version__ = __version_info__._get_canonical()
 __app__ = "Rummage"
 __status__ = __version_info__[3]

{rummage-4.21.2 → rummage-4.22}/rummage/lib/gui/app/rummage_app.py

@@ -136,10 +136,5 @@ class RummageApp(PipeApp):
     def MacNewFile(self, fileName=None):
         """Handle new window event."""
 
-        self.MacReopenApp()
-
-    def MacReopenApp(self):  # noqa
-        """Ensure that app will be un-minimized in macOS on dock icon click."""
-
         frame = self.GetTopWindow()
         platform_window_focus(frame)

{rummage-4.21.2 → rummage-4.22}/rummage/lib/gui/controls/result_lists.py

@@ -60,6 +60,13 @@ COPY_PATH = 1
 COPY_CONTENT = 2
 
 
+def display_menu(obj, m, p):
+    """Display menu."""
+
+    obj.PopupMenu(m, p)
+    m.Destroy()
+
+
 class ContextMenu(wx.Menu):
     """Context Menu."""
 
@@ -490,10 +497,9 @@ class ResultFileList(CommonOperationsMixin, DynamicList):
                 # Select if not already
                 if not selected:
                     s = self.GetFirstSelected()
-                    while s != -1:
-                        if s != item:
-                            self.Select(s, False)
-                        s = self.GetNextSelected(s)
+                    if s == -1:
+                        self.Select(item, True)
+
         if target is not None:
             if not enabled:
                 item = -1
@@ -522,8 +528,8 @@ class ResultFileList(CommonOperationsMixin, DynamicList):
                     )
                 ]
             )
-            self.PopupMenu(menu, pos)
-            menu.Destroy()
+
+            wx.CallLater(1, lambda obj=self, m=menu, p=pos: display_menu(obj, m, p))
         event.Skip()
 
 
@@ -807,10 +813,9 @@ class ResultContentList(CommonOperationsMixin, DynamicList):
                 # Select if not already
                 if not selected:
                     s = self.GetFirstSelected()
-                    while s != -1:
-                        if s != item:
-                            self.Select(s, False)
-                        s = self.GetNextSelected(s)
+                    if s == -1:
+                        self.Select(item, True)
+
         if target is not None:
             if not enabled:
                 item = -1
@@ -840,6 +845,5 @@ class ResultContentList(CommonOperationsMixin, DynamicList):
                     )
                 ]
             )
-            self.PopupMenu(menu, pos)
-            menu.Destroy()
+            wx.CallLater(1, lambda obj=self, m=menu, p=pos: display_menu(obj, m, p))
         event.Skip()

{rummage-4.21.2 → rummage-4.22}/rummage/lib/gui/data/docs/about/changelog.html

@@ -25,6 +25,14 @@
 
   <!-- Table of Content (Don't show for static sites) -->
     <h1 id="changelog">Changelog</h1>
+<h2 id="422">4.22</h2>
+<ul>
+<li><strong>NEW</strong>: Drop Python 3.8 support.</li>
+<li><strong>NEW</strong>: Upgrade dependencies to pick up bug fixes.</li>
+<li><strong>NEW</strong>: Add a command under the main menu to delete backups recursively under the current working directory.</li>
+<li><strong>FIX</strong>: Custom focus is not needed to focus the app from macOS dock anymore.</li>
+<li><strong>FIX</strong>: Fix some issues with context menu right click selection in list controls.</li>
+</ul>
 <h2 id="4212">4.21.2</h2>
 <ul>
 <li><strong>FIX</strong>: Use a different wxPython time control on macOS as the previous one would crash on the M series chips.</li>
@@ -316,7 +324,7 @@ unawares.</p>
 <li><strong>FIX</strong>: Process preview in regular expression test dialog when replace pattern is empty. If replace plugin is
     enabled, we must have a plugin specified.</li>
 </ul>
-<h2 id="422">4.2.2</h2>
+<h2 id="422_1">4.2.2</h2>
 <ul>
 <li><strong>FIX</strong>: Don't open another update notification if one is already open.</li>
 </ul>

{rummage-4.21.2 → rummage-4.22}/rummage/lib/gui/data/docs/extras.html

@@ -132,13 +132,13 @@ are doing.</p>
 <span class="na">@</span><span class="o">=</span><span class="s">&quot;&quot;</span>
 
 <span class="k">[HKEY_CLASSES_ROOT\Folder\shell\Rummage Here...\command]</span>
-<span class="na">@</span><span class="o">=</span><span class="s">&quot;&lt;python_install_path&gt;\\Scripts\\rummage.exe --path \&quot;%1\&quot;&quot;</span>
+<span class="na">@</span><span class="o">=</span><span class="s">&quot;&lt;python_install_path&gt;\\Scripts\\rummage.exe --path \&quot;</span><span class="na">%1\&quot;&quot;</span>
 
 <span class="k">[HKEY_CLASSES_ROOT\*\shell\Rummage Here...]</span>
 <span class="na">@</span><span class="o">=</span><span class="s">&quot;&quot;</span>
 
 <span class="k">[HKEY_CLASSES_ROOT\*\shell\Rummage Here...\command]</span>
-<span class="na">@</span><span class="o">=</span><span class="s">&quot;&lt;python_install_path&gt;\\Scripts\\rummage.exe --path \&quot;%1\&quot;&quot;</span>
+<span class="na">@</span><span class="o">=</span><span class="s">&quot;&lt;python_install_path&gt;\\Scripts\\rummage.exe --path \&quot;</span><span class="na">%1\&quot;&quot;</span>
 </code></pre></div>
 <p>Optionally, you can also include the Rummage icon beside your context menu entry by adding a few additional lines:</p>
 <div class="highlight"><pre><span></span><code><span class="na">Windows Registry Editor Version 5.00</span>
@@ -148,14 +148,14 @@ are doing.</p>
 <span class="na">&quot;Icon&quot;</span><span class="o">=</span><span class="s">&quot;&lt;python_install_path&gt;\\Lib\\site-packages\\rummage\\lib\\gui\\data\\rummage.ico&quot;</span>
 
 <span class="k">[HKEY_CLASSES_ROOT\Folder\shell\Rummage Here...\command]</span>
-<span class="na">@</span><span class="o">=</span><span class="s">&quot;&lt;python_install_path&gt;\\Scripts\\rummage.exe --path \&quot;%1\&quot;&quot;</span>
+<span class="na">@</span><span class="o">=</span><span class="s">&quot;&lt;python_install_path&gt;\\Scripts\\rummage.exe --path \&quot;</span><span class="na">%1\&quot;&quot;</span>
 
 <span class="k">[HKEY_CLASSES_ROOT\*\shell\Rummage Here...]</span>
 <span class="na">@</span><span class="o">=</span><span class="s">&quot;&quot;</span>
 <span class="na">&quot;Icon&quot;</span><span class="o">=</span><span class="s">&quot;&lt;python_install_path&gt;\\Lib\\site-packages\\rummage\\lib\\gui\\data\\rummage.ico&quot;</span>
 
 <span class="k">[HKEY_CLASSES_ROOT\*\shell\Rummage Here...\command]</span>
-<span class="na">@</span><span class="o">=</span><span class="s">&quot;&lt;python_install_path&gt;\\Scripts\\rummage.exe --path \&quot;%1\&quot;&quot;</span>
+<span class="na">@</span><span class="o">=</span><span class="s">&quot;&lt;python_install_path&gt;\\Scripts\\rummage.exe --path \&quot;</span><span class="na">%1\&quot;&quot;</span>
 </code></pre></div>
 </li>
 <li>
@@ -175,8 +175,8 @@ like to include the info here, please issue a pull request to update the documen
     (RUMMAGE_PATH should be the binary created when installing rummage in Python which is usually
     <code>/usr/local/bin/rummage</code>).</p>
 <div class="highlight"><pre><span></span><code><span class="ch">#!/usr/bin/python</span>
-<span class="kn">import</span> <span class="nn">os</span>
-<span class="kn">import</span> <span class="nn">subprocess</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">os</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">subprocess</span>
 
 <span class="n">RUMMAGE_PATH</span> <span class="o">=</span> <span class="s2">&quot;/usr/local/bin/rummage&quot;</span>
 

{rummage-4.21.2 → rummage-4.22}/rummage/lib/gui/data/docs/preferences.html

@@ -252,6 +252,7 @@ to access the binary inside the bundle.</p>
 <p>The <strong>Backups</strong> panel allows you to configure where Rummage creates backups. You can control whether backups are all
 placed in the same folder as the original source, or if they are put into a subfolder. You can also configure the name
 of the subfolder used or the extension used when not writing to a subfolder.</p>
+<p>If you need to quickly delete all backups, you can select <code>File -&gt; Delete Backups</code> from the main menu.</p>
 <h2 id="importexport-settings">Import/Export Settings</h2>
 <p>If desired, Rummage's settings can be exported to a <abbr title="JavaScript Object Notation">JSON</abbr> file or imported from a <abbr title="JavaScript Object Notation">JSON</abbr> file.  This can be particularly
 useful for importing regular expression patterns from one system into another system's existing regular expression list.

{rummage-4.21.2 → rummage-4.22}/rummage/lib/gui/data/docs/usage.html

@@ -221,40 +221,40 @@ environment.</p>
 <li>A function called <code>get_replace</code> that returns your class.</li>
 </ol>
 <p>The plugin class is fairly straight forward and is shown below.</p>
-<div class="highlight"><pre><span></span><code><span class="k">class</span> <span class="nc">ReplacePlugin</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
+<div class="highlight"><pre><span></span><code><span class="k">class</span><span class="w"> </span><span class="nc">ReplacePlugin</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;Rummage replace plugin.&quot;&quot;&quot;</span>
 
-    <span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">file_info</span><span class="p">,</span> <span class="n">flags</span><span class="p">):</span>
+    <span class="k">def</span><span class="w"> </span><span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">file_info</span><span class="p">,</span> <span class="n">flags</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Initialize.&quot;&quot;&quot;</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">file_info</span> <span class="o">=</span> <span class="n">file_info</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">flags</span> <span class="o">=</span> <span class="n">flags</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">on_init</span><span class="p">()</span>
 
-    <span class="k">def</span> <span class="nf">on_init</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+    <span class="k">def</span><span class="w"> </span><span class="nf">on_init</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Override this function to add initialization setup.&quot;&quot;&quot;</span>
 
-    <span class="k">def</span> <span class="nf">get_flags</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+    <span class="k">def</span><span class="w"> </span><span class="nf">get_flags</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Get flags.&quot;&quot;&quot;</span>
 
         <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">flags</span>
 
-    <span class="k">def</span> <span class="nf">get_file_name</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+    <span class="k">def</span><span class="w"> </span><span class="nf">get_file_name</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Get file name.&quot;&quot;&quot;</span>
 
         <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">file_info</span><span class="o">.</span><span class="n">name</span>
 
-    <span class="k">def</span> <span class="nf">is_binary</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+    <span class="k">def</span><span class="w"> </span><span class="nf">is_binary</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Is a binary search.&quot;&quot;&quot;</span>
 
         <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">file_info</span><span class="o">.</span><span class="n">encoding</span><span class="o">.</span><span class="n">encode</span> <span class="o">==</span> <span class="s1">&#39;bin&#39;</span>
 
-    <span class="k">def</span> <span class="nf">is_literal</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+    <span class="k">def</span><span class="w"> </span><span class="nf">is_literal</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Is a literal search.&quot;&quot;&quot;</span>
 
         <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">flags</span> <span class="o">&amp;</span> <span class="n">LITERAL</span>
 
-    <span class="k">def</span> <span class="nf">replace</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">m</span><span class="p">):</span>
+    <span class="k">def</span><span class="w"> </span><span class="nf">replace</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">m</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Make replacement.&quot;&quot;&quot;</span>
 
         <span class="k">return</span> <span class="n">m</span><span class="o">.</span><span class="n">group</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
@@ -264,7 +264,7 @@ environment.</p>
 string (for binary files).</p>
 <p>The <code>ReplacePlugin</code>'s <code>file_info</code> property is a named tuple providing information about the current file such as name,
 size, creation date, etc.</p>
-<div class="highlight"><pre><span></span><code><span class="k">class</span> <span class="nc">FileInfoRecord</span><span class="p">(</span><span class="n">namedtuple</span><span class="p">(</span><span class="s1">&#39;FileInfoRecord&#39;</span><span class="p">,</span> <span class="p">[</span><span class="s1">&#39;id&#39;</span><span class="p">,</span> <span class="s1">&#39;name&#39;</span><span class="p">,</span> <span class="s1">&#39;size&#39;</span><span class="p">,</span> <span class="s1">&#39;modified&#39;</span><span class="p">,</span> <span class="s1">&#39;created&#39;</span><span class="p">,</span> <span class="s1">&#39;encoding&#39;</span><span class="p">])):</span>
+<div class="highlight"><pre><span></span><code><span class="k">class</span><span class="w"> </span><span class="nc">FileInfoRecord</span><span class="p">(</span><span class="n">namedtuple</span><span class="p">(</span><span class="s1">&#39;FileInfoRecord&#39;</span><span class="p">,</span> <span class="p">[</span><span class="s1">&#39;id&#39;</span><span class="p">,</span> <span class="s1">&#39;name&#39;</span><span class="p">,</span> <span class="s1">&#39;size&#39;</span><span class="p">,</span> <span class="s1">&#39;modified&#39;</span><span class="p">,</span> <span class="s1">&#39;created&#39;</span><span class="p">,</span> <span class="s1">&#39;encoding&#39;</span><span class="p">])):</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;A record for tracking file info.&quot;&quot;&quot;</span>
 </code></pre></div>
 <p>The <code>ReplacePlugin</code>'s <code>flags</code> property contains only Rummage search related flags (the flags are abstracted at this
@@ -295,22 +295,22 @@ level and are converted to the appropriate regular expression flags later). They
 <p class="admonition-title">Example Plugin</p>
 <p>In the example below, we have a replace plugin that replaces the search result with the name of the file.  It is
 assumed this is not a binary replace, so a Unicode string is returned.</p>
-<div class="highlight"><pre><span></span><code><span class="kn">from</span> <span class="nn">__future__</span> <span class="kn">import</span> <span class="n">unicode_literals</span>
-<span class="kn">from</span> <span class="nn">rummage.lib</span> <span class="kn">import</span> <span class="n">rumcore</span>
-<span class="kn">import</span> <span class="nn">os</span>
+<div class="highlight"><pre><span></span><code><span class="kn">from</span><span class="w"> </span><span class="nn">__future__</span><span class="w"> </span><span class="kn">import</span> <span class="n">unicode_literals</span>
+<span class="kn">from</span><span class="w"> </span><span class="nn">rummage.lib</span><span class="w"> </span><span class="kn">import</span> <span class="n">rumcore</span>
+<span class="kn">import</span><span class="w"> </span><span class="nn">os</span>
 
 
-<span class="k">class</span> <span class="nc">TestReplace</span><span class="p">(</span><span class="n">rumcore</span><span class="o">.</span><span class="n">ReplacePlugin</span><span class="p">):</span>
+<span class="k">class</span><span class="w"> </span><span class="nc">TestReplace</span><span class="p">(</span><span class="n">rumcore</span><span class="o">.</span><span class="n">ReplacePlugin</span><span class="p">):</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;Replace object.&quot;&quot;&quot;</span>
 
-    <span class="k">def</span> <span class="nf">replace</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">m</span><span class="p">):</span>
+    <span class="k">def</span><span class="w"> </span><span class="nf">replace</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">m</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Replace method.&quot;&quot;&quot;</span>
 
         <span class="n">name</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">basename</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">get_file_name</span><span class="p">())</span>
         <span class="k">return</span> <span class="n">name</span>
 
 
-<span class="k">def</span> <span class="nf">get_replace</span><span class="p">():</span>
+<span class="k">def</span><span class="w"> </span><span class="nf">get_replace</span><span class="p">():</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;Get the replace object.&quot;&quot;&quot;</span>
 
     <span class="k">return</span> <span class="n">TestReplace</span>

{rummage-4.21.2 → rummage-4.22}/rummage/lib/gui/dialogs/delete_dialog.py

@@ -21,6 +21,7 @@ IN THE SOFTWARE.
 import wx
 import os
 import time
+import shutil
 import threading
 from ..localization import _
 from .. import gui
@@ -68,7 +69,10 @@ class DeleteThread(threading.Thread):
                             if self.recycle:
                                 send2trash(self.trouble_file)
                             else:
-                                os.remove(self.trouble_file)
+                                if os.path.isdir(self.trouble_file):
+                                    shutil.rmtree(self.trouble_file)
+                                else:
+                                    os.remove(self.trouble_file)
                         deleted = True
                         self.trouble_file = None
                     except Exception:
@@ -88,7 +92,10 @@ class DeleteThread(threading.Thread):
                     if self.recycle:
                         send2trash(f)
                     else:
-                        os.remove(f)
+                        if os.path.isdir(f):
+                            shutil.rmtree(f)
+                        else:
+                            os.remove(f)
                 self.count += 1
             except Exception:
                 self.trouble_file = f
@@ -115,7 +122,7 @@ class DeleteDialog(gui.DeleteDialog):
         self.file = None
         self.busy = False
         self.thread = None
-        self.total = len(file_list)
+        self.total = len(file_list) if isinstance(file_list, list) else 0
         self.message = None
         self.processing = False
         self.handling = False
@@ -128,15 +135,18 @@ class DeleteDialog(gui.DeleteDialog):
         title = None
         if self.action == ACTION_DELETE:
             title = _("Deleting Files")
-            self.message = _("Deleting %d/%d...")
+            self.message = _("Deleting %d/%d...") if self.total else _("Deleting %d...")
         elif self.action == ACTION_RECYCLE:
             title = _("Recycling Files")
-            self.message = _("Recycling %d/%d...")
+            self.message = _("Recycling %d/%d...") if self.total else _("Recycling %d...")
 
         self.localize()
         self.refresh_localization(title)
         if self.message:
-            self.m_progress_label.SetLabel(self.message % (0, self.total))
+            if self.total:
+                self.m_progress_label.SetLabel(self.message % (0, self.total))
+            else:
+                self.m_progress_label.SetLabel(self.message % 0)
 
         # Ensure good sizing of frame
         self.m_progress.SetValue(0)
@@ -198,10 +208,13 @@ class DeleteDialog(gui.DeleteDialog):
         if self.processing and not self.handling:
             self.handling = True
             count = self.thread.count
-            ratio = float(count) / float(self.total)
+            ratio = (float(count) / float(self.total)) if self.total else 0
             percent = int(ratio * 100)
             self.m_progress.SetValue(percent)
-            self.m_progress_label.SetLabel(self.message % (count, self.total))
+            if self.total:
+                self.m_progress_label.SetLabel(self.message % (count, self.total))
+            else:
+                self.m_progress_label.SetLabel(self.message % count)
 
             if self.thread.request is True:
                 self.thread.request = False
@@ -226,7 +239,10 @@ class DeleteDialog(gui.DeleteDialog):
             if not self.thread.is_alive():
                 self.processing = False
                 self.m_progress.SetValue(100)
-                self.m_progress_label.SetLabel(self.message % (self.thread.count, self.total))
+                if self.total:
+                    self.m_progress_label.SetLabel(self.message % (self.thread.count, self.total))
+                else:
+                    self.m_progress_label.SetLabel(self.message % self.thread.count)
 
                 if not self.thread.abort:
                     if self.thread.errors: