skilleter-thingy 0.0.97__py3-none-any.whl → 0.0.98__py3-none-any.whl

skilleter_thingy/multigit.py

@@ -30,7 +30,6 @@ import thingy.colour as colour
 # TODO: -j option to run in parallel - yes, but it will only work with non-interactive Git commands
 # TODO: Command that takes partial working tree name and either returns full path or pops up window to autocomplete until single match found
 # TODO: Consistent colours in output
-# TODO: If run in a subdirectory, only process working trees in that tree (or have an option to do so)
 # TODO: Option to +dir to return all matches so that caller can select one they want
 # TODO: Verbose option
 # TODO: When filtering by tag, if tag starts with '!' only match if tag isn't present (and don't allow '!' at start of tag otherwise)
@@ -39,7 +38,8 @@ import thingy.colour as colour
 # TODO: +run command to do things other than git commands
 # TODO: init option '--update' to update the configuration file with new working trees and remove ones that are no longer there
 # TODO: init option '--set-default' to update the default branch to the current one for specified working trees
-# TODO: Integrat completion with fzf if installed?
+# TODO: Integrate completion with fzf if installed?
+# TODO: If run in a subdirectory, only process working trees in that tree (or have an option to do so, or an option _not_ to do so; --all)
 ################################################################################
 
 DEFAULT_CONFIG_FILE = 'multigit.toml'
@@ -153,14 +153,7 @@ def find_configuration(default_config_file):
 def show_progress(width, msg):
     """Show a single line progress message"""
 
-    name = msg[:width-1]
-
-    colour.write(f'{name}', newline=False)
-
-    if len(name) < width-1:
-        colour.write(' '*(width-len(name)), newline=False)
-
-    colour.write('\r', newline=False)
+    colour.write(msg[:width-1], newline=False, cleareol=True, cr=True)
 
 ################################################################################
 
@@ -298,9 +291,10 @@ def mg_init(args, config, console):
 
             colour.write(f'Added [BOLD:{repo}] with default branch [BLUE:{default_branch}]')
 
-    # Look for configuration entries that are no longer present and delete them
+    if not args.quiet:
+        colour.write(cleareol=True)
 
-    colour.write()
+    # Look for configuration entries that are no longer present and delete them
 
     removals = []
 
@@ -571,7 +565,7 @@ def main():
 
     if not args.configuration_file:
         if args.internal_command and args.command == 'init':
-            args.configuration_file = args.default_configuration_file
+            args.configuration_file = os.path.abspath(args.default_configuration_file)
         else:
             error('Cannot locate configuration file')
 

skilleter_thingy/thingy/colour.py

@@ -42,6 +42,8 @@ _ANSI_BMAGENTA = '\x1b[45m'
 _ANSI_BCYAN = '\x1b[46m'
 _ANSI_BWHITE = '\x1b[47m'
 
+_ANSI_CLEAREOL = '\x1b[K'
+
 # Looking up tables for converting textual colour codes to ANSI codes
 
 ANSI_REGEXES = \
@@ -144,7 +146,7 @@ def format(txt):
 
 ################################################################################
 
-def write(txt=None, newline=True, stream=sys.stdout, indent=0, strip=False):
+def write(txt=None, newline=True, stream=sys.stdout, indent=0, strip=False, cleareol=False, cr=False):
     """ Write to the specified stream (defaulting to stdout), converting colour codes to ANSI
         txt can be None, a string or a list of strings."""
 
@@ -163,10 +165,22 @@ def write(txt=None, newline=True, stream=sys.stdout, indent=0, strip=False):
 
             stream.write(line)
 
+            if cleareol:
+                stream.write(_ANSI_CLEAREOL)
+
             if newline or n < len(txt) - 1:
                 stream.write('\n')
-    elif newline:
-        stream.write('\n')
+            elif cr:
+                stream.write('\r')
+
+    else:
+        if cleareol:
+            stream.write(_ANSI_CLEAREOL)
+
+        if newline:
+            stream.write('\n')
+        elif cr:
+            stream.write('\r')
 
 ################################################################################
 

{skilleter_thingy-0.0.97.dist-info → skilleter_thingy-0.0.98.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.97
+Version: 0.0.98
 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.97.dist-info → skilleter_thingy-0.0.98.dist-info}/RECORD

@@ -25,7 +25,7 @@ skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/gphotosync.py,sha256=Vb2zYTEFp26BYdkG810SRg9afyfDqvq4CLHTk-MFf60,22388
 skilleter_thingy/linecount.py,sha256=ehTN6VD76i4U5k6dXuYoiqSRHI67_BP-bziklNAJSKY,4309
 skilleter_thingy/moviemover.py,sha256=QzUAWQzQ1AWWREIhl-VMaLo2h8MMhOekBnao5jGWV1s,4470
-skilleter_thingy/multigit.py,sha256=xcCG5M-lgeF1LFLvHAyIjEpXYa3vLZREladpFEVdMRA,22121
+skilleter_thingy/multigit.py,sha256=mYEppth-mt_BPT9UTpSOOoNTyk5b1hIb4QZ4h_Q9EwI,22090
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=BOu-cKHMivDlBqlRqv7sL3J6Ix1K2dxWWNcderldyZo,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
@@ -44,7 +44,7 @@ skilleter_thingy/window_rename.py,sha256=dCBgZqih_3YKHt35hsOAhARFp3QxOi8w8huC63s
 skilleter_thingy/xchmod.py,sha256=T89xiH_po0nvH5T1AGgQOD5yhjKd9-LcHcmez3IORww,4604
 skilleter_thingy/yamlcheck.py,sha256=FXylZ5NtHirDlPVhVEUZUZkTugVR-g51BbjaN06akAc,2868
 skilleter_thingy/thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
-skilleter_thingy/thingy/colour.py,sha256=-I5HOfWZNVxN85DjNPpzYLIUlzGrzMr3oLRwim7O6us,7103
+skilleter_thingy/thingy/colour.py,sha256=mx7pXXoykQTiCu_BNA-JJSgFpsaUW3noY89d8YKrwBs,7411
 skilleter_thingy/thingy/dc_curses.py,sha256=fuuQPR11zV_akAhygL_cAhVLC5YAgKgowzlITVbETE8,8539
 skilleter_thingy/thingy/dc_defaults.py,sha256=ahcteQvoWZrO5iTU68zkIY1Zex6iX5uR5ubwI4CCYBk,6170
 skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUsMhOFs,1783
@@ -61,9 +61,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.97.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.97.dist-info/METADATA,sha256=MkSkIQGlsrgKS3NvYtPwA2u8rAQAtr-uo9FkdyM48ps,14528
-skilleter_thingy-0.0.97.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-skilleter_thingy-0.0.97.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
-skilleter_thingy-0.0.97.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.97.dist-info/RECORD,,
+skilleter_thingy-0.0.98.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.98.dist-info/METADATA,sha256=9NyNkqOkkoHBkkx7jXFZRCfKpGIjUDd-DkKJ8-E0XOE,14528
+skilleter_thingy-0.0.98.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+skilleter_thingy-0.0.98.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
+skilleter_thingy-0.0.98.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.98.dist-info/RECORD,,