diff options
author | Mattias Andrée <maandree@operamail.com> | 2014-02-28 21:21:54 +0100 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2014-02-28 21:21:54 +0100 |
commit | 015bdb9e386ac2b0cef9a280f00cd81990e2b732 (patch) | |
tree | 15eddb9eea071d2952c691318b0213575d217592 | |
parent | m (diff) | |
download | xpybar-015bdb9e386ac2b0cef9a280f00cd81990e2b732.tar.gz xpybar-015bdb9e386ac2b0cef9a280f00cd81990e2b732.tar.bz2 xpybar-015bdb9e386ac2b0cef9a280f00cd81990e2b732.tar.xz |
add users
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r-- | examples/plugin-test | 17 | ||||
-rw-r--r-- | src/plugins/users.py | 42 | ||||
-rw-r--r-- | src/util.py | 2 |
3 files changed, 58 insertions, 3 deletions
diff --git a/examples/plugin-test b/examples/plugin-test index 301c99c..ba4d823 100644 --- a/examples/plugin-test +++ b/examples/plugin-test @@ -2,9 +2,11 @@ # A simple xpybar configuration example that tests the plugins +import os from plugins.uptime import Uptime from plugins.loadavg import AverageLoad +from plugins.users import Users OUTPUT, HEIGHT, YPOS, TOP = 0, 24, 24, True @@ -26,7 +28,18 @@ def redraw(): tot_tasks = loadavg_.total_tasks last_pid = loadavg_.last_pid - text = 'Uptime: %s │ Idle time: %s %s │ Average load: %2i%% %2i%% %2i%% %i/%i %i' - text %= (uptime, tot_idle, avg_idle, avg_5, avg_10, avg_15, act_tasks, tot_tasks, last_pid) + users_ = Users().users + you = os.environ['USER'] + def colour_user(user): + if user == 'root': + return '\033[31m%s\033[39m' + elif not user == you: + return '\033[33m%s\033[39m' + else: + return '%s' + users = ' '.join(['%s{%i}' % (colour_user(u) % u, len(users_[u])) for u in users_.keys()]) + + text = 'Uptime: %s │ Idle time: %s %s │ Average load: %2i%% %2i%% %2i%% %i/%i %i │ Users: %s' + text %= (uptime, tot_idle, avg_idle, avg_5, avg_10, avg_15, act_tasks, tot_tasks, last_pid, users) bar.draw_coloured_text(0, 10, 0, 2, text) diff --git a/src/plugins/users.py b/src/plugins/users.py new file mode 100644 index 0000000..a73939e --- /dev/null +++ b/src/plugins/users.py @@ -0,0 +1,42 @@ +# -*- python -*- +''' +xpybar – xmobar replacement written in python +Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +''' + +from util import * + + +class Users: + ''' + Gets the logged in users and what TTY:s they are using + + @variable users:dict<str, list<str>> Map from logged in users to acquired TTY:s + ''' + + + def __init__(self): + ''' + Constructor + ''' + users = spawn('w').read().decode('utf-8', 'replace').split('\n')[2 : -1] + users = [list(filter(lambda cell : not cell == '', line.split(' ')))[:2] for line in users] + self.users = {} + for (user, tty) in users: + if user not in self.users: + self.users[user] = [] + self.users[user].append(tty) + diff --git a/src/util.py b/src/util.py index d12d3b2..25aac1f 100644 --- a/src/util.py +++ b/src/util.py @@ -55,6 +55,6 @@ def spawn(*command): @param command:*str The command line @return :istream The process's stdout ''' - proc = process.Popen(list(command), stderr = sys.stderr, stdout = PIPE) + proc = subprocess.Popen(list(command), stderr = sys.stderr, stdout = subprocess.PIPE) return proc.stdout |