skilleter-thingy 0.0.63__py3-none-any.whl → 0.0.65__py3-none-any.whl

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/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.dist-info → skilleter_thingy-0.0.65.dist-info}/METADATA

@@ -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.dist-info → skilleter_thingy-0.0.65.dist-info}/RECORD

@@ -28,14 +28,14 @@ skilleter_thingy/moviemover.py,sha256=j_Xb9_jFdgpFBAXcF4tEqbnKH_FonlnUU39LiCK980
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=5gSjlINUxf3ZQl3NG0o7CsWwODvTbokIMIafLFvn8Hc,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
-skilleter_thingy/readable.py,sha256=urBwbhs12ckBQa_mj2InbhQWFsKxs9irFOLTiJ8QdTE,13066
+skilleter_thingy/readable.py,sha256=SsXKQgDin8u2onSHFs3vUB_BJc5Cv5jJEisBf0lT0Y8,13944
 skilleter_thingy/remdir.py,sha256=SkN9xEc1ckFGRP4zS2LUbx7Ihw697YMV0ybr_-afiyE,4653
 skilleter_thingy/rmdupe.py,sha256=tcX3w8XvliGwBMdSt9BUu07kuDtQEc0IiU8sCxmgzHA,17117
 skilleter_thingy/rpylint.py,sha256=TzZ5GvWrqgTKYKZwadTvzdbX-DJ8ll4WfVJqtN6IzO0,2635
 skilleter_thingy/splitpics.py,sha256=qRlJrqet7TEI6SodS4bkuKXQUpOdMaqmjE4c1CR7ouo,3266
 skilleter_thingy/strreplace.py,sha256=xsIWw0hc452rYEBtNEQFKIzmV03xjm_Taz-eDTmFFKI,2539
 skilleter_thingy/sysmon.py,sha256=XRZG6EVSzoVYan_N16qVB1l1RaU51uvLWlRA0CDjC54,11348
-skilleter_thingy/tfm.py,sha256=3ejKNI2P65lGz-50mxRMxW_o5NmoeMDcmhji_0uALhI,33703
+skilleter_thingy/tfm.py,sha256=xMsqcuNJ32PwKF5vO3SO6etlbJKbCLUJhSdC2w0clwE,33829
 skilleter_thingy/tfparse.py,sha256=u1IZH2J_WH1aORyMozKSI2JKok7_S1MMJhiobzmhlUI,2988
 skilleter_thingy/trimpath.py,sha256=25On5OHTT1rXTzTuRWQeS3FWtTd0XZr5NFDDACR6AGM,2294
 skilleter_thingy/venv_create.py,sha256=lMcGvWNwP-ZlyPJ1eZU-PHNOnscZHjtjhoT6sLfhIU4,1153
@@ -60,9 +60,9 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
 skilleter_thingy/thingy/tidy.py,sha256=71DCyj0VJrj52RmjQyj1eOiQJIfy5EIPHuThOrS6ZTA,5876
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.0.63.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.63.dist-info/METADATA,sha256=hrDs-f3Z4kaE9XUcRT9F9RgJ43s-RBhc8qtt4hXSstY,5313
-skilleter_thingy-0.0.63.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-skilleter_thingy-0.0.63.dist-info/entry_points.txt,sha256=IT6cZSbGHrd2UzIQbiMRotKiTJnYJBkESC4fAe8gjsE,2026
-skilleter_thingy-0.0.63.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.63.dist-info/RECORD,,
+skilleter_thingy-0.0.65.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.65.dist-info/METADATA,sha256=sYWFxv9e_Hphz9vmnkUDx82BOHOnKMahvmCf-4ipV_8,5313
+skilleter_thingy-0.0.65.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+skilleter_thingy-0.0.65.dist-info/entry_points.txt,sha256=LxYRrQHkCGK-zjLXHqRdsUSUOoBbh7e8YUN1IVs5vIs,2072
+skilleter_thingy-0.0.65.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.65.dist-info/RECORD,,

{skilleter_thingy-0.0.63.dist-info → skilleter_thingy-0.0.65.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{skilleter_thingy-0.0.63.dist-info → skilleter_thingy-0.0.65.dist-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