From 69597103b5607628197d8a373df375da82e0ed02 Mon Sep 17 00:00:00 2001 From: Ben Lebherz Date: Thu, 14 Nov 2019 15:57:43 +0100 Subject: [PATCH] use f-strings and double quotes in gps plugin --- pwnagotchi/plugins/default/gps.py | 42 ++++++++++++++++--------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/pwnagotchi/plugins/default/gps.py b/pwnagotchi/plugins/default/gps.py index 883e77c..6a6b9dd 100644 --- a/pwnagotchi/plugins/default/gps.py +++ b/pwnagotchi/plugins/default/gps.py @@ -9,41 +9,43 @@ from pwnagotchi.ui.view import BLACK class GPS(plugins.Plugin): - __author__ = 'evilsocket@gmail.com' - __version__ = '1.0.0' - __license__ = 'GPL3' - __description__ = 'Save GPS coordinates whenever an handshake is captured.' + __author__ = "evilsocket@gmail.com" + __version__ = "1.0.0" + __license__ = "GPL3" + __description__ = "Save GPS coordinates whenever an handshake is captured." def __init__(self): self.running = False self.coordinates = None def on_loaded(self): - logging.info("gps plugin loaded for %s" % self.options['device']) + logging.info(f"gps plugin loaded for {self.options['device']}") def on_ready(self, agent): - if os.path.exists(self.options['device']): - logging.info("enabling bettercap's gps module for %s" % self.options['device']) + if os.path.exists(self.options["device"]): + logging.info( + f"enabling bettercap's gps module for {self.options['device']}" + ) try: - agent.run('gps off') + agent.run("gps off") except Exception: pass - agent.run('set gps.device %s' % self.options['device']) - agent.run('set gps.baudrate %d' % self.options['speed']) - agent.run('gps on') + agent.run(f"set gps.device {self.options['device']}") + agent.run(f"set gps.baudrate {self.options['speed']}") + agent.run("gps on") self.running = True else: - logging.warning('no GPS detected') + logging.warning("no GPS detected") def on_handshake(self, agent, filename, access_point, client_station): if self.running: info = agent.session() - self.coordinates = info['gps'] - gps_filename = filename.replace('.pcap', '.gps.json') + self.coordinates = info["gps"] + gps_filename = filename.replace(".pcap", ".gps.json") - logging.info("saving GPS to %s (%s)" % (gps_filename, self.coordinates)) - with open(gps_filename, 'w+t') as fp: + logging.info(f"saving GPS to {gps_filename} ({self.coordinates})") + with open(gps_filename, "w+t") as fp: json.dump(self.coordinates, fp) def on_ui_setup(self, ui): @@ -98,10 +100,10 @@ class GPS(plugins.Plugin): ) def on_ui_update(self, ui): - if self.coordinates and all([ - # avoid 0.000... measurements - self.coordinates["Latitude"], self.coordinates["Longitude"] - ]): + # avoid 0.000... measurements + if self.coordinates and all( + [self.coordinates["Latitude"], self.coordinates["Longitude"]] + ): ui.set("latitude", f"{self.coordinates['Latitude']:.4f}") ui.set("longitude", f" {self.coordinates['Longitude']:.4f}") ui.set("altitude", f" {self.coordinates['Altitude']:.1f}m")