mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-19 18:02:28 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove some more ansi escapes on win7

Browse source
This commit is contained in:
ed 2021-08-26 22:45:36 +02:00
parent ac7b6f8f55
commit 23e72797bc
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
copyparty/util.py
View file

@ -19,7 +19,7 @@ import subprocess as sp # nosec
from datetime import datetime from datetime import datetime
from collections import Counter from collections import Counter
from .__init__ import PY2, WINDOWS, ANYWIN from .__init__ import PY2, WINDOWS, ANYWIN, VT100
from .stolen import surrogateescape from .stolen import surrogateescape
FAKE_MP = False FAKE_MP = False
@ -58,7 +58,7 @@ except:
return struct.unpack(f.decode("ascii"), *a, **ka) return struct.unpack(f.decode("ascii"), *a, **ka)
ansi_re = re.compile("\033\\[[^m]*m") ansi_re = re.compile("\033\\[[^mK]*[mK]")
surrogateescape.register_surrogateescape() surrogateescape.register_surrogateescape()
@ -207,17 +207,22 @@ class ProgressPrinter(threading.Thread):
def run(self): def run(self):
msg = None msg = None
fmt = " {}\033[K\r" if VT100 else " {} $\r"
while not self.end: while not self.end:
time.sleep(0.1) time.sleep(0.1)
if msg == self.msg or self.end: if msg == self.msg or self.end:
continue continue
msg = self.msg msg = self.msg
uprint(" {}\033[K\r".format(msg)) uprint(fmt.format(msg))
if PY2: if PY2:
sys.stdout.flush() sys.stdout.flush()
print("\033[K", end="") if VT100:
print("\033[K", end="")
elif msg:
print("------------------------")
sys.stdout.flush() # necessary on win10 even w/ stderr btw sys.stdout.flush() # necessary on win10 even w/ stderr btw