skilleter-thingy 0.0.62__py3-none-any.whl → 0.0.64__py3-none-any.whl

skilleter_thingy/readable.py

@@ -47,7 +47,7 @@ TF_TAG_CHANGE_BLOCK_END = re.compile(r'^ +}$')
 
 TF_MISC_REGEX = \
 [
-    { 'regex': re.compile(r'(Read complete after) \d+s'), 'replace': r'\1 {SECONDS}'},
+    { 'regex': re.compile(r'(Read complete after) (\d+s|\d+m\d+s)'), 'replace': r'\1 {ELAPSED}'},
     { 'regex': re.compile(r'"(.*:.*)"( = ".*")'), 'replace': r'\1\2'},
     { 'regex': re.compile(r'"(.*:.*)"( = \[$)'), 'replace': r'\1\2'},
     { 'regex': re.compile(r'^last "terraform apply":$'), 'replace':r'last "terraform apply" which may have affected this plan:'},
@@ -56,7 +56,8 @@ TF_MISC_REGEX = \
 TF_IGNORE_LIST = [
     {'start': TF_HAS_CHANGED, 'end': TF_HAS_CHANGED_END},
     {'start': TF_READ_DURING_APPLY, 'end': TF_READ_DURING_APPLY_END},
-    {'start': re.compile('(Releasing|Acquiring) state lock. This may take a few moments\.+')},
+    {'start': re.compile(r'(Releasing|Acquiring) state lock. This may take a few moments\.+')},
+    {'start': re.compile(r'.*: Still reading\.{3} \[.* elapsed\]')},
 ]
 
 ################################################################################

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/thingy/tidy.py

@@ -59,7 +59,7 @@ RE_TIME = [
     {'regex': re.compile(r'[0-9]([.][0-9]*)*\s*(second[s]?)'), 'replace': '{ELAPSED}'},
 
     {'find': '\{DATE\} \{TIME\}', 'replace': '{DATE+TIME}'},
-    {'regex': re.compile(r'[0-9]{2}m [0-9]{2}s'), 'replace': '{TIME}'},
+    {'regex': re.compile(r'[0-9]+m *[0-9]+s'), 'replace': '{ELAPSED}'},
 ]
 
 # SHA values

{skilleter_thingy-0.0.62.dist-info → skilleter_thingy-0.0.64.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.62
+Version: 0.0.64
 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.62.dist-info → skilleter_thingy-0.0.64.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=YYzeZuaUAwz_dx47X4D8qoHURVXw5CsN_ziGpuHXqlA,12985
+skilleter_thingy/readable.py,sha256=urBwbhs12ckBQa_mj2InbhQWFsKxs9irFOLTiJ8QdTE,13066
 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
@@ -58,11 +58,11 @@ skilleter_thingy/thingy/popup.py,sha256=jW-nbpdeswqEMTli7OmBv1J8XQsvFoMI0J33O6dO
 skilleter_thingy/thingy/process.py,sha256=WJLg3js1zdgI7Nlkt7e5ICltkjXcA9P1f-LWPSZCdWs,3570
 skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1Uo,12611
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
-skilleter_thingy/thingy/tidy.py,sha256=1TO7BdfC7oizUnG6p66LxFV1_I7H835SFh3ugxCzol0,5876
+skilleter_thingy/thingy/tidy.py,sha256=71DCyj0VJrj52RmjQyj1eOiQJIfy5EIPHuThOrS6ZTA,5876
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.0.62.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.62.dist-info/METADATA,sha256=35e1F-eA_ZYivbxww1bE4AsIMecwG_ZM7i0Hb0mEN9U,5313
-skilleter_thingy-0.0.62.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-skilleter_thingy-0.0.62.dist-info/entry_points.txt,sha256=IT6cZSbGHrd2UzIQbiMRotKiTJnYJBkESC4fAe8gjsE,2026
-skilleter_thingy-0.0.62.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.62.dist-info/RECORD,,
+skilleter_thingy-0.0.64.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.64.dist-info/METADATA,sha256=2U7Mh6EMULbzqGT3FhYYBhXI23mncQXss8hv_tgosyQ,5313
+skilleter_thingy-0.0.64.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+skilleter_thingy-0.0.64.dist-info/entry_points.txt,sha256=LxYRrQHkCGK-zjLXHqRdsUSUOoBbh7e8YUN1IVs5vIs,2072
+skilleter_thingy-0.0.64.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.64.dist-info/RECORD,,

{skilleter_thingy-0.0.62.dist-info → skilleter_thingy-0.0.64.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