skilleter-thingy 0.0.62__tar.gz → 0.0.64__tar.gz

{skilleter_thingy-0.0.62/skilleter_thingy.egg-info → skilleter_thingy-0.0.64}/PKG-INFO

@@ -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 → skilleter_thingy-0.0.64}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.62"
+version = "0.0.64"
 
 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.62 → skilleter_thingy-0.0.64}/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-0.0.62 → skilleter_thingy-0.0.64}/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.62 → skilleter_thingy-0.0.64}/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 → skilleter_thingy-0.0.64/skilleter_thingy.egg-info}/PKG-INFO

@@ -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 → skilleter_thingy-0.0.64}/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