IAB search fixes. New logo.

This commit is contained in:
Aitzol Berasategi 2018-10-08 17:07:15 +02:00
parent 2dde44206d
commit f19176988b
1 changed files with 19 additions and 4 deletions

23
app.py
View File

@ -198,13 +198,28 @@ class AppWindow(Gtk.ApplicationWindow):
self.result = row
else:
if self.mode == "MAC":
self.search = self.search[:8]
self.dbCursor.execute("SELECT * FROM data WHERE mac=?", (self.search.upper(),))
self.mac48 = self.search[:8] # mac address first 3 octets
self.dbCursor.execute("SELECT * FROM data WHERE mac=?", (self.mac48.upper(),))
self.rows = self.dbCursor.fetchall()
if self.rows:
for row in self.rows:
print(row)
self.result = row
if row[1] == "IEEE Registration Authority":
self.iab_base = self.mac48+":00:00:00"
self.dbCursor.execute("SELECT * FROM data WHERE mac<=? AND mac>=? ORDER BY mac DESC LIMIT 1", (self.search.upper(), self.iab_base.upper()))
self.rows = self.dbCursor.fetchall()
if self.rows:
for row in self.rows:
print(row)
self.result = (self.search.upper(), row[1])
else:
self.result = (self.search.upper(), 'Sorry, No results found!')
print(self.result)
else:
self.result = (self.search.upper(), row[1])
else:
self.result = (self.search.upper(), 'Sorry, No results found!')
print(self.result)