remove unused return_value parameter

This commit is contained in:
Martinez 2015-12-26 16:55:59 +01:00
parent e6930e3642
commit f8351e033d
2 changed files with 10 additions and 11 deletions

View file

@ -112,16 +112,15 @@ class Sysload:
class Settings: class Settings:
def __init__(self, argv): def __init__(self, argv):
try: try:
self.return_value = int(argv[1]) self.term_width = int(argv[1])
self.term_width = int(argv[2]) self.last_refresh_time = int(argv[2]) if argv[2] else None
self.last_refresh = int(argv[3]) if argv[3] else None self.load_warn = float(argv[3])
self.load_warn = float(argv[4]) self.load_error = float(argv[4])
self.load_error = float(argv[5]) self.space_warn = float(argv[5])
self.space_warn = float(argv[6]) self.space_error = float(argv[6])
self.space_error = float(argv[7])
self.is_root = os.geteuid() == 0 self.is_root = os.geteuid() == 0
except: except:
print("Usage: %s return_value $COLUMNS last_refresh load_warn load_error space_warn space_error") print("Usage: %s $COLUMNS last_refresh_time load_warn load_error space_warn space_error")
print(" e.g. %s 1 $COLUMNS 25 1.25 2.5 0.15 0.05") print(" e.g. %s 1 $COLUMNS 25 1.25 2.5 0.15 0.05")
print() print()
@ -404,8 +403,8 @@ class StatsPart(Part):
self.fragments.append(style_bold()) self.fragments.append(style_bold())
# delta # delta
if settings.last_refresh: if settings.last_refresh_time:
then = datetime.datetime.fromtimestamp(settings.last_refresh).replace(hour=0, minute=0, second=0, microsecond=0) then = datetime.datetime.fromtimestamp(settings.last_refresh_time).replace(hour=0, minute=0, second=0, microsecond=0)
now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
midnights = (now - then).days midnights = (now - then).days

View file

@ -21,7 +21,7 @@ function preexec {
function precmd { function precmd {
set_title "${PWD}" set_title "${PWD}"
python3 /usr/libexec/over-prompt.py $? "${COLUMNS}" "${OVER_PROMPT_LAST_REFRESH}" "${OVER_PROMPT_SYSLOAD_WARN:=1.25}" "${OVER_PROMPT_SYSLOAD_YELL:=2.5}" "${OVER_PROMPT_FREESPACE_WARN:=0.15}" "${OVER_PROMPT_FREESPACE_YELL:=0.05}" python3 /usr/libexec/over-prompt.py "${COLUMNS}" "${OVER_PROMPT_LAST_REFRESH}" "${OVER_PROMPT_SYSLOAD_WARN:=1.25}" "${OVER_PROMPT_SYSLOAD_YELL:=2.5}" "${OVER_PROMPT_FREESPACE_WARN:=0.15}" "${OVER_PROMPT_FREESPACE_YELL:=0.05}"
PS1="$(print "%(?.%{\e[1;36m%}.%{\e[1;31m%}%?%{\e[0m%}:%{\e[1;31m%})%(\!.#.$)%{\e[0m%} ")" PS1="$(print "%(?.%{\e[1;36m%}.%{\e[1;31m%}%?%{\e[0m%}:%{\e[1;31m%})%(\!.#.$)%{\e[0m%} ")"
OVER_PROMPT_LAST_REFRESH=$(date +%s) OVER_PROMPT_LAST_REFRESH=$(date +%s)
} }