scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new: if more than one peer are present, display their number (closes )

Browse Source
This commit is contained in:
Simone Margaritelli 2019-10-07 18:42:57 +02:00
parent 7f880698a4
commit 0577972867
3 changed files with 11 additions and 4 deletions
pwnagotchi
agent.py
ui
view.py
scripts
preview.py

3
pwnagotchi/agent.py

@ -296,7 +296,8 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
def _update_peers(self): def _update_peers(self):
peer = self._advertiser.closest_peer() peer = self._advertiser.closest_peer()
self._view.set_closest_peer(peer) tot = self._advertiser.num_peers()
self._view.set_closest_peer(peer, tot)
def _save_recovery_data(self): def _save_recovery_data(self):
logging.warning("writing recovery data to %s ..." % RECOVERY_DATA_FILE) logging.warning("writing recovery data to %s ..." % RECOVERY_DATA_FILE)

10
pwnagotchi/ui/view.py

@ -168,7 +168,7 @@ class View(object):
self.set('aps', "%d" % log.associated) self.set('aps', "%d" % log.associated)
self.set('shakes', '%d (%s)' % (log.handshakes, \ self.set('shakes', '%d (%s)' % (log.handshakes, \
utils.total_unique_handshakes(self._config['bettercap']['handshakes']))) utils.total_unique_handshakes(self._config['bettercap']['handshakes'])))
self.set_closest_peer(log.last_peer) self.set_closest_peer(log.last_peer, log.peers)
def is_normal(self): def is_normal(self):
return self._state.get('face') not in ( return self._state.get('face') not in (
@ -188,7 +188,7 @@ class View(object):
self.set('status', self._voice.on_normal()) self.set('status', self._voice.on_normal())
self.update() self.update()
def set_closest_peer(self, peer): def set_closest_peer(self, peer, num_total):
if peer is None: if peer is None:
self.set('friend_face', None) self.set('friend_face', None)
self.set('friend_name', None) self.set('friend_name', None)
@ -207,6 +207,12 @@ class View(object):
name += '│' * (4 - num_bars) name += '│' * (4 - num_bars)
name += ' %s %d (%d)' % (peer.name(), peer.pwnd_run(), peer.pwnd_total()) name += ' %s %d (%d)' % (peer.name(), peer.pwnd_run(), peer.pwnd_total())
if num_total > 1:
if num_total > 9000:
name += ' of over 9000'
else:
name += ' of %d' % num_total
self.set('friend_face', peer.face()) self.set('friend_face', peer.face())
self.set('friend_name', name) self.set('friend_name', name)
self.update() self.update()

2
scripts/preview.py

@ -122,7 +122,7 @@ def main():
for display in list_of_displays: for display in list_of_displays:
emotions = list() emotions = list()
if args.showpeer: if args.showpeer:
display.set_closest_peer(DummyPeer()) display.set_closest_peer(DummyPeer(), 10)
display.on_starting() display.on_starting()
display.update() display.update()
emotions.append(display.get_image()) emotions.append(display.get_image())