since init uses only one server, moved headers/params to init

Varken/dbmanager.py

@@ -1,5 +1,6 @@
 from influxdb import InfluxDBClient
 
+
 class DBManager(object):
     def __init__(self, server):
         self.server = server

Varken/ombi.py

@@ -4,6 +4,7 @@ from datetime import datetime, timezone
 from Varken.helpers import OmbiRequestCounts
 from Varken.logger import logging
 
+
 class OmbiAPI(object):
     def __init__(self, server, dbmanager):
         self.now = datetime.now(timezone.utc).astimezone().isoformat()

Varken/radarr.py

@@ -12,16 +12,16 @@ class RadarrAPI(object):
         self.server = server
         # Create session to reduce server web thread load, and globally define pageSize for all requests
         self.session = Session()
+        self.session.headers = {'X-Api-Key': self.server.api_key}
 
     @logging
     def get_missing(self):
         endpoint = '/api/movie'
         self.now = datetime.now(timezone.utc).astimezone().isoformat()
         influx_payload = []
-
         missing = []
-        headers = {'X-Api-Key': self.server.api_key}
+
-        get = self.session.get(self.server.url + endpoint, headers=headers, verify=self.server.verify_ssl).json()
+        get = self.session.get(self.server.url + endpoint, verify=self.server.verify_ssl).json()
         movies = [Movie(**movie) for movie in get]
 
         for movie in movies:
@@ -59,10 +59,8 @@ class RadarrAPI(object):
         endpoint = '/api/queue'
         self.now = datetime.now(timezone.utc).astimezone().isoformat()
         influx_payload = []
-
         queue = []
-        headers = {'X-Api-Key': self.server.api_key}
+        get = self.session.get(self.server.url + endpoint, verify=self.server.verify_ssl).json()
-        get = self.session.get(self.server.url + endpoint, headers=headers, verify=self.server.verify_ssl).json()
         for movie in get:
             movie['movie'] = Movie(**movie['movie'])
         download_queue = [Queue(**movie) for movie in get]

Varken/sonarr.py

@@ -14,6 +14,7 @@ class SonarrAPI(object):
         self.server = server
         # Create session to reduce server web thread load, and globally define pageSize for all requests
         self.session = Session()
+        self.session.headers = {'X-Api-Key': self.server.api_key}
         self.session.params = {'pageSize': 1000}
 
     @logging
@@ -24,10 +25,8 @@ class SonarrAPI(object):
         params = {'start': last_days, 'end': self.today}
         influx_payload = []
         missing = []
-        headers = {'X-Api-Key': self.server.api_key}
 
-        get = self.session.get(self.server.url + endpoint, params=params, headers=headers,
+        get = self.session.get(self.server.url + endpoint, params=params, verify=self.server.verify_ssl).json()
-                               verify=self.server.verify_ssl).json()
         # Iteratively create a list of TVShow Objects from response json
         tv_shows = [TVShow(**show) for show in get]
 
@@ -68,11 +67,9 @@ class SonarrAPI(object):
         future = str(date.today() + timedelta(days=self.server.future_days))
         influx_payload = []
         air_days = []
-        headers = {'X-Api-Key': self.server.api_key}
         params = {'start': self.today, 'end': future}
 
-        get = self.session.get(self.server.url + endpoint, params=params, headers=headers,
+        get = self.session.get(self.server.url + endpoint, params=params, verify=self.server.verify_ssl).json()
-                               verify=self.server.verify_ssl).json()
         tv_shows = [TVShow(**show) for show in get]
 
         for show in tv_shows:
@@ -113,9 +110,8 @@ class SonarrAPI(object):
         endpoint = '/api/queue'
         self.now = datetime.now(timezone.utc).astimezone().isoformat()
         queue = []
-        headers = {'X-Api-Key': self.server.api_key}
 
-        get = self.session.get(self.server.url + endpoint, headers=headers, verify=self.server.verify_ssl).json()
+        get = self.session.get(self.server.url + endpoint, verify=self.server.verify_ssl).json()
         download_queue = [Queue(**show) for show in get]
 
         for show in download_queue:

Varken/tautulli.py

@@ -13,6 +13,7 @@ class TautulliAPI(object):
         self.dbmanager = dbmanager
         self.server = server
         self.session = Session()
+        self.session.params['apikey'] = self.server.api_key
         self.endpoint = '/api/v2'
 
     @logging
@@ -20,7 +21,6 @@ class TautulliAPI(object):
         self.now = datetime.now(timezone.utc).astimezone().isoformat()
         params = {'cmd': 'get_activity'}
         influx_payload = []
-        params['apikey'] = self.server.api_key
         g = self.session.get(self.server.url + self.endpoint, params=params, verify=self.server.verify_ssl)
         get = g.json()['response']['data']
 
@@ -51,7 +51,6 @@ class TautulliAPI(object):
         self.now = datetime.now(timezone.utc).astimezone().isoformat()
         params = {'cmd': 'get_activity'}
         influx_payload = []
-        params['apikey'] = self.server.api_key
         g = self.session.get(self.server.url + self.endpoint, params=params, verify=self.server.verify_ssl)
         get = g.json()['response']['data']['sessions']
         sessions = [TautulliStream(**session) for session in get]