From ec85c4b4a62870b448f3a715ebb7a30c0cffcc7d Mon Sep 17 00:00:00 2001
From: Oscar Andersson <anderssonoscar0@gmail.com>
Date: Thu, 27 Dec 2018 22:28:36 +0100
Subject: [PATCH] Fix variable names to follow structure

---
 Varken.py               |  8 ++++----
 data/varken.example.ini |  8 ++++----
 varken/iniparser.py     | 14 +++++++-------
 varken/ombi.py          |  2 +-
 varken/structures.py    |  8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Varken.py b/Varken.py
index 99ab580..a377098 100644
--- a/Varken.py
+++ b/Varken.py
@@ -121,10 +121,10 @@ if __name__ == "__main__":
                 schedule.every(server.request_type_run_seconds).seconds.do(threaded, OMBI.get_request_counts)
             if server.request_total_counts:
                 schedule.every(server.request_total_run_seconds).seconds.do(threaded, OMBI.get_all_requests)
-            if server.request_issues_counts:
-                schedule.every(server.request_issues_type_run_seconds).seconds.do(threaded, OMBI.get_issues_counts)
-            if server.issues_total_counts:
-                schedule.every(server.issues_total_run_seconds).seconds.do(threaded, OMBI.get_all_issues)
+            if server.issue_status_counts:
+                schedule.every(server.issue_status_run_seconds).seconds.do(threaded, OMBI.get_issue_counts)
+            if server.issue_total_counts:
+                schedule.every(server.issue_total_run_seconds).seconds.do(threaded, OMBI.get_all_issues)
 
     if CONFIG.sickchill_enabled:
         for server in CONFIG.sickchill_servers:
diff --git a/data/varken.example.ini b/data/varken.example.ini
index ffec3e5..6069be3 100644
--- a/data/varken.example.ini
+++ b/data/varken.example.ini
@@ -83,10 +83,10 @@ get_request_type_counts = true
 request_type_run_seconds = 300
 get_request_total_counts = true
 request_total_run_seconds = 300
-get_request_issues_counts = true
-request_type_issues_run_seconds = 300
-get_issues_total_counts = true
-issues_total_run_seconds = 300
+get_issue_status_counts = true
+issue_status_run_seconds = 300
+get_issue_total_counts = true
+issue_total_run_seconds = 300
 
 [sickchill-1]
 url = sickchill.domain.tld:8081
diff --git a/varken/iniparser.py b/varken/iniparser.py
index 76552e1..67d0b9b 100644
--- a/varken/iniparser.py
+++ b/varken/iniparser.py
@@ -179,19 +179,19 @@ class INIParser(object):
 
                             request_total_run_seconds = self.config.getint(section, 'request_total_run_seconds')
 
-                            request_issues_counts = self.config.getboolean(section, 'get_request_issues_counts')
+                            issue_status_counts = self.config.getboolean(section, 'get_issue_status_counts')
 
-                            request_issues_type_run_seconds = self.config.getint(section, 'request_type_issues_run_seconds')
+                            issue_status_run_seconds = self.config.getint(section, 'issue_status_run_seconds')
 
-                            issues_total_counts = self.config.getboolean(section, 'get_issues_total_counts')
+                            issue_total_counts = self.config.getboolean(section, 'get_issue_total_counts')
 
-                            issues_total_run_seconds = self.config.getint(section, 'issues_total_run_seconds')
+                            issue_total_run_seconds = self.config.getint(section, 'issue_total_run_seconds')
 
                             server = OmbiServer(server_id, scheme + url, apikey, verify_ssl, request_type_counts,
                                                 request_type_run_seconds, request_total_counts,
-                                                request_total_run_seconds, request_issues_counts, 
-                                                request_issues_type_run_seconds, issues_total_counts, 
-                                                issues_total_run_seconds)
+                                                request_total_run_seconds, issue_status_counts, 
+                                                issue_status_run_seconds, issue_total_counts, 
+                                                issue_total_run_seconds)
 
                         if service == 'sickchill':
                             get_missing = self.config.getboolean(section, 'get_missing')
diff --git a/varken/ombi.py b/varken/ombi.py
index e0e8831..c3f1d36 100644
--- a/varken/ombi.py
+++ b/varken/ombi.py
@@ -166,7 +166,7 @@ class OmbiAPI(object):
 
         self.dbmanager.write_points(influx_payload)
 
-    def get_issues_counts(self):
+    def get_issue_counts(self):
         now = datetime.now(timezone.utc).astimezone().isoformat()
         endpoint = '/api/v1/Issues/count'
 
diff --git a/varken/structures.py b/varken/structures.py
index 721a0fe..dec726b 100644
--- a/varken/structures.py
+++ b/varken/structures.py
@@ -61,10 +61,10 @@ class OmbiServer(NamedTuple):
     request_type_run_seconds: int = 30
     request_total_counts: bool = False
     request_total_run_seconds: int = 30
-    request_issues_counts: bool = False
-    request_issues_type_run_seconds: int = 30
-    issues_total_counts: bool = False
-    issues_total_run_seconds: int = 30
+    issue_status_counts: bool = False
+    issue_status_run_seconds: int = 30
+    issue_total_counts: bool = False
+    issue_total_run_seconds: int = 30
 
 
 class TautulliServer(NamedTuple):