From a81ece7c0debdcea680a8ffc134234585c789b53 Mon Sep 17 00:00:00 2001 From: neersighted Date: Fri, 30 Mar 2012 07:51:59 -0700 Subject: [PATCH] tweaks to system.py --- plugins/system.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/system.py b/plugins/system.py index d83abf5..5535850 100755 --- a/plugins/system.py +++ b/plugins/system.py @@ -4,18 +4,26 @@ import platform from util import hook +def replace(text, wordDic): + rc = re.compile('|'.join(map(re.escape, wordDic))) + + def translate(match): + return wordDic[match.group(0)] + return rc.sub(translate, text) + @hook.command("memory", autohelp=False) @hook.command(autohelp=False) def mem(inp): ".mem -- Display the bot's current memory usage." - if os.name == 'posix': status_file = open("/proc/%d/status" % os.getpid()).read() line_pairs = re.findall(r"^(\w+):\s*(.*)\s*$", status_file, re.M) status = dict(line_pairs) - keys = 'VmSize VmRSS VmStk'.split() - return '\x02, '.join(key + ': \x02' + status[key] for key in keys) - + checked_stats = 'VmRSS VmSize VmPeak VmStk'.split() + stats = '\x02, '.join(key + ': \x02' + status[key] for key in checked_stats) + pretty_names = {'VmRSS': 'Real Memory', 'VmSize': 'Allocated Memory', 'VmPeak': 'Peak Allocated Memory', 'VmStk': 'Stack Size'} + stats = replace(stats, pretty_names) + return stats elif os.name == 'nt': cmd = "tasklist /FI \"PID eq %s\" /FO CSV /NH" % os.getpid() out = os.popen(cmd).read()