rummage 4.25__tar.gz → 4.26__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rummage
-Version: 4.25
+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>

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

@@ -1,5 +1,12 @@
 # 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+.

{rummage-4.25 → 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>

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

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

{rummage-4.25 → 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.25 → rummage-4.26}/rummage/lib/gui/data/docs/about/changelog.html

@@ -25,6 +25,13 @@
 
   <!-- 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>

{rummage-4.25 → 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.25 → 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.25 → rummage-4.26}/rummage/lib/gui/dialogs/rummage_dialog.py

@@ -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:
@@ -818,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))
@@ -1418,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()
@@ -1573,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")),
@@ -2159,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.25 → rummage-4.26}/rummage/lib/gui/gui.py

@@ -259,10 +259,10 @@ class RummageFrame ( wx.Frame ):
         self.m_size_text = wx.TextCtrl( self.m_limit_panel, wx.ID_ANY, u"1000", wx.DefaultPosition, wx.Size( -1,-1 ), 0 )
         fgSizer37.Add( self.m_size_text, 1, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
 
-        self.m_size_type_label = wx.StaticText( self.m_limit_panel, wx.ID_ANY, u"KB", wx.DefaultPosition, wx.DefaultSize, 0 )
-        self.m_size_type_label.Wrap( -1 )
-
-        fgSizer37.Add( self.m_size_type_label, 0, wx.BOTTOM|wx.RIGHT|wx.TOP|wx.ALIGN_CENTER_VERTICAL, 5 )
+        m_size_type_choiceChoices = [ u"bytes", u"KB", u"MB", u"GB", u"TB" ]
+        self.m_size_type_choice = wx.Choice( self.m_limit_panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_size_type_choiceChoices, 0 )
+        self.m_size_type_choice.SetSelection( 1 )
+        fgSizer37.Add( self.m_size_type_choice, 0, wx.ALL, 5 )
 
 
         gbSizer3.Add( fgSizer37, wx.GBPosition( 0, 2 ), wx.GBSpan( 1, 3 ), wx.EXPAND, 5 )

{rummage-4.25 → rummage-4.26}/rummage/lib/rumcore/__init__.py

@@ -431,37 +431,27 @@ class _RummageFileContent:
             enc = 'utf-32'
         return enc
 
-    def _read_bin(self):
-        """Setup binary file reading with `mmap`."""
+    def _read_file(self):
+        """Read the file in."""
+
+        if self.encoding.encode != "bin":
+            try:
+                self.file_obj = open(self.name, 'r', encoding=self._get_encoding(), errors='strict')
+                return self.file_obj.read()
+            except Exception:
+                self.encoding = text_decode.Encoding("bin", None)
+
+        if self.file_obj is not None:
+            self.file_obj.close()
+
         try:
             self.file_obj = open(self.name, "rb")
             if self.size != 0:
                 self.file_map = mmap.mmap(self.file_obj.fileno(), 0, access=mmap.ACCESS_READ)
+            return self.file_obj.read() if self.file_map is None else self.file_map
         except Exception as e:
-            # _read_bin has no other fallbacks, so we issue this if it fails.
             raise RummageException("Could not access or read file.") from e
 
-    def _read_file(self):
-        """Read the file in."""
-
-        try:
-            if self.encoding.encode == "bin":
-                self._read_bin()
-            else:
-                enc = self._get_encoding()
-                self.file_obj = open(self.name, 'r', encoding=enc, errors='strict')
-            return self.file_obj.read() if self.file_map is None else self.file_map
-        except RummageException:
-            # Bubble up `RummageExceptions`
-            raise
-        except Exception:
-            if self.encoding.encode != "bin":
-                if self.file_obj is not None:
-                    self.file_obj.close()
-                self.encoding = text_decode.Encoding("bin", None)
-                self._read_bin()
-                return self.file_map
-
 
 class _FileSearch:
     """Search for files."""
@@ -1083,10 +1073,7 @@ class _FileSearch:
                 if not file_record_sent:
                     yield FileRecord(file_info, None, None)
             except Exception:
-                yield FileRecord(
-                    file_info, None,
-                    get_exception()
-                )
+                yield FileRecord(file_info, None, get_exception())
 
     def run(self):
         """Start the file search."""