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

implement output.mode and .shorten options

Browse Source
This commit is contained in:
Mike Fährmann 2015-12-02 18:47:42 +01:00
parent 8d257510d0
commit b2401542eb
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gallery_dl/output.py
View File

@ -10,13 +10,27 @@ import os
import sys import sys
import shutil import shutil
import platform import platform
from . import config
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(): pdict = {
return ColorPrinter() if ANSI else TerminalPrinter() "default": Printer,
"pipe": Printer,
"term": TerminalPrinter,
"terminal": TerminalPrinter,
"color": ColorPrinter,
}
omode = config.get(("output", "mode"), "auto").lower()
if omode in pdict:
return pdict[omode]()
elif omode == "auto":
if hasattr(sys.stdout, "isatty") and sys.stdout.isatty():
return ColorPrinter() if ANSI else TerminalPrinter()
else:
return Printer()
else: else:
return Printer() raise Exception("invalid output mode: " + omode)
def safeprint(txt, **kwargs): def safeprint(txt, **kwargs):
"""Handle unicode errors and replace invalid characters""" """Handle unicode errors and replace invalid characters"""
@ -50,7 +64,9 @@ class Printer():
class TerminalPrinter(Printer): class TerminalPrinter(Printer):
def __init__(self): def __init__(self):
self.width = shutil.get_terminal_size().columns - OFFSET self.short = config.get(("output", "shorten"), True)
if self.short:
self.width = shutil.get_terminal_size().columns - OFFSET
def start(self, path): def start(self, path):
safeprint(self.shorten(" " + path), end="", flush=True) safeprint(self.shorten(" " + path), end="", flush=True)
@ -72,7 +88,7 @@ class TerminalPrinter(Printer):
def shorten(self, txt): def shorten(self, txt):
"""Reduce the length of 'txt' to the width of the terminal""" """Reduce the length of 'txt' to the width of the terminal"""
if len(txt) > self.width: if self.short and len(txt) > self.width:
hwidth = self.width // 2 - OFFSET hwidth = self.width // 2 - OFFSET
return "".join((txt[:hwidth-1], CHAR_ELLIPSIES, txt[-hwidth-(self.width%2):])) return "".join((txt[:hwidth-1], CHAR_ELLIPSIES, txt[-hwidth-(self.width%2):]))
return txt return txt