Fix chains with literal and regex patterns (#435)

Author: facelessuser

.pyspelling.yml

@@ -22,7 +22,7 @@ matrix:
       - 'code, pre, span.keys'
       - '.magiclink-compare, .magiclink-commit, .magiclink-repository, .md-footer-social__link'
       - '.MathJax_Preview, .md-nav__link, .md-footer-custom-text, .md-source__repository, .headerlink, .md-icon'
-      - '.md-footer-social__link'
+      - '.md-social__link'
   - pyspelling.filters.url:
 
 - name: markdown

docs/src/markdown/about/changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.16.4
+
+- **FIX**: When chaining literal and regular expression patterns together, the mode could get stuck in literal mode
+  when applying replacements.
+
 ## 4.16.3
 
 - **FIX**: Use latest `wcmatch` (8.1) which does a better job at bailing out of really large expansions. Patterns

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, 16, 3, 'final')
+__version_info__ = Version(4, 16, 4, 'final')
 __version__ = __version_info__._get_canonical()
 __app__ = "Rummage"
 __status__ = __version_info__[3]

rummage/lib/gui/data/docs/.dochash

@@ -1 +1 @@
-6e1ca51903754d2bcb30ca487e913551
+e86be5b6022c3447a3b600c653dd9816

rummage/lib/gui/data/docs/404.html

@@ -9,7 +9,7 @@
   <title>Rummage</title>
 
   <!-- Theme CSS  -->
-  <link rel="stylesheet" href="css/theme.css">
+  <link rel="stylesheet" href="/css/theme.css">
 
   <!-- Extra CSS -->
   </style>

rummage/lib/gui/data/docs/about/changelog.html

