skilleter-thingy 0.0.63__tar.gz → 0.0.65__tar.gz

{skilleter_thingy-0.0.63/skilleter_thingy.egg-info → skilleter_thingy-0.0.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.63
+Version: 0.0.65
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.0.63 → skilleter_thingy-0.0.65}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.63"
+version = "0.0.65"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},
@@ -80,6 +80,7 @@ tfm             =  "skilleter_thingy:tfm.tfm"
 tfparse         =  "skilleter_thingy:tfparse.tfparse"
 trimpath        =  "skilleter_thingy:trimpath.trimpath"
 venv-create     =  "skilleter_thingy:venv_create.venv_create"
+webwatch        =  "skilleter_thingy:webwatch.webwatch"
 window-rename   =  "skilleter_thingy:window_rename.window_rename"
 xchmod          =  "skilleter_thingy:xchmod.xchmod"
 yamlcheck       =  "skilleter_thingy:yamlcheck.yamlcheck"

{skilleter_thingy-0.0.63 → skilleter_thingy-0.0.65}/skilleter_thingy/readable.py

@@ -58,6 +58,7 @@ TF_IGNORE_LIST = [
     {'start': TF_READ_DURING_APPLY, 'end': TF_READ_DURING_APPLY_END},
     {'start': re.compile(r'(Releasing|Acquiring) state lock. This may take a few moments\.+')},
     {'start': re.compile(r'.*: Still reading\.{3} \[.* elapsed\]')},
+    {'start': re.compile(r' +# .* will be destroyed'), 'end': TF_HAS_CHANGED_END, 'skip': 2},
 ]
 
 ################################################################################
@@ -146,6 +147,10 @@ def cleanfile(args, infile, outfile):
 
     ignore_until = None
 
+    # Number of lines at the top of an ignore block to skip before starting to ignore
+
+    pre_ignore_count = 0
+
     # Collects data that we are going to output in alphabetical order
 
     collection = []
@@ -208,14 +213,16 @@ def cleanfile(args, infile, outfile):
 
             for ignore in TF_IGNORE_LIST:
                 if ignore['start'].fullmatch(clean):
-                    if 'end' in ignore:
-                        ignore_until = ignore['end']
+                    ignore_until = ignore.get('end', None)
+                    pre_ignore_count = ignore.get('skip', 0)
+
+                    logging.info('Found ignore start marker: "%s"', clean)
 
-                        logging.info('Found ignore start marker: "%s"', clean)
+                    if ignore_until:
                         logging.info('Skipping until end marker: "%s"', ignore_until.pattern)
-                    else:
-                        clean = None
 
+                    if pre_ignore_count:
+                        logging.info('Pre-ignore skip count:     %d', pre_ignore_count)
                     break
             else:
                 if TF_TAG_CHANGE_BLOCK_START.fullmatch(clean):
@@ -251,9 +258,15 @@ def cleanfile(args, infile, outfile):
             if in_tag_block and clean and TF_TAG_ENTRY_IGNORE.fullmatch(clean):
                 clean = None
 
-        # Write normal output, skipping >1 blank lines
+            # If we are ignoring and not in the pre-ignore section and not matching the end then, then ignore
+
+            if ignore_until and not pre_ignore_count and not ignore_until.fullmatch(clean):
+                clean = None
+
+        # Write normal output, skipping >1 blank lines and skipping ignore blocks when the pre-ignore
+        # count has hit zero.
 
-        if clean is not None and not ignore_until:
+        if clean is not None and not (ignore_until and pre_ignore_count==0):
             if clean != '' or prev_line != '':
                 outfile.write(clean)
                 outfile.write('\n')
@@ -262,10 +275,15 @@ def cleanfile(args, infile, outfile):
 
         # Clear the ignore flag if we've hid the end marker of the block
 
-        if ignore_until and clean and ignore_until.fullmatch(clean):
+        if ignore_until and clean and pre_ignore_count == 0 and ignore_until.fullmatch(clean):
             ignore_until = None
             logging.info('Hit end of ignore section')
 
+        # Decrement the pre-ignore count if we have one
+
+        if pre_ignore_count > 0:
+            pre_ignore_count -= 1
+
     # If we've hit the end and are still ignoring stuff, something's up!
 
     if ignore_until:
@@ -301,6 +319,8 @@ def main():
                         outfile = tempfile.NamedTemporaryFile(mode='wt+', delete=False)
                         outfile_name = outfile.name
 
+                    logging.info('Cleaning %s', infile)
+
                     cleanfile(args, infile, outfile)
 
                     if outfile_name:

{skilleter_thingy-0.0.63 → skilleter_thingy-0.0.65}/skilleter_thingy/tfm.py

@@ -14,6 +14,7 @@
         / TODO: 1. If you exit a directory via Backspace then re-enter it hasn't saved the current position
         / TODO: 1. Implement inotify as background thread as it is far too slow to run everytime we process a keypress
         / TODO: 2. Use inotify to check for updates and update panes
+        TODO: 1. Config file - keyboard config, override apps used to open particular file types
         TODO: 2. Wildcard tagging/untagging
         TODO: 3. Allow copy/move to overwrite files (prompt first)
         TODO: 3. Create directory
@@ -652,7 +653,7 @@ class FileManager():
         """ Edit the current file
             TODO: Write internal file viewer """
 
-        pager = os.environ.get('PAGER', 'more')
+        pager = os.environ.get('TFM_PAGER', os.environ.get('PAGER', 'more'))
         self.run_external_command([pager, os.path.basename(self.current_pane.get_current_file()['name'])])
 
     ################################################################################

{skilleter_thingy-0.0.63 → skilleter_thingy-0.0.65/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.63
+Version: 0.0.65
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.0.63 → skilleter_thingy-0.0.65}/skilleter_thingy.egg-info/entry_points.txt

@@ -39,6 +39,7 @@ tfm = skilleter_thingy:tfm.tfm
 tfparse = skilleter_thingy:tfparse.tfparse
 trimpath = skilleter_thingy:trimpath.trimpath
 venv-create = skilleter_thingy:venv_create.venv_create
+webwatch = skilleter_thingy:webwatch.webwatch
 window-rename = skilleter_thingy:window_rename.window_rename
 xchmod = skilleter_thingy:xchmod.xchmod
 yamlcheck = skilleter_thingy:yamlcheck.yamlcheck