github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workarounds for windows console

Browse Source
This commit is contained in:
Mike Fährmann
2015-12-01 23:54:57 +01:00
parent 4b377ccc09
commit d26eec8470
1 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
gallery_dl/output.py
View File

@@ -14,10 +14,7 @@ import platform
def select(): def select():
"""Automatically select a suitable printer class""" """Automatically select a suitable printer class"""
if hasattr(sys.stdout, "isatty") and sys.stdout.isatty(): if hasattr(sys.stdout, "isatty") and sys.stdout.isatty():
if _color_supported(): return ColorPrinter if ANSI else TerminalPrinter
return ColorPrinter
else:
return TerminalPrinter
else: else:
return Printer return Printer
@@ -32,7 +29,7 @@ class Printer():
@staticmethod @staticmethod
def skip(path): def skip(path):
"""Print a message indicating that a download has been skipped""" """Print a message indicating that a download has been skipped"""
print("#", path, sep="", flush=True) print(CHAR_SKIP, path, sep="", flush=True)
@staticmethod @staticmethod
def success(path, tries): def success(path, tries):
@@ -50,26 +47,28 @@ class TerminalPrinter():
@staticmethod @staticmethod
def start(path): def start(path):
"""Print a message indicating the start of a download""" """Print a message indicating the start of a download"""
print(_shorten(" "+path), end="", flush=True) _safeprint(_shorten(" " + path), end="", flush=True)
@staticmethod @staticmethod
def skip(path): def skip(path):
"""Print a message indicating that a download has been skipped""" """Print a message indicating that a download has been skipped"""
print(_shorten("#"+path)) _safeprint(_shorten(CHAR_SKIP + path))
@staticmethod @staticmethod
def success(path, tries): def success(path, tries):
"""Print a message indicating the completion of a download""" """Print a message indicating the completion of a download"""
if tries == 0: print("\r", end="")
print("\r", end="") _safeprint(_shorten(CHAR_SUCCESS + path))
print("\r", _shorten("✔" + path), sep="")
@staticmethod @staticmethod
def error(file, error, tries, max_tries): def error(file, error, tries, max_tries):
"""Print a message indicating an error during download""" """Print a message indicating an error during download"""
if tries <= 1 and hasattr(file, "name"): if tries <= 1 and hasattr(file, "name"):
print("\r", _shorten("❌" + file.name), sep="") print("\r", end="")
print("[Error] ", error, " (", tries, "/", max_tries, ")", sep="") _safeprint(_shorten(CHAR_ERROR + file.name))
print("[Error] ", end="")
_safeprint(error, end="")
print(" (", tries, "/", max_tries, ")", sep="")
class ColorPrinter(): class ColorPrinter():
@@ -101,14 +100,32 @@ class ColorPrinter():
def _shorten(txt): def _shorten(txt):
"""Reduce the length of 'txt' to the width of the terminal""" """Reduce the length of 'txt' to the width of the terminal"""
width = shutil.get_terminal_size().columns width = shutil.get_terminal_size().columns - OFFSET
if len(txt) > width: if len(txt) > width:
hwidth = width // 2 hwidth = width // 2 - OFFSET
return "".join((txt[:hwidth-1], "…", txt[-hwidth-(width%2):])) return "".join((txt[:hwidth-1], CHAR_ELLIPSIES, txt[-hwidth-(width%2):]))
return txt return txt
def _color_supported(): def _safeprint(txt, **kwargs):
"""Return True if a terminal supports colors""" """Handle unicode errors and replace invalid characters"""
if platform.system() == "Windows": try:
return os.environ.get("TERM") == "ANSI" print(txt, **kwargs)
return True except UnicodeEncodeError:
enc = sys.stdout.encoding
txt = txt.encode(enc, errors="replace").decode(enc)
print(txt, **kwargs)
if platform.system() == "Windows":
ANSI = os.environ.get("TERM") == "ANSI"
OFFSET = 1
CHAR_SKIP = "#"
CHAR_ERROR = "!"
CHAR_SUCCESS = "*"
CHAR_ELLIPSIES = "..."
else:
ANSI = True
OFFSET = 0
CHAR_SKIP = "#"
CHAR_ERROR = "❌"
CHAR_SUCCESS = "✔"
CHAR_ELLIPSIES = "…"