chrissewell/pwnagotchi
1
0
Fork 0
mirror of https://github.com/jayofelony/pwnagotchi.git synced 2025-07-01 18:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc: small fix or general refactoring i did not bother commenting

Browse Source
This commit is contained in:
Simone Margaritelli
2019-10-23 19:41:14 +02:00
parent 885fddfce8
commit d16180189e
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pwnagotchi/mesh/peer.py
View File

@ -53,20 +53,20 @@ class Peer(object):
def first_encounter(self): def first_encounter(self):
return self.encounters == 1 return self.encounters == 1
def days_since_first_met(self):
return (datetime.datetime.now() - self.first_met).days
def face(self): def face(self):
return self.adv.get('face', faces.FRIEND) return self.adv.get('face', faces.FRIEND)
def name(self): def name(self):
return self.adv.get('name') return self.adv.get('name', '???')
def identity(self): def identity(self):
return self.adv.get('identity') return self.adv.get('identity', '???')
def full_name(self):
return "%s@%s" % (self.name(), self.identity())
def version(self): def version(self):
return self.adv.get('version') return self.adv.get('version', '1.0.0a')
def pwnd_run(self): def pwnd_run(self):
return int(self.adv.get('pwnd_run', 0)) return int(self.adv.get('pwnd_run', 0))

4
pwnagotchi/mesh/utils.py
View File

@ -57,10 +57,12 @@ class AsyncAdvertiser(object):
return sum(peer.encounters for _, peer in self._peers.items()) return sum(peer.encounters for _, peer in self._peers.items())
def _on_new_peer(self, peer): def _on_new_peer(self, peer):
logging.info("new peer %s detected (%d encounters)" % (peer.full_name(), peer.encounters))
self._view.on_new_peer(peer) self._view.on_new_peer(peer)
plugins.on('peer_detected', self, peer) plugins.on('peer_detected', self, peer)
def _on_lost_peer(self, peer): def _on_lost_peer(self, peer):
logging.info("lost peer %s" % peer.full_name())
self._view.on_lost_peer(peer) self._view.on_lost_peer(peer)
plugins.on('peer_lost', self, peer) plugins.on('peer_lost', self, peer)
@ -102,4 +104,4 @@ class AsyncAdvertiser(object):
logging.warning("error while polling pwngrid-peer: %s" % e) logging.warning("error while polling pwngrid-peer: %s" % e)
logging.debug(e, exc_info=True) logging.debug(e, exc_info=True)
time.sleep(1) time.sleep(3)