d_mcknight/Varken
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

passed data folder to tautulli for helper functions. Fixes #46

Browse source
This commit is contained in:
Nicholas St. Germain 2018-12-09 22:56:09 -06:00
parent 693e25c7b6
commit 78ce399f33
4 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
varken/tautulli.py
View file

@ -8,7 +8,7 @@ from varken.structures import TautulliStream
class TautulliAPI(object):
def __init__(self, server, dbmanager):
def __init__(self, server, dbmanager, data_folder):
# Set Time of initialization
self.now = datetime.now(timezone.utc).astimezone().isoformat()
self.dbmanager = dbmanager
@ -17,6 +17,7 @@ class TautulliAPI(object):
self.session.params = {'apikey': self.server.api_key, 'cmd': 'get_activity'}
self.endpoint = '/api/v2'
self.logger = logging.getLogger()
self.data_folder = data_folder
def __repr__(self):
return "<tautulli-{}>".format(self.server.id)
@ -41,13 +42,13 @@ class TautulliAPI(object):
for session in sessions:
try:
geodata = geo_lookup(session.ip_address_public)
geodata = geo_lookup(session.ip_address_public, self.data_folder)
except (ValueError, AddressNotFoundError):
if self.server.fallback_ip:
geodata = geo_lookup(self.server.fallback_ip)
geodata = geo_lookup(self.server.fallback_ip, self.data_folder)
else:
my_ip = self.session.get('http://ip.42.pl/raw').text
geodata = geo_lookup(my_ip)
geodata = geo_lookup(my_ip, self.data_folder)
if not all([geodata.location.latitude, geodata.location.longitude]):
latitude = 37.234332396