Cleaning up code
This commit is contained in:
1 parent
90c343d16b
commit
7636092c7d
10 files changed
+403
-423
No files matched your search
@@ -10,93 +10,94 @@ MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
|
||||
|
||||
KNOWN_DEVICES_FILE = "tomato_known_devices.csv"
|
||||
|
||||
class TomatoDeviceScanner:
|
||||
# self.logger
|
||||
class TomatoDeviceScanner(object):
|
||||
# self.logger
|
||||
|
||||
def __init__(self, config):
|
||||
self.config = config
|
||||
self.logger = logging.getLogger(__name__)
|
||||
self.lock = Lock()
|
||||
self.date_updated = None
|
||||
self.last_results = None
|
||||
def __init__(self, config):
|
||||
self.config = config
|
||||
self.logger = logging.getLogger(__name__)
|
||||
self.lock = Lock()
|
||||
self.date_updated = None
|
||||
self.last_results = None
|
||||
|
||||
# Read known devices
|
||||
if os.path.isfile(KNOWN_DEVICES_FILE):
|
||||
with open(KNOWN_DEVICES_FILE) as inp:
|
||||
known_devices = { row['mac']: row for row in csv.DictReader(inp) }
|
||||
# Read known devices
|
||||
if os.path.isfile(KNOWN_DEVICES_FILE):
|
||||
with open(KNOWN_DEVICES_FILE) as inp:
|
||||
known_devices = { row['mac']: row for row in csv.DictReader(inp) }
|
||||
|
||||
# Update known devices csv file for future use
|
||||
with open(KNOWN_DEVICES_FILE, 'a') as outp:
|
||||
writer = csv.writer(outp)
|
||||
# Update known devices csv file for future use
|
||||
with open(KNOWN_DEVICES_FILE, 'a') as outp:
|
||||
writer = csv.writer(outp)
|
||||
|
||||
# Query for new devices
|
||||
exec(self.tomato_request("devlist"))
|
||||
# Query for new devices
|
||||
exec(self.tomato_request("devlist"))
|
||||
|
||||
for name, _, mac, _ in dhcpd_lease:
|
||||
if mac not in known_devices:
|
||||
writer.writerow((mac, name, 0))
|
||||
for name, _, mac, _ in dhcpd_lease:
|
||||
if mac not in known_devices:
|
||||
writer.writerow((mac, name, 0))
|
||||
|
||||
# Create a dict with ID: NAME of the devices to track
|
||||
self.devices_to_track = dict()
|
||||
# Create a dict with ID: NAME of the devices to track
|
||||
self.devices_to_track = dict()
|
||||
|
||||
for mac in [mac for mac in known_devices if known_devices[mac]['track'] == '1']:
|
||||
self.devices_to_track[mac] = known_devices[mac]['name']
|
||||
|
||||
# Quicker way of the previous statement but it doesn't go together with exec:
|
||||
# unqualified exec is not allowed in function '__init__' it contains a nested function with free variables
|
||||
# self.devices_to_track = {mac: known_devices[mac]['name'] for mac in known_devices if known_devices[mac]['track'] == '1'}
|
||||
for mac in known_devices:
|
||||
if known_devices[mac]['track'] == '1':
|
||||
self.devices_to_track[mac] = known_devices[mac]['name']
|
||||
|
||||
# Quicker way of the previous statement but it doesn't go together with exec:
|
||||
# unqualified exec is not allowed in function '__init__' it contains a nested function with free variables
|
||||
# self.devices_to_track = {mac: known_devices[mac]['name'] for mac in known_devices if known_devices[mac]['track'] == '1'}
|
||||
|
||||
|
||||
def get_devices_to_track(self):
|
||||
return self.devices_to_track
|
||||
def get_devices_to_track(self):
|
||||
return self.devices_to_track
|
||||
|
||||
def scan_devices(self):
|
||||
self.lock.acquire()
|
||||
def scan_devices(self):
|
||||
self.lock.acquire()
|
||||
|
||||
# We don't want to hammer the router. Only update if MIN_TIME_BETWEEN_SCANS has passed
|
||||
if self.date_updated is None or datetime.now() - self.date_updated > MIN_TIME_BETWEEN_SCANS:
|
||||
self.logger.info("Scanning for new devices")
|
||||
# We don't want to hammer the router. Only update if MIN_TIME_BETWEEN_SCANS has passed
|
||||
if self.date_updated is None or datetime.now() - self.date_updated > MIN_TIME_BETWEEN_SCANS:
|
||||
self.logger.info("Scanning for new devices")
|
||||
|
||||
try:
|
||||
# Query for new devices
|
||||
exec(self.tomato_request("devlist"))
|
||||
try:
|
||||
# Query for new devices
|
||||
exec(self.tomato_request("devlist"))
|
||||
|
||||
self.last_results = [mac for iface, mac, rssi, tx, rx, quality, unknown_num in wldev]
|
||||
self.last_results = [mac for iface, mac, rssi, tx, rx, quality, unknown_num in wldev]
|
||||
|
||||
except:
|
||||
self.logger.exception("Scanning failed")
|
||||
except Exception:
|
||||
self.logger.exception("Scanning failed")
|
||||
|
||||
|
||||
self.lock.release()
|
||||
return self.last_results
|
||||
|
||||
def tomato_request(self, action):
|
||||
# Get router info
|
||||
r = requests.post('http://{}/update.cgi'.format(self.config.get('tomato','host')),
|
||||
data={'_http_id':self.config.get('tomato','http_id'), 'exec':action},
|
||||
auth=requests.auth.HTTPBasicAuth(self.config.get('tomato','username'), self.config.get('tomato','password')))
|
||||
self.lock.release()
|
||||
return self.last_results
|
||||
|
||||
return r.text
|
||||
def tomato_request(self, action):
|
||||
# Get router info
|
||||
req = requests.post('http://{}/update.cgi'.format(self.config.get('tomato','host')),
|
||||
data={'_http_id':self.config.get('tomato','http_id'), 'exec':action},
|
||||
auth=requests.auth.HTTPBasicAuth(self.config.get('tomato','username'), self.config.get('tomato','password')))
|
||||
|
||||
return req.text
|
||||
|
||||
|
||||
|
||||
"""
|
||||
for ip, mac, iface in arplist:
|
||||
pass
|
||||
pass
|
||||
|
||||
# print wlnoise
|
||||
|
||||
# print dhcpd_static
|
||||
|
||||
for iface, mac, rssi, tx, rx, quality, unknown_num in wldev:
|
||||
print mac, quality
|
||||
print mac, quality
|
||||
|
||||
print ""
|
||||
|
||||
for name, ip, mac, lease in dhcpd_lease:
|
||||
if name:
|
||||
print name, ip
|
||||
if name:
|
||||
print name, ip
|
||||
|
||||
else:
|
||||
print ip
|
||||
"""
|
||||
else:
|
||||
print ip
|
||||
"""
|
||||
Reference in new issue
Block a user