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

Fix parsing for disabled servers

Browse source
This commit is contained in:
samwiseg0 2018-12-04 14:46:28 -05:00
parent 4ab1c42abc
commit b80d51ba88
1 changed files with 12 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

41
varken/iniparser.py
View file

@ -29,6 +29,13 @@ class INIParser(object):
self.parse_opts() self.parse_opts()
def enable_check(self, server_ids):
global_server_ids = self.config.get('global', server_ids)
if global_server_ids.lower() in ['false', 'no']:
return False
else:
return global_server_ids
def read_file(self): def read_file(self):
file_path = join(self.data_folder, 'varken.ini') file_path = join(self.data_folder, 'varken.ini')
if exists(file_path): if exists(file_path):
@ -48,13 +55,7 @@ class INIParser(object):
self.influx_server = InfluxServer(url, port, username, password) self.influx_server = InfluxServer(url, port, username, password)
# Parse Sonarr options # Parse Sonarr options
try: self.sonarr_enabled = self.enable_check('sonarr_server_ids')
if not self.config.getboolean('global', 'sonarr_server_ids'):
sys.exit('server_ids must be either false, or a comma-separated list of server ids')
elif self.config.getint('global', 'sonarr_server_ids'):
self.sonarr_enabled = True
except ValueError:
self.sonarr_enabled = True
if self.sonarr_enabled: if self.sonarr_enabled:
sids = self.config.get('global', 'sonarr_server_ids').strip(' ').split(',') sids = self.config.get('global', 'sonarr_server_ids').strip(' ').split(',')
@ -80,13 +81,7 @@ class INIParser(object):
self.sonarr_servers.append(server) self.sonarr_servers.append(server)
# Parse Radarr options # Parse Radarr options
try: self.radarr_enabled = self.enable_check('radarr_server_ids')
if not self.config.getboolean('global', 'radarr_server_ids'):
sys.exit('server_ids must be either false, or a comma-separated list of server ids')
elif self.config.getint('global', 'radarr_server_ids'):
self.radarr_enabled = True
except ValueError:
self.radarr_enabled = True
if self.radarr_enabled: if self.radarr_enabled:
sids = self.config.get('global', 'radarr_server_ids').strip(' ').split(',') sids = self.config.get('global', 'radarr_server_ids').strip(' ').split(',')
@ -109,13 +104,7 @@ class INIParser(object):
self.radarr_servers.append(server) self.radarr_servers.append(server)
# Parse Tautulli options # Parse Tautulli options
try: self.tautulli_enabled = self.enable_check('tautulli_server_ids')
if not self.config.getboolean('global', 'tautulli_server_ids'):
sys.exit('server_ids must be either false, or a comma-separated list of server ids')
elif self.config.getint('global', 'tautulli_server_ids'):
self.tautulli_enabled = True
except ValueError:
self.tautulli_enabled = True
if self.tautulli_enabled: if self.tautulli_enabled:
sids = self.config.get('global', 'tautulli_server_ids').strip(' ').split(',') sids = self.config.get('global', 'tautulli_server_ids').strip(' ').split(',')
@ -138,14 +127,8 @@ class INIParser(object):
get_activity_run_seconds, get_sessions, get_sessions_run_seconds) get_activity_run_seconds, get_sessions, get_sessions_run_seconds)
self.tautulli_servers.append(server) self.tautulli_servers.append(server)
# Parse Ombi Options # Parse Ombi options
try: self.ombi_enabled = self.enable_check('ombi_server_ids')
if not self.config.getboolean('global', 'ombi_server_ids'):
sys.exit('server_ids must be either false, or a comma-separated list of server ids')
elif self.config.getint('global', 'ombi_server_ids'):
self.ombi_enabled = True
except ValueError:
self.ombi_enabled = True
if self.ombi_enabled: if self.ombi_enabled:
sids = self.config.get('global', 'ombi_server_ids').strip(' ').split(',') sids = self.config.get('global', 'ombi_server_ids').strip(' ').split(',')