nortti
/
ethermess
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Compare commits

base: nortti:7636dd1b109083be08e868db12e10dc7350e4921
Branches Tags
nortti:master
nortti:v1.0
..
compare: nortti:79dec74dcf225e9a8978d1140b2ce61b62c6d45e
Branches Tags
nortti:master
nortti:v1.0

No commits in common. "7636dd1b109083be08e868db12e10dc7350e4921" and "79dec74dcf225e9a8978d1140b2ce61b62c6d45e" have entirely different histories.
7636dd1b10 ... 79dec74dcf

1 changed files with 10 additions and 18 deletions
Show Stats Expand all files Collapse all files

28
ethermess.py
View File

@ -123,9 +123,6 @@ def format_status(status):
else:
raise ValueError('Unknown status %i' % status)
def timestamp():
return time.strftime('%H:%M:%S')
class NonCharacterError(Exception): pass
class ControlCharacterError(Exception): pass
@ -233,13 +230,13 @@ def handle_user_command(backend, line):
if rest != '':
mac = mac_from_name(rest)
if mac in peers:
print('%s === ~%s (%s) [%s]' % (timestamp(), peers[mac].nick, peers[mac].status.name, format_mac(mac)))
print('=== ~%s (%s) [%s]' % (peers[mac].nick, peers[mac].status.name, format_mac(mac)))
send_status_request(backend, mac)
else:
# List all the known peers
for mac, peer in peers.items():
print('%s === ~%s (%s) [%s]' % (timestamp(), peer.nick, peer.status.name, format_mac(mac)))
print('=== ~%s (%s) [%s]' % (peer.nick, peer.status.name, format_mac(mac)))
elif command == '/available' and rest == '':
# Set status to available
@ -304,20 +301,20 @@ def handle_status(mac, status, nick):
if peers[mac].nick is not None and peers[mac].status != statuses.offline and nick != peers[mac].nick:
print('%s === ~%s -> ~%s [%s]' % (timestamp(), peers[mac].nick, nick, format_mac(mac)))
print('=== ~%s -> ~%s [%s]' % (peers[mac].nick, nick, format_mac(mac)))
peers[mac].nick = nick
if status != peers[mac].status:
if status == statuses.offline:
print('%s <<< ~%s [%s]' % (timestamp(), nick, format_mac(mac)))
print('<<< ~%s [%s]' % (nick, format_mac(mac)))
elif peers[mac].status is None or peers[mac].status == statuses.offline:
if status == statuses.available:
print('%s >>> ~%s [%s]' % (timestamp(), nick, format_mac(mac)))
print('>>> ~%s [%s]' % (nick, format_mac(mac)))
else:
print('%s >>> ~%s (%s) [%s]' % (timestamp(), nick, status.name, format_mac(mac)))
print('>>> ~%s (%s) [%s]' % (nick, status.name, format_mac(mac)))
else:
print('%s === ~%s (%s) [%s]' % (timestamp(), nick, status.name, format_mac(mac)))
print('=== ~%s (%s) [%s]' % (nick, status.name, format_mac(mac)))
peers[mac].status = status
@ -349,13 +346,8 @@ def nick_from_mac(mac):
def handle_message(mac, message):
nick = nick_from_mac(mac)
ts = timestamp()
if mac == default_target_mac:
for line in message.split('\n'):
print('%s <*%s> %s' % (ts, nick, line))
else:
for line in message.split('\n'):
print('%s < %s> %s' % (ts, nick, line))
for line in message.split('\n'):
print('<%s> %s' % (nick, line))
def eventloop(proc):
global peers
@ -380,7 +372,7 @@ def eventloop(proc):
for mac, peer in peers.items():
if peer.lastseen + offline_timeout < now:
peer.status = statuses.offline
print('%s <<< (timeout) ~%s [%s]' % (timestamp(), peer.nick, format_mac(mac)))
print('<<< (timeout) ~%s [%s]' % (peer.nick, format_mac(mac)))
# Figure out how long to wait in poll()
wait = None