[welcome] format with black

This commit is contained in:
Dmytro Meleshko 2018-08-08 21:16:26 +03:00
parent 5698aa29a0
commit 3b2f56fa65

View file

@ -11,11 +11,11 @@ COLORS = [ansi.code_to_chars(30 + color_index) for color_index in range(0, 8)]
def colored(string, *colors):
return ''.join(colors + (string, Style.RESET_ALL))
return "".join(colors + (string, Style.RESET_ALL))
def bright_colored(string, *colors):
return ''.join(colors + (Style.BRIGHT, string, Style.RESET_ALL))
return "".join(colors + (Style.BRIGHT, string, Style.RESET_ALL))
def format_timedelta(timedelta):
@ -26,22 +26,22 @@ def format_timedelta(timedelta):
hh, mm = divmod(mm, 60)
def plural(n):
return n, 's' if abs(n) != 1 else ''
return n, "s" if abs(n) != 1 else ""
if days > 0:
result.append('%d day%s' % plural(days))
result.append("%d day%s" % plural(days))
if hh > 0 or result:
result.append('%d hour%s' % plural(hh))
result.append("%d hour%s" % plural(hh))
if mm > 0 or result:
result.append('%d min%s' % plural(mm))
result.append("%d min%s" % plural(mm))
if len(result) <= 1:
result.append('%d sec%s' % plural(ss))
result.append("%d sec%s" % plural(ss))
return ', '.join(result)
return ", ".join(result)
def humanize_bytes(bytes):
units = ['B', 'kB', 'MB', 'GB']
units = ["B", "kB", "MB", "GB"]
factor = 1
for unit in units:
@ -50,7 +50,7 @@ def humanize_bytes(bytes):
break
factor = next_factor
return '%.2f %s' % (float(bytes) / factor, unit)
return "%.2f %s" % (float(bytes) / factor, unit)
def colorize_percent(percent, warning, critical, inverse=False):
@ -60,7 +60,7 @@ def colorize_percent(percent, warning, critical, inverse=False):
if inverse:
color_index = 2 - color_index
return colored('%.2f%%' % percent, COLORS[color_index])
return colored("%.2f%%" % percent, COLORS[color_index])
def get_hostname():
@ -94,16 +94,16 @@ def users():
colored(term, Style.BRIGHT, Fore.BLACK) for term in terminals
]
terminals_str = ', '.join(colored_terminals)
terminals_str = ", ".join(colored_terminals)
if len(colored_terminals) > 1:
terminals_str = '(%s)' % terminals_str
result.append(colored_name + '@' + terminals_str)
terminals_str = "(%s)" % terminals_str
result.append(colored_name + "@" + terminals_str)
return ', '.join(result)
return ", ".join(result)
def shell():
return os.environ['SHELL']
return os.environ["SHELL"]
def cpu_usage():
@ -114,27 +114,35 @@ def cpu_usage():
def memory():
memory = psutil.virtual_memory()
return (humanize_bytes(memory.used), humanize_bytes(memory.total),
colorize_percent(memory.percent, warning=60, critical=80))
return (
humanize_bytes(memory.used),
humanize_bytes(memory.total),
colorize_percent(memory.percent, warning=60, critical=80),
)
def disks():
result = []
for disk in psutil.disk_partitions(all=False):
if psutil.WINDOWS and ('cdrom' in disk.opts or disk.fstype == ''):
if psutil.WINDOWS and ("cdrom" in disk.opts or disk.fstype == ""):
# skip cd-rom drives with no disk in it on Windows; they may raise ENOENT,
# pop-up a Windows GUI error for a non-ready partition or just hang
continue
usage = psutil.disk_usage(disk.mountpoint)
result.append((disk.mountpoint, humanize_bytes(usage.used),
result.append(
(
disk.mountpoint,
humanize_bytes(usage.used),
humanize_bytes(usage.total),
colorize_percent(usage.percent, warning=70, critical=85)))
colorize_percent(usage.percent, warning=70, critical=85),
)
)
return result
def battery():
if not hasattr(psutil, 'sensors_battery'):
if not hasattr(psutil, "sensors_battery"):
return None
try:
@ -149,41 +157,43 @@ def battery():
percent = battery.percent
if battery.power_plugged:
status = 'charging' if percent < 100 else 'fully charged'
status = "charging" if percent < 100 else "fully charged"
else:
status = '%s left' % format_timedelta(timedelta(seconds=battery.secsleft))
status = "%s left" % format_timedelta(timedelta(seconds=battery.secsleft))
return colorize_percent(
percent, critical=10, warning=20, inverse=True), status
return colorize_percent(percent, critical=10, warning=20, inverse=True), status
def is_android():
return os.path.isdir('/system/app') and os.path.isdir('/system/priv-app')
return os.path.isdir("/system/app") and os.path.isdir("/system/priv-app")
def get_distro_info():
if psutil.WINDOWS:
return 'windows', platform.system(), platform.release(), ''
return "windows", platform.system(), platform.release(), ""
elif psutil.OSX:
from plistlib import readPlist
sw_vers = readPlist('/System/Library/CoreServices/SystemVersion.plist')
return 'mac', sw_vers['ProductName'], sw_vers['ProductVersion'], ''
sw_vers = readPlist("/System/Library/CoreServices/SystemVersion.plist")
return "mac", sw_vers["ProductName"], sw_vers["ProductVersion"], ""
elif is_android():
from subprocess import check_output
android_version = check_output(['getprop', 'ro.build.version.release'])
return 'android', 'Android', android_version.decode().strip(), ''
android_version = check_output(["getprop", "ro.build.version.release"])
return "android", "Android", android_version.decode().strip(), ""
elif psutil.LINUX:
import distro
return distro.id(), distro.name(), distro.version(), distro.codename()
else:
raise NotImplementedError('unsupported OS')
raise NotImplementedError("unsupported OS")
def get_system_info():
info_lines = []
def info(name, value, *format_args):
line = colored(name + ':', Style.BRIGHT, Fore.YELLOW) + ' ' + value
line = colored(name + ":", Style.BRIGHT, Fore.YELLOW) + " " + value
if format_args:
line = line % format_args
info_lines.append(line)
@ -192,52 +202,52 @@ def get_system_info():
hostname, local_ip = get_hostname()
info_lines.append(
bright_colored(username, Fore.BLUE) + '@' +
bright_colored(hostname, Fore.RED))
info_lines.append('')
bright_colored(username, Fore.BLUE) + "@" + bright_colored(hostname, Fore.RED)
)
info_lines.append("")
distro_id, distro_name, distro_version, distro_codename = get_distro_info()
info('OS', ' '.join([distro_name, distro_version, distro_codename]))
info("OS", " ".join([distro_name, distro_version, distro_codename]))
logo_path = os.path.join(os.path.dirname(__file__), 'logos', distro_id)
logo_path = os.path.join(os.path.dirname(__file__), "logos", distro_id)
with open(logo_path) as logo_file:
logo_lines = logo_file.read().splitlines()
info('Kernel', '%s %s', platform.system(), platform.release())
info("Kernel", "%s %s", platform.system(), platform.release())
info('Uptime', format_timedelta(uptime()))
info("Uptime", format_timedelta(uptime()))
users_info = users()
if users_info:
info('Users', users_info)
info("Users", users_info)
info('Shell', shell())
info("Shell", shell())
info('IP address', local_ip)
info("IP address", local_ip)
info_lines.append('')
info_lines.append("")
info('CPU Usage', '%s', cpu_usage())
info('Memory', '%s / %s (%s)', *memory())
info("CPU Usage", "%s", cpu_usage())
info("Memory", "%s / %s (%s)", *memory())
for disk_info in disks():
info('Disk (%s)', '%s / %s (%s)', *disk_info)
info("Disk (%s)", "%s / %s (%s)", *disk_info)
battery_info = battery()
if battery_info is not None:
info('Battery', '%s (%s)', *battery_info)
info("Battery", "%s (%s)", *battery_info)
return logo_lines, info_lines
print('')
print("")
logo_lines, info_lines = get_system_info()
logo_line_widths = [len(re.sub(r'{\d}', '', line)) for line in logo_lines]
logo_line_widths = [len(re.sub(r"{\d}", "", line)) for line in logo_lines]
logo_width = max(logo_line_widths)
for line_index in range(0, max(len(logo_lines), len(info_lines))):
line = ''
line = ""
logo_line_width = 0
@ -249,7 +259,7 @@ for line_index in range(0, max(len(logo_lines), len(info_lines))):
line += logo_line.format(*COLORS)
line += Style.RESET_ALL
line += ' ' * (logo_width - logo_line_width + 3)
line += " " * (logo_width - logo_line_width + 3)
if line_index < len(info_lines):
info_line = info_lines[line_index]
@ -257,4 +267,5 @@ for line_index in range(0, max(len(logo_lines), len(info_lines))):
print(line)
print('')
print("")