Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Put spaces between units in output from utils.to_pretty_time

Browse source
This commit is contained in:
jesopo 2019-03-21 17:59:42 +00:00
parent a8b0e95fb1
commit 0eaeca8f83
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/utils/__init__.py
View file

@ -79,25 +79,25 @@ def to_pretty_time(total_seconds: int, minimum_unit: int=UNIT_SECOND,
hours, minutes = divmod(minutes, 60) hours, minutes = divmod(minutes, 60)
days, hours = divmod(hours, 24) days, hours = divmod(hours, 24)
weeks, days = divmod(days, 7) weeks, days = divmod(days, 7)
out = "" out = []
units = 0 units = 0
if weeks and minimum_unit >= UNIT_WEEK and units < max_units: if weeks and minimum_unit >= UNIT_WEEK and units < max_units:
out += "%dw" % weeks out.append("%dw" % weeks)
units += 1 units += 1
if days and minimum_unit >= UNIT_DAY and units < max_units: if days and minimum_unit >= UNIT_DAY and units < max_units:
out += "%dd" % days out.append("%dd" % days)
units += 1 units += 1
if hours and minimum_unit >= UNIT_HOUR and units < max_units: if hours and minimum_unit >= UNIT_HOUR and units < max_units:
out += "%dh" % hours out.append("%dh" % hours)
units += 1 units += 1
if minutes and minimum_unit >= UNIT_MINUTE and units < max_units: if minutes and minimum_unit >= UNIT_MINUTE and units < max_units:
out += "%dm" % minutes out.append("%dm" % minutes)
units += 1 units += 1
if seconds and minimum_unit >= UNIT_SECOND and units < max_units: if seconds and minimum_unit >= UNIT_SECOND and units < max_units:
out += "%ds" % seconds out.append("%ds" % seconds)
units += 1 units += 1
return out return " ".join(out)
def parse_number(s: str) -> str: def parse_number(s: str) -> str:
try: try: