fixed username truncation properly
This commit is contained in:
parent
24595a69c6
commit
7803adbd08
|
@ -3,6 +3,10 @@
|
|||
# Lists currently connected users for https://tilde.institute/stats
|
||||
# gbmor <ben@gbmor.dev>
|
||||
|
||||
# 'ps' truncates usernames at 8 characters (called by 'showwhoison' to find mosh users)
|
||||
# so I'm matching the potentially-partial username to a home directory to retrieve
|
||||
# the full username.
|
||||
|
||||
from sys import exit
|
||||
import subprocess
|
||||
|
||||
|
@ -13,20 +17,19 @@ def checkconns():
|
|||
print("Can't access connected user table. Who are you?")
|
||||
exit(0)
|
||||
|
||||
connusers = list(set(subprocess.check_output("/usr/local/bin/showwhoison | sed -n '1!p'; exit 0", stderr=subprocess.STDOUT,shell=True).decode().split("\n")))
|
||||
connusers = sorted(list(subprocess.check_output("/usr/local/bin/showwhoison | sed -n '1!p'; exit 0", stderr=subprocess.STDOUT,shell=True).decode().split("\n")))
|
||||
conntable.write("<ul>\n")
|
||||
|
||||
lastusers = list(subprocess.check_output("/bin/ls /home", stderr=subprocess.STDOUT,shell=True).decode().split("\n"))
|
||||
|
||||
seen = set()
|
||||
for conns in connusers:
|
||||
split = conns.split(' ')
|
||||
for conn in split:
|
||||
if conn != "" and conn != " " and conn != "root" and conn not in seen:
|
||||
# this needs to be fixed. truncates long usernames
|
||||
# resulting in broken links to their pages. thanks, ps(1)
|
||||
if conn == "sarmonsi":
|
||||
conn = "sarmonsiill"
|
||||
seen.add(conn)
|
||||
conntable.write("<li><a href=\"https://"+ conn +".tilde.institute\">"+ conn +"</a></li>\n")
|
||||
match = ''.join([s for s in lastusers if conn in s])
|
||||
conntable.write("<li><a href=\"https://"+ match +".tilde.institute\">"+ match +"</a></li>\n")
|
||||
|
||||
|
||||
conntable.write("</ul>\n")
|
||||
|
|
Loading…
Reference in New Issue