@@ -25,6 +25,11 @@
 
   <!-- Table of Content (Don't show for static sites) -->
     <h1 id="changelog">Changelog</h1>
+<h2 id="4164">4.16.4</h2>
+<ul>
+<li><strong>FIX</strong>: When chaining literal and regular expression patterns together, the mode could get stuck in literal mode
+  when applying replacements.</li>
+</ul>
 <h2 id="4163">4.16.3</h2>
 <ul>
 <li><strong>FIX</strong>: Use latest <code>wcmatch</code> (8.1) which does a better job at bailing out of really large expansions. Patterns
@@ -312,7 +317,7 @@ <h2 id="406">4.0.6</h2>
 </ul>
 <h2 id="405">4.0.5</h2>
 <ul>
-<li><strong>FIX</strong>: Single instance handling regression <a class="magiclink magiclink-github magiclink-issue" href="https://github.com/facelessuser/Rummage/issues/217" title="GitHub Issue: facelessuser/Rummage#217">#217</a>.</li>
+<li><strong>FIX</strong>: Single instance handling regression <a class="magiclink magiclink-github magiclink-issue" href="https://github.com/facelessuser/Rummage/issues/217" title="GitHub Issue: facelessuser/Rummage #217">#217</a>.</li>
 </ul>
 <h2 id="404">4.0.4</h2>
 <ul>
@@ -372,7 +377,7 @@ <h2 id="37">3.7</h2>
 <li><strong>FIX</strong>: Update requests should use <code>https</code>.</li>
 <li><strong>FIX</strong>: Update localization.</li>
 <li><strong>FIX</strong>: Fixes to Windows notifications.</li>
-<li><strong>FIX</strong>: Single instance handling regression <a class="magiclink magiclink-github magiclink-issue" href="https://github.com/facelessuser/Rummage/issues/217" title="GitHub Issue: facelessuser/Rummage#217">#217</a>.</li>
+<li><strong>FIX</strong>: Single instance handling regression <a class="magiclink magiclink-github magiclink-issue" href="https://github.com/facelessuser/Rummage/issues/217" title="GitHub Issue: facelessuser/Rummage #217">#217</a>.</li>
 <li><strong>FIX</strong>: Require Backrefs 3.5.0 which includes fixes for: pattern caching, named Unicode bug.  Also adds better format
   string replace with the added ability to use format string align and fill.</li>
 <li><strong>FIX</strong>: Don't escape curly brackets in format strings just because they are string escaped when preprocessing Regex
@@ -401,7 +406,7 @@ <h2 id="36">3.6</h2>
 <li><strong>FIX</strong>: Wildcard patterns not allowing character tokens such as <code>\x70</code>, <code>\u0070</code>, <code>\N{unicode name}</code>, <code>\160</code>, and
   standard escapes like <code>\t</code> etc.</li>
 <li><strong>FIX</strong>: Incorrect documentation on wildcard patterns.</li>
-<li><strong>FIX</strong>: Python 2.7 not translating Unicode escapes <a class="magiclink magiclink-github magiclink-issue" href="https://github.com/facelessuser/Rummage/issues/196" title="GitHub Issue: facelessuser/Rummage#196">#196</a>.</li>
+<li><strong>FIX</strong>: Python 2.7 not translating Unicode escapes <a class="magiclink magiclink-github magiclink-issue" href="https://github.com/facelessuser/Rummage/issues/196" title="GitHub Issue: facelessuser/Rummage #196">#196</a>.</li>
 <li><strong>FIX</strong>: Require Backrefs 3.1.2. Some bug fixes, but notably, Backrefs switched from using <code>\&lt;</code> and <code>\&gt;</code> for start and
   end word boundaries to <code>\m</code> and <code>\M</code>.  This is because of an oversight as Python versions less than 3.7 would escape
   <code>&lt;</code> and <code>&gt;</code> in <code>re.escpae</code> (even though it is unnecessary). Also some Unicode table generation fixes.</li>
@@ -465,7 +470,7 @@ <h2 id="321">3.2.1</h2>
 </ul>
 <h2 id="320">3.2.0</h2>
 <ul>
-<li><strong>NEW</strong>: Results update live. Progress has been removed. (<a class="magiclink magiclink-github magiclink-issue" href="https://github.com/facelessuser/Rummage/issues/140" title="GitHub Issue: facelessuser/Rummage#140">#140</a>)</li>
+<li><strong>NEW</strong>: Results update live. Progress has been removed. (<a class="magiclink magiclink-github magiclink-issue" href="https://github.com/facelessuser/Rummage/issues/140" title="GitHub Issue: facelessuser/Rummage #140">#140</a>)</li>
 <li><strong>FIX</strong>: Windows status bar flicker.</li>
 <li><strong>FIX</strong>: Results not showing when notifications is set to only play audio alerts.</li>
 </ul>

rummage/lib/gui/data/docs/about/contributing.html

@@ -79,10 +79,10 @@ <h2 id="overview">Overview</h2>
 <li>Code patches via pull requests.</li>
 <li>Documentation improvements via pull requests.</li>
 </ul>
-<h2 id="become-a-sponsor">Become a Sponsor <span class="twemoji heart-throb"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7.655 14.916L8 14.25l.345.666a.752.752 0 01-.69 0zm0 0L8 14.25l.345.666.002-.001.006-.003.018-.01a7.643 7.643 0 00.31-.17 22.08 22.08 0 003.433-2.414C13.956 10.731 16 8.35 16 5.5 16 2.836 13.914 1 11.75 1 10.203 1 8.847 1.802 8 3.02 7.153 1.802 5.797 1 4.25 1 2.086 1 0 2.836 0 5.5c0 2.85 2.045 5.231 3.885 6.818a22.075 22.075 0 003.744 2.584l.018.01.006.003h.002z"/></svg></span></h2>
+<h2 id="become-a-sponsor">Become a Sponsor <span class="twemoji heart-throb"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7.655 14.916 8 14.25l.345.666a.752.752 0 0 1-.69 0zm0 0L8 14.25l.345.666.002-.001.006-.003.018-.01a7.643 7.643 0 0 0 .31-.17 22.08 22.08 0 0 0 3.433-2.414C13.956 10.731 16 8.35 16 5.5 16 2.836 13.914 1 11.75 1 10.203 1 8.847 1.802 8 3.02 7.153 1.802 5.797 1 4.25 1 2.086 1 0 2.836 0 5.5c0 2.85 2.045 5.231 3.885 6.818a22.075 22.075 0 0 0 3.744 2.584l.018.01.006.003h.002z"/></svg></span></h2>
 <p>Open source projects take time and money. Help support the project by becoming a sponsor. You can add your support at
 any tier you feel comfortable with. No amount is too little.</p>
-<p><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"/></svg></span> <a href="https://github.com/sponsors/facelessuser">GitHub Sponsors </a></p>
+<p><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"/></svg></span> <a href="https://github.com/sponsors/facelessuser">GitHub Sponsors </a></p>
 <p>If you'd like to do a one time contribution, you can do so via PayPal.</p>
 <p><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M111.4 295.9c-3.5 19.2-17.4 108.7-21.5 134-.3 1.8-1 2.5-3 2.5H12.3c-7.6 0-13.1-6.6-12.1-13.9L58.8 46.6c1.5-9.6 10.1-16.9 20-16.9 152.3 0 165.1-3.7 204 11.4 60.1 23.3 65.6 79.5 44 140.3-21.5 62.6-72.5 89.5-140.1 90.3-43.4.7-69.5-7-75.3 24.2zM357.1 152c-1.8-1.3-2.5-1.8-3 1.3-2 11.4-5.1 22.5-8.8 33.6-39.9 113.8-150.5 103.9-204.5 103.9-6.1 0-10.1 3.3-10.9 9.4-22.6 140.4-27.1 169.7-27.1 169.7-1 7.1 3.5 12.9 10.6 12.9h63.5c8.6 0 15.7-6.3 17.4-14.9.7-5.4-1.1 6.1 14.4-91.3 4.6-22 14.3-19.7 29.3-19.7 71 0 126.4-28.8 142.9-112.3 6.5-34.8 4.6-71.4-23.8-92.6z"/></svg></span> <a href="https://www.paypal.me/facelessuser">PayPal</a></p>
 <h2 id="bug-reports">Bug Reports</h2>
@@ -131,13 +131,11 @@ <h3 id="running-validation-tests">Running Validation Tests</h3>
 <p>Make sure that Tox is installed:</p>
 <div class="highlight"><pre><span></span><code>pip install tox
 </code></pre></div>
-
 </li>
 <li>
 <p>Run Tox:</p>
 <div class="highlight"><pre><span></span><code>tox
 </code></pre></div>
-
 <p>Tox should install necessary dependencies and run the tests. If you are a Linux user, please check out information
 on <a href="../installation.html#requirements">requirements</a>.</p>
 </li>

rummage/lib/gui/data/docs/extras.html

@@ -106,7 +106,6 @@ <h3 id="macos">macOS</h3>
 <p>Content of script:</p>
 <div class="highlight"><pre><span></span><code><span class="o">(</span>/Library/Frameworks/Python.framework/Versions/3.6/bin/rummage --path <span class="s2">&quot;</span><span class="nv">$1</span><span class="s2">&quot;</span><span class="o">)</span>&gt;/dev/null <span class="m">2</span>&gt;<span class="p">&amp;</span><span class="m">1</span> <span class="p">&amp;</span>
 </code></pre></div>
-
 <p>This is just an example. You will need to determine the location of your Python install.</p>
 </li>
 </ul>
@@ -137,7 +136,6 @@ <h3 id="windows">Windows</h3>
 <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>
 </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>
 
@@ -155,7 +153,6 @@ <h3 id="windows">Windows</h3>
 <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>
 </code></pre></div>
-
 </li>
 <li>
 <p>Save file.</p>
@@ -181,7 +178,6 @@ <h4 id="ubuntu-nautilus-gnome">Ubuntu Nautilus (Gnome)</h4>
     <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">paths</span><span class="p">):</span>
         <span class="n">subprocess</span><span class="o">.</span><span class="n">Popen</span><span class="p">([</span><span class="n">RUMMAGE_PATH</span><span class="p">,</span> <span class="s2">&quot;--path&quot;</span><span class="p">,</span> <span class="n">paths</span><span class="p">[</span><span class="mi">0</span><span class="p">]])</span>
 </code></pre></div>
-
 </li>
 <li>
 <p>Restart of Nautilus may or may not be needed, but context menu item should appear under <code>Scripts</code> and should work on files and folders.</p>
@@ -195,7 +191,6 @@ <h4 id="ubuntu-dolphin-kde">Ubuntu Dolphin (KDE)</h4>
 <div class="highlight"><pre><span></span><code>facelessuser@facelessuser:~$ kf5-config --path services
 /home/facelessuser/.local/share/kservices5/:/usr/share/kservices5/
 </code></pre></div>
-
 </li>
 <li>
 <p>Next create your <code>.desktop</code> file in one of these locations creating the necessary folder(s) if needed.  In this example, the file will be created at <code>~/.local/share/kservices5/ServiceMenus/rummage.desktoop</code>.</p>
@@ -213,13 +208,11 @@ <h4 id="ubuntu-dolphin-kde">Ubuntu Dolphin (KDE)</h4>
 <span class="na">Icon</span><span class="o">=</span><span class="s">/usr/local/lib/python3.5/dist-packages/rummage/lib/gui/data/rummage_1024.png</span>
 <span class="na">Exec</span><span class="o">=</span><span class="s">rummage --path &quot;%f&quot;</span>
 </code></pre></div>
-
 </li>
 <li>
 <p>Lastly we rebuild and refresh the desktop entries:</p>
-<div class="highlight"><pre><span></span><code><span class="gp">facelessuser@facelessuser:~$</span> kbuildsycoca5
+<div class="highlight"><pre><span></span><code><span class="gp">facelessuser@facelessuser:~$ </span>kbuildsycoca5
 </code></pre></div>
-
 </li>
 <li>
 <p>Close all Dolphin windows and reopen to see your context menu item.  It should be found under <code>Actions</code>.</p>
@@ -252,36 +245,30 @@ <h3 id="editing-existing-translations">Editing Existing Translations</h3>
 <div class="highlight"><pre><span></span><code>msgid &quot;About&quot;
 msgstr &quot;&lt;my_translation&gt;&quot;
 </code></pre></div>
-
 <h3 id="generate-new-template-from-source">Generate New Template from Source</h3>
 <p>In the Python source, you'll notice that translatable strings are represented as <code>_("some text")</code>. <code>_</code> is the function that retrieves the proper translations. In order to provide translations, we have to build up a template of all of these strings in a <code>.pot</code> file.  This is done by running:</p>
 <div class="highlight"><pre><span></span><code>python setup.py extract_messages
 </code></pre></div>
-
 <p>This will scan the Python source and generate a template at <code>rummage/lib/gui/localization/locale/rummage.pot</code>.</p>
 <p>If you update the source in a way that requires generating a new <code>.pot</code> file, then you will most likely need to update existing <code>.po</code> files as well. See <a href="#update-translation-files">Update Translation Files</a> to see how.</p>
 <p>See Babel's documentation on <a href="http://babel.pocoo.org/en/latest/setup.html#extract-messages"><code>extract_messages</code></a> for more info.</p>
 <h3 id="update-translation-files">Update Translation Files</h3>
 <p>When new strings are added in the source, or strings are changed, you will need to re-generate the <code>.pot</code> file and then update the <code>.po</code> files. This should update all <code>.po</code> files.</p>
 <div class="highlight"><pre><span></span><code>python setup.py update_catalog
 </code></pre></div>
-
 <p>If you need to only update a specific <code>.po</code> file:</p>
 <div class="highlight"><pre><span></span><code>python setup.py update_catalog -l en_US
 </code></pre></div>
-
 <p>See Babel's documentation on <a href="http://babel.pocoo.org/en/latest/setup.html#update-catalog"><code>update_catalog</code></a> for more info.</p>
 <h3 id="create-new-translations">Create New Translations</h3>
 <p>To create a translation <code>.po</code> file to edit, all you need to do is run the command below specifying your locale. The command should create a <code>.po</code> file to edit and the associated directory structure.</p>
 <div class="highlight"><pre><span></span><code>python setup.py init_catalog -l en_US
 </code></pre></div>
-
 <p>See Babel's documentation on <a href="http://babel.pocoo.org/en/latest/setup.html#init-catalog"><code>init_catalog</code></a> for more info.</p>
 <h3 id="build-translations">Build Translations</h3>
 <p>Building translations is also pretty easy:</p>
 <div class="highlight"><pre><span></span><code>python setup.py compile_catalog
 </code></pre></div>
-
 <p>This should build <code>.mo</code> files for all languages.  See Babel's documentation on <a href="http://babel.pocoo.org/en/latest/setup.html#compile-catalog"><code>compile_catalog</code></a> for more info.</p>
   </div>