Skip to content

Pihole.py fix for v0.6 #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jvteleco wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Pihole.py fix for v0.6 #183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions dashmachine/platform/pihole.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ def __init__(self, ip_address):
self.pw = None

def refresh(self):
rawdata = requests.get(
"http://" + self.ip_address + "/admin/api.php?summary"
).json()
if self.ip_address != None:
rawdata = requests.get("http://" + self.ip_address + "/admin/api.php?summary").json()

if self.auth_data != None:
topdevicedata = requests.get(
Expand All @@ -56,19 +55,20 @@ def refresh(self):
+ self.auth_data.token
).json()["querytypes"]

# Data that is returned is now parsed into vars
self.status = rawdata["status"]
self.domain_count = rawdata["domains_being_blocked"]
self.queries = rawdata["dns_queries_today"]
self.blocked = rawdata["ads_blocked_today"]
self.ads_percentage = rawdata["ads_percentage_today"]
self.unique_domains = rawdata["unique_domains"]
self.forwarded = rawdata["queries_forwarded"]
self.cached = rawdata["queries_cached"]
self.total_clients = rawdata["clients_ever_seen"]
self.unique_clients = rawdata["unique_clients"]
self.total_queries = rawdata["dns_queries_all_types"]
self.gravity_last_updated = rawdata["gravity_last_updated"]
if self.ip_address != None:
# Data that is returned is now parsed into vars
self.status = rawdata["status"]
self.domain_count = rawdata["domains_being_blocked"]
self.queries = rawdata["dns_queries_today"]
self.blocked = rawdata["ads_blocked_today"]
self.ads_percentage = rawdata["ads_percentage_today"]
self.unique_domains = rawdata["unique_domains"]
self.forwarded = rawdata["queries_forwarded"]
self.cached = rawdata["queries_cached"]
self.total_clients = rawdata["clients_ever_seen"]
self.unique_clients = rawdata["unique_clients"]
self.total_queries = rawdata["dns_queries_all_types"]
self.gravity_last_updated = rawdata["gravity_last_updated"]

def refreshTop(self, count):
if self.auth_data == None:
Expand Down Expand Up @@ -265,7 +265,15 @@ def __init__(self, *args, **kwargs):
for key, value in kwargs.items():
self.__dict__[key] = value

# self.pihole = PiHole(self.host)

#set defaults
if not hasattr(self, "host"):
self.host = None
if not hasattr(self, "password"):
self.password = "password123"


self.pihole = PiHole(self.host)

def process(self):
self.pihole.refresh()
Expand Down