From cc19fb5b6eb81da7d60a230b28472b042fbc6a1d Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Fri, 4 Oct 2019 00:11:31 +0200
Subject: [PATCH] refactor
---
sdcard/rootfs/root/pwnagotchi/scripts/main.py | 13 +------------
.../root/pwnagotchi/scripts/pwnagotchi/agent.py | 10 ++++++++++
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/main.py b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
index ac5bacd..5ecb7ff 100755
--- a/sdcard/rootfs/root/pwnagotchi/scripts/main.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
@@ -3,8 +3,6 @@ import argparse
import time
import logging
-import yaml
-
import pwnagotchi
import pwnagotchi.utils as utils
import pwnagotchi.version as version
@@ -73,16 +71,7 @@ elif args.do_manual:
else:
logging.info("entering auto mode ...")
- agent.start_ai()
- agent.setup_events()
- agent.set_starting()
- agent.start_monitor_mode()
- agent.start_event_polling()
-
- # print initial stats
- agent.next_epoch()
-
- agent.set_ready()
+ agent.start()
while True:
try:
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/agent.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/agent.py
index 578e380..69c594e 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/agent.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/agent.py
@@ -138,6 +138,16 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
self.start_advertising()
+ def start(self):
+ self.start_ai()
+ self.setup_events()
+ self.set_starting()
+ self.start_monitor_mode()
+ self.start_event_polling()
+ # print initial stats
+ self.next_epoch()
+ self.set_ready()
+
def wait_for(self, t, sleeping=True):
plugins.on('sleep' if sleeping else 'wait', self, t)
self._view.wait(t, sleeping)