rummage 4.24.1__tar.gz → 4.26__tar.gz

{rummage-4.24.1 → rummage-4.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rummage
-Version: 4.24.1
+Version: 4.26
 Summary: A GUI search and replace app.
 Project-URL: Homepage, https://github.com/facelessuser/Rummage
 Author-email: Isaac Muse <Isaac.Muse@gmail.com>
@@ -27,12 +27,12 @@ Requires-Dist: backrefs>=7.0
 Requires-Dist: bracex>=3.0
 Requires-Dist: chardet>=7.4.3
 Requires-Dist: coloraide>=8.10
-Requires-Dist: filelock>=3.29.4
+Requires-Dist: filelock>=3.29.7
 Requires-Dist: markdown>=3.10.2
 Requires-Dist: pygments>=2.19.2
 Requires-Dist: pymdown-extensions>=11.0
 Requires-Dist: send2trash>=2.1.0
-Requires-Dist: wcmatch<11.0,>=10.2
+Requires-Dist: wcmatch<12.0,>=11.0
 Requires-Dist: wxpython>=4.1.0
 Provides-Extra: extras
 Requires-Dist: faust-cchardet>=2.1.19; extra == 'extras'

{rummage-4.24.1 → rummage-4.26}/docs/src/markdown/.snippets/abbr.md

@@ -1 +1,2 @@
 *[JSON]: JavaScript Object Notation
+*[ZSH]: Z Shell

{rummage-4.24.1 → rummage-4.26}/docs/src/markdown/about/changelog.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 4.26
+
+-   **NEW**: Show file sizes in proper, various increments: bytes, KB, MB, and GB.
+-   **NEW**: Add control to select file size unit types in limiter panel.
+-   **FIX**: Fix issue where directory picker for target folder to search would not start with the current, specified
+    directory, even when it is valid.
+
+## 4.25
+
+-   **NEW**: Require `wcmatch` 11.0+.
+-   **NEW**: Add new "ZSH number range" option in settings to enable ZSH style number ranges in glob patterns (`<0-9>`).
+-   **FIX**: Fix an issue where logging would break.
+
 ## 4.24.1
 
 -   **NEW**: Fix URL handling in documentation rendering in `webview`.

{rummage-4.24.1 → rummage-4.26}/docs/src/markdown/search.md

@@ -144,6 +144,18 @@ Pattern           | Meaning
 > If you need to escape `-` or `|`, you can put them in a sequence: `[-|]`. Remember to place `-` at the beginning of
 > a sequence as `-` is also used to specify character ranges: `[a-z]`.
 
+#### ZSH Number Ranges
+
+ZSH number ranges are a simple syntax for specifying a simple range of numbers via `<0-100>`. Ends can also be omitted
+allowing for unbounded ranges: `<->`, `<-100>`, `<0-100>`, etc. It should be noted that numbers must be whole, positive
+numbers and manually specified numbers greater than 19 digits will be truncated.
+
+ZSH number ranges also handle numbers padded with zeros, so `<0-9>` would match `5`, `05`, `005`, etc. You can pad your
+match pattern with zeros (`<0010-0090>`), but it has no affect on the actual search. Input numbers will be normalized
+(`<10-90>`) and ZSH padding number handling is always the same.
+
+This can be enabled in [Preferences](./preferences.md#search).
+
 #### Extended Match Syntax
 
 In [Preferences](./preferences.md#search), you can also enable extended match patterns. Extended match patterns allow

{rummage-4.24.1 → rummage-4.26}/gui.fbp

@@ -3106,9 +3106,9 @@
                                             </object>
                                             <object class="sizeritem" expanded="false">
                                               <property name="border">5</property>
-                                              <property name="flag">wxBOTTOM|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL</property>
+                                              <property name="flag">wxALL</property>
                                               <property name="proportion">0</property>
-                                              <object class="wxStaticText" expanded="false">
+                                              <object class="wxChoice" expanded="false">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
@@ -3122,6 +3122,7 @@
                                                 <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
+                                                <property name="choices">&quot;bytes&quot; &quot;KB&quot; &quot;MB&quot; &quot;GB&quot; &quot;TB&quot;</property>
                                                 <property name="close_button">1</property>
                                                 <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
@@ -3137,8 +3138,6 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">KB</property>
-                                                <property name="markup">0</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -3146,7 +3145,7 @@
                                                 <property name="minimize_button">0</property>
                                                 <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
-                                                <property name="name">m_size_type_label</property>
+                                                <property name="name">m_size_type_choice</property>
                                                 <property name="pane_border">1</property>
                                                 <property name="pane_position"></property>
                                                 <property name="pane_size"></property>
@@ -3154,16 +3153,20 @@
                                                 <property name="pin_button">1</property>
                                                 <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
+                                                <property name="selection">1</property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
                                                 <property name="style"></property>
-                                                <property name="subclass"></property>
+                                                <property name="subclass">; ; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
                                                 <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
-                                                <property name="wrap">-1</property>
                                               </object>
                                             </object>
                                           </object>
@@ -8765,12 +8768,81 @@
                                     <event name="OnCheckBox">on_fullfile_toggle</event>
                                   </object>
                                 </object>
+                                <object class="gbsizeritem" expanded="false">
+                                  <property name="border">5</property>
+                                  <property name="colspan">1</property>
+                                  <property name="column">0</property>
+                                  <property name="flag">wxALL</property>
+                                  <property name="row">4</property>
+                                  <property name="rowspan">1</property>
+                                  <object class="wxCheckBox" expanded="false">
+                                    <property name="BottomDockable">1</property>
+                                    <property name="LeftDockable">1</property>
+                                    <property name="RightDockable">1</property>
+                                    <property name="TopDockable">1</property>
+                                    <property name="aui_layer">0</property>
+                                    <property name="aui_name"></property>
+                                    <property name="aui_position">0</property>
+                                    <property name="aui_row">0</property>
+                                    <property name="best_size"></property>
+                                    <property name="bg"></property>
+                                    <property name="caption"></property>
+                                    <property name="caption_visible">1</property>
+                                    <property name="center_pane">0</property>
+                                    <property name="checked">0</property>
+                                    <property name="close_button">1</property>
+                                    <property name="context_help"></property>
+                                    <property name="context_menu">1</property>
+                                    <property name="default_pane">0</property>
+                                    <property name="dock">Dock</property>
+                                    <property name="dock_fixed">0</property>
+                                    <property name="docking">Left</property>
+                                    <property name="drag_accept_files">0</property>
+                                    <property name="enabled">1</property>
+                                    <property name="fg"></property>
+                                    <property name="floatable">1</property>
+                                    <property name="font"></property>
+                                    <property name="gripper">0</property>
+                                    <property name="hidden">0</property>
+                                    <property name="id">wxID_ANY</property>
+                                    <property name="label">ZSH Number Range</property>
+                                    <property name="max_size"></property>
+                                    <property name="maximize_button">0</property>
+                                    <property name="maximum_size"></property>
+                                    <property name="min_size"></property>
+                                    <property name="minimize_button">0</property>
+                                    <property name="minimum_size"></property>
+                                    <property name="moveable">1</property>
+                                    <property name="name">m_zsh_numrange_checkbox</property>
+                                    <property name="pane_border">1</property>
+                                    <property name="pane_position"></property>
+                                    <property name="pane_size"></property>
+                                    <property name="permission">protected</property>
+                                    <property name="pin_button">1</property>
+                                    <property name="pos"></property>
+                                    <property name="resize">Resizable</property>
+                                    <property name="show">1</property>
+                                    <property name="size"></property>
+                                    <property name="style"></property>
+                                    <property name="subclass">; ; forward_declare</property>
+                                    <property name="toolbar_pane">0</property>
+                                    <property name="tooltip"></property>
+                                    <property name="validator_data_type"></property>
+                                    <property name="validator_style">wxFILTER_NONE</property>
+                                    <property name="validator_type">wxDefaultValidator</property>
+                                    <property name="validator_variable"></property>
+                                    <property name="window_extra_style"></property>
+                                    <property name="window_name"></property>
+                                    <property name="window_style"></property>
+                                    <event name="OnCheckBox">on_zsh_numrange_toggle</event>
+                                  </object>
+                                </object>
                                 <object class="gbsizeritem" expanded="false">
                                   <property name="border">5</property>
                                   <property name="colspan">2</property>
                                   <property name="column">0</property>
                                   <property name="flag">wxEXPAND | wxALL</property>
-                                  <property name="row">4</property>
+                                  <property name="row">5</property>
                                   <property name="rowspan">1</property>
                                   <object class="wxStaticLine" expanded="false">
                                     <property name="BottomDockable">1</property>
@@ -8832,7 +8904,7 @@
                                   <property name="colspan">2</property>
                                   <property name="column">0</property>
                                   <property name="flag">wxEXPAND</property>
-                                  <property name="row">5</property>
+                                  <property name="row">6</property>
                                   <property name="rowspan">1</property>
                                   <object class="wxGridBagSizer" expanded="false">
                                     <property name="empty_cell_size"></property>

{rummage-4.24.1 → rummage-4.26}/pyproject.toml

@@ -153,7 +153,7 @@ legacy_tox_ini = """
 [tox]
 skipsdist=true
 envlist=
-    {py39,py310,py311,py312,py313,py314},
+    {py310,py311,py312,py313,py314},
     lint
 
 [testenv]
@@ -181,6 +181,6 @@ deps =
     -rrequirements/docs.txt
 commands =
     {envbindir}/zensical build -f zensical.yml --clean
-    pyspelling -j 0
+    pyspelling -j 8
     {envpython} {toxinidir}/tools/gen_docs.py --verbose --test
 """

{rummage-4.24.1 → rummage-4.26}/requirements/project.txt

@@ -1,9 +1,9 @@
 chardet>=7.4.3
 backrefs>=7.0
 bracex>=3.0
-wcmatch>=10.2,<11.0
+wcmatch>=11.0,<12.0
 wxpython>=4.1.0
-filelock>=3.29.4
+filelock>=3.29.7
 send2trash>=2.1.0
 markdown>=3.10.2
 pymdown-extensions>=11.0

{rummage-4.24.1 → rummage-4.26}/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, 24, 1, 'final')
+__version_info__ = Version(4, 26, 0, 'final')
 __version__ = __version_info__._get_canonical()
 __app__ = "Rummage"
 __status__ = __version_info__[3]

{rummage-4.24.1 → rummage-4.26}/rummage/lib/gui/app/custom_app.py

@@ -297,9 +297,9 @@ class CustomLog(wx.Log):
         self.file_lock = FileLock(self.file_name + '.lock')
 
         try:
-            with self.file_lock.acquire(1):
-                with open(self.file_name, "w", "utf-8", errors='strict') as f:
-                    f.write("")
+            with self.file_lock:
+                with open(self.file_name, "w", encoding='utf-8', errors='strict'):
+                    pass
         except Exception:
             self.file_name = None
 
@@ -312,7 +312,7 @@ class CustomLog(wx.Log):
 
         try:
             if self.file_name is not None:
-                with self.file_lock.acquire(1):
+                with self.file_lock:
                     with open(self.file_name, 'a', encoding='utf-8', errors='strict') as f:
                         f.write(msg)
             else:
@@ -389,9 +389,9 @@ class CustomLogGui(wx.LogGui):
         self.debug = debug
 
         try:
-            with self.file_lock.acquire(1):
-                with open(self.file_name, "w", "utf-8", errors='strict') as f:
-                    f.write("")
+            with self.file_lock:
+                with open(self.file_name, "w", encoding='utf-8', errors='strict'):
+                    pass
         except Exception:
             self.file_name = None
 
@@ -402,7 +402,7 @@ class CustomLogGui(wx.LogGui):
 
         try:
             if self.file_name is not None:
-                with self.file_lock.acquire(1):
+                with self.file_lock:
                     with open(self.file_name, 'a', encoding='utf-8', errors='strict') as f:
                         f.write(msg)
             else:

{rummage-4.24.1 → rummage-4.26}/rummage/lib/gui/controls/result_lists.py

@@ -20,7 +20,6 @@ IN THE SOFTWARE.
 """
 import time
 import wx
-import decimal
 import os
 import functools
 from .dynamic_lists import DynamicList, USE_SAMPLE_SIZE
@@ -324,7 +323,7 @@ class ResultFileList(CommonOperationsMixin, DynamicList):
                 os.path.basename(obj.name),
                 0,
                 obj.ext,
-                decimal.Decimal(obj.size) / decimal.Decimal(1024),
+                obj.size,
                 os.path.dirname(obj.name),
                 '',
                 obj.modified,
@@ -342,7 +341,7 @@ class ResultFileList(CommonOperationsMixin, DynamicList):
                     os.path.basename(obj.info.name),
                     1,
                     obj.info.ext,
-                    decimal.Decimal(obj.info.size) / decimal.Decimal(1024),
+                    obj.info.size,
                     os.path.dirname(obj.info.name),
                     obj.info.encoding,
                     obj.info.modified,
@@ -374,7 +373,17 @@ class ResultFileList(CommonOperationsMixin, DynamicList):
         if not absolute:
             item = self.itemIndexMap[item]
         if real == FILE_SIZE:
-            return '%.2fKB' % round(self.itemDataMap[item][FILE_SIZE], 2)
+            s = self.itemDataMap[item][FILE_SIZE]
+            if s < 1e3:
+                return f"{s:d} bytes"
+            elif s < 1e6:
+                return f'{s / 1e3:.2f} KB'
+            elif s < 1e9:
+                return f'{s / 1e6:.2f} MB'
+            elif s < 1e12:
+                return f'{s / 1e9:.2f} GB'
+            else:
+                return f'{s / 1e12:.2f} TB'
         elif real in (FILE_MOD, FILE_CRE):
             if self.international:
                 return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(self.itemDataMap[item][real]))

{rummage-4.24.1 → rummage-4.26}/rummage/lib/gui/data/docs/about/changelog.html

@@ -25,6 +25,19 @@
 
   <!-- Table of Content (Don't show for static sites) -->
     <h1 id="changelog">Changelog</h1>
+<h2 id="426">4.26</h2>
+<ul>
+<li><strong>NEW</strong>: Show file sizes in proper, various increments: bytes, KB, MB, and GB.</li>
+<li><strong>NEW</strong>: Add control to select file size unit types in limiter panel.</li>
+<li><strong>FIX</strong>: Fix issue where directory picker for target folder to search would not start with the current, specified
+    directory, even when it is valid.</li>
+</ul>
+<h2 id="425">4.25</h2>
+<ul>
+<li><strong>NEW</strong>: Require <code>wcmatch</code> 11.0+.</li>
+<li><strong>NEW</strong>: Add new "<abbr title="Z Shell">ZSH</abbr> number range" option in settings to enable <abbr title="Z Shell">ZSH</abbr> style number ranges in glob patterns (<code>&lt;0-9&gt;</code>).</li>
+<li><strong>FIX</strong>: Fix an issue where logging would break.</li>
+</ul>
 <h2 id="4241">4.24.1</h2>
 <ul>
 <li><strong>NEW</strong>: Fix URL handling in documentation rendering in <code>webview</code>.</li>

{rummage-4.24.1 → rummage-4.26}/rummage/lib/gui/data/docs/about/contributing.html

@@ -31,7 +31,7 @@
     <div class="__toc_wrapper"><span class="__toc_icon"></span>
     <div class="__toc_content">
     <ul class="__toc_list">
-      <li class="__toc_level_2"><a href="#contributing--support">Contributing &amp; Support</a></li>
+      <li class="__toc_level_2"><a href="#contributing-support">Contributing &amp; Support</a></li>
       <ul class="__toc_list_2">
       
       <li class="__toc_level_3"><a href="#overview">Overview</a></li>
@@ -70,7 +70,7 @@
     </ul>
     </div>
     </div>
-    <h1 id="contributing--support">Contributing &amp; Support</h1>
+    <h1 id="contributing-support">Contributing &amp; Support</h1>
 <h2 id="overview">Overview</h2>
 <p>Contribution from the community is encouraged and can be done in a variety of ways:</p>
 <ul>

{rummage-4.24.1 → rummage-4.26}/rummage/lib/gui/data/docs/search.html

@@ -59,6 +59,10 @@
       <li class="__toc_level_5"><a href="#basic-wildcard-syntax">Basic Wildcard syntax</a></li>
       <ul class="__toc_list_5">
       
+      </ul>
+      <li class="__toc_level_5"><a href="#zsh-number-ranges">ZSH Number Ranges</a></li>
+      <ul class="__toc_list_5">
+      
       </ul>
       <li class="__toc_level_5"><a href="#extended-match-syntax">Extended Match Syntax</a></li>
       <ul class="__toc_list_5">
@@ -345,6 +349,14 @@ which we will always be included.</p>
 <p>If you need to escape <code>-</code> or <code>|</code>, you can put them in a sequence: <code>[-|]</code>. Remember to place <code>-</code> at the beginning of
 a sequence as <code>-</code> is also used to specify character ranges: <code>[a-z]</code>.</p>
 </div>
+<h4 id="zsh-number-ranges"><abbr title="Z Shell">ZSH</abbr> Number Ranges</h4>
+<p><abbr title="Z Shell">ZSH</abbr> number ranges are a simple syntax for specifying a simple range of numbers via <code>&lt;0-100&gt;</code>. Ends can also be omitted
+allowing for unbounded ranges: <code>&lt;-&gt;</code>, <code>&lt;-100&gt;</code>, <code>&lt;0-100&gt;</code>, etc. It should be noted that numbers must be whole, positive
+numbers and manually specified numbers greater than 19 digits will be truncated.</p>
+<p><abbr title="Z Shell">ZSH</abbr> number ranges also handle numbers padded with zeros, so <code>&lt;0-9&gt;</code> would match <code>5</code>, <code>05</code>, <code>005</code>, etc. You can pad your
+match pattern with zeros (<code>&lt;0010-0090&gt;</code>), but it has no affect on the actual search. Input numbers will be normalized
+(<code>&lt;10-90&gt;</code>) and <abbr title="Z Shell">ZSH</abbr> padding number handling is always the same.</p>
+<p>This can be enabled in <a href="./preferences.html#search">Preferences</a>.</p>
 <h4 id="extended-match-syntax">Extended Match Syntax</h4>
 <p>In <a href="./preferences.html#search">Preferences</a>, you can also enable extended match patterns. Extended match patterns allow
 you to provide pattern lists to provide more advanced logic.</p>

{rummage-4.24.1 → rummage-4.26}/rummage/lib/gui/data/docs/usage.html

@@ -42,7 +42,7 @@
       <ul class="__toc_list_3">
       
       </ul>
-      <li class="__toc_level_3"><a href="#searching--replacing">Searching &amp; Replacing</a></li>
+      <li class="__toc_level_3"><a href="#searching-replacing">Searching &amp; Replacing</a></li>
       <ul class="__toc_list_3">
       
       <li class="__toc_level_4"><a href="#configuring-text-search">Configuring Text Search</a></li>
@@ -114,7 +114,7 @@ major and minor Python version to the end:</p>
 <a href="./installation.html#running-in-anaconda">Running in Anaconda</a>).</p>
 <div class="highlight"><pre><span></span><code>pythonw<span class="w"> </span>-m<span class="w"> </span>rummage
 </code></pre></div>
-<h2 id="searching--replacing">Searching &amp; Replacing</h2>
+<h2 id="searching-replacing">Searching &amp; Replacing</h2>
 <p><img alt="Search Tab" src="images/search_tab.png" /></p>
 <p>Search and replaces are configured in the <strong>Search</strong> tab. The search tab can essentially be broken up into two sections:
 text search configuration and file search configuration.</p>

{rummage-4.24.1 → rummage-4.26}/rummage/lib/gui/dialogs/import_settings_dialog.py

@@ -39,7 +39,7 @@ class ImportSettingsDialog(gui.ImportSettingsDialog):
         "notify_enabled", "single_instance", "extmatch",
         "brace_expansion", "file_case_sensitive", "full_exclude_path", "full_file_path",
         "globstar", "international_time", "matchbase", "minusnegate", "alt_list_color",
-        "autocomplete"
+        "autocomplete", "zsh_numrange"
     )
     STRING = ("backup_ext", "backup_folder", "term_notifier", "editor", "notify_method", "notify_sound")
     INTEGER = ("backup_type", "regex_mode", "regex_version", "patten_limit")

{rummage-4.24.1 → rummage-4.26}/rummage/lib/gui/dialogs/rummage_dialog.py

@@ -2,7 +2,7 @@
 Rummage Dialog.
 
 Licensed under MIT
-Copyright (c) 2011 - 2015 Isaac Muse <isaacmuse@gmail.com>
+Copyright (c) 2011 - 2026 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
@@ -68,7 +68,6 @@ from ... import __meta__
 from ... import rumcore
 from .. import util
 from ..util.colors import Color
-import decimal
 if rumcore.REGEX_SUPPORT:
     from backrefs import bregex
 else:
@@ -328,6 +327,7 @@ class RummageArgs:
         self.full_exclude_path = False
         self.full_file_path = False
         self.globstar = False
+        self.zsh_numrange = False
         self.matchbase = False
         self.minusnegate = True
         self.encoding_options = {}
@@ -817,6 +817,9 @@ class RummageFrame(gui.RummageFrame):
             )
         )
         self.m_size_text.SetValue(Settings.get_search_setting("size_limit_string", "1000"))
+        self.m_size_type_choice.SetStringSelection(
+            Settings.get_search_setting("size_compare_type", "KB")
+        )
 
         self.m_case_checkbox.SetValue(not Settings.get_search_setting("ignore_case_toggle", False))
         self.m_dotmatch_checkbox.SetValue(Settings.get_search_setting("dotall_toggle", False))
@@ -1217,6 +1220,9 @@ class RummageFrame(gui.RummageFrame):
         if args.brace_expansion:
             flags |= rumcore.BRACE
 
+        if args.zsh_numrange:
+            flags |= rumcore.NUMRANGE
+
         if args.file_case_sensitive:
             flags |= rumcore.FILECASE
 
@@ -1401,6 +1407,7 @@ class RummageFrame(gui.RummageFrame):
             args.globstar = bool(Settings.get_globstar())
             args.matchbase = bool(Settings.get_matchbase())
             args.minusnegate = bool(Settings.get_minusnegate())
+            args.zsh_numrange = bool(Settings.get_zsh_numrange())
 
             args.filepattern = self.m_filematch_textbox.Value
             if self.m_fileregex_checkbox.GetValue():
@@ -1413,8 +1420,17 @@ class RummageFrame(gui.RummageFrame):
 
             cmp_size = self.m_logic_choice.GetSelection()
             if cmp_size:
-                size = decimal.Decimal(self.m_size_text.GetValue())
-                args.size_compare = (LIMIT_COMPARE[cmp_size], round(size * decimal.Decimal(1024)))
+                size = int(self.m_size_text.GetValue())
+                size_type = self.m_size_type_choice.GetStringSelection()
+                if size_type == "KB":
+                    size *= 1e3
+                elif size_type == "MB":
+                    size *= 1e6
+                elif size_type == "GB":
+                    size *= 1e9
+                elif size_type == "TB":
+                    size *= 1e12
+                args.size_compare = (LIMIT_COMPARE[cmp_size], size)
             else:
                 args.size_compare = None
             cmp_modified = self.m_modified_choice.GetSelection()
@@ -1568,7 +1584,20 @@ class RummageFrame(gui.RummageFrame):
         strings.append(("force_encode", self.m_force_encode_choice.GetStringSelection()))
 
         if eng_size != "any":
-            strings += [("size_limit_string", self.m_size_text.GetValue())]
+            size_limit = int(self.m_size_text.GetValue())
+            size_type = self.m_size_type_choice.GetStringSelection()
+            if size_type == 'KB':
+                size_limit *= 1e3
+            elif size_type == "MB":
+                size_limit *= 1e6
+            elif size_type == "GB":
+                size_limit *= 1e9
+            elif size_type == "TB":
+                size_limit *= 1e12
+            strings += [
+                ("size_limit_string", str(size_limit)),
+                ("size_compare_type", size_type)
+            ]
         if eng_mod != "on any":
             strings += [
                 ("modified_date_string", self.m_modified_date_picker.GetValue().Format("%m/%d/%Y")),
@@ -2154,7 +2183,9 @@ class RummageFrame(gui.RummageFrame):
     def on_searchin_changed(self):
         """Callback for when a directory changes via the `m_searchin_text` control."""
 
-        self.SetTitle(self.m_searchin_text.GetValue())
+        target = self.m_searchin_text.GetValue()
+        self.SetTitle(target)
+        self.m_searchin_dir_picker.target = target
 
     def on_save_search(self, event):
         """Open a dialog to save a search for later use."""

{rummage-4.24.1 → rummage-4.26}/rummage/lib/gui/dialogs/settings_dialog.py

@@ -123,6 +123,7 @@ class SettingsDialog(webview.WebViewMixin, gui.SettingsDialog):
         self.m_brace_checkbox.SetValue(Settings.get_brace_expansion())
         self.m_case_checkbox.SetValue(Settings.get_file_case_sensitive())
         self.m_fullpath_checkbox.SetValue(Settings.get_full_exclude_path())
+        self.m_zsh_numrange_checkbox.SetValue(Settings.get_zsh_numrange())
         self.m_fullfile_checkbox.SetValue(Settings.get_full_file_path())
         self.m_globstar_checkbox.SetValue(Settings.get_globstar())
         self.m_matchbase_checkbox.SetValue(Settings.get_matchbase())
@@ -264,6 +265,7 @@ class SettingsDialog(webview.WebViewMixin, gui.SettingsDialog):
         self.BRACES = _("Brace expansion")
         self.CASE = _("Case sensitive")
         self.FULL_PATH = _("Full path directory match")
+        self.ZSH_NUMRANGE = _("ZSH number range")
         self.FULL_FILE = _("Full path file match")
         self.GLOBSTAR = _("Globstar (full path)")
         self.MATCHBASE = _("Match base (full path)")
@@ -339,6 +341,7 @@ class SettingsDialog(webview.WebViewMixin, gui.SettingsDialog):
         self.m_brace_checkbox.SetLabel(self.BRACES)
         self.m_case_checkbox.SetLabel(self.CASE)
         self.m_fullpath_checkbox.SetLabel(self.FULL_PATH)
+        self.m_zsh_numrange_checkbox.SetLabel(self.ZSH_NUMRANGE)
         self.m_fullfile_checkbox.SetLabel(self.FULL_FILE)
         self.m_globstar_checkbox.SetLabel(self.GLOBSTAR)
         self.m_matchbase_checkbox.SetLabel(self.MATCHBASE)
@@ -660,6 +663,11 @@ class SettingsDialog(webview.WebViewMixin, gui.SettingsDialog):
 
         Settings.set_full_exclude_path(self.m_fullpath_checkbox.GetValue())
 
+    def on_zsh_numrange_toggle(self, event):
+        """Handle ZSH number range toggle."""
+
+        Settings.set_zsh_numrange(self.m_zsh_numrange_checkbox.GetValue())
+
     def on_fullfile_toggle(self, event):
         """Handle full file toggle."""