Varken.py

@@ -164,7 +164,7 @@ if __name__ == "__main__":
                 at_time = schedule.every(server.request_total_run_seconds).seconds
                 at_time.do(thread, OVERSEER.get_request_counts).tag("overseerr-{}-get_request_counts"
                                                                     .format(server.id))
-            if server.get_latest_requests:
+            if server.num_latest_requests_to_fetch > 0:
                 at_time = schedule.every(server.num_latest_requests_seconds).seconds
                 at_time.do(thread, OVERSEER.get_latest_requests).tag("overseerr-{}-get_latest_requests"
                                                                      .format(server.id))
@@ -184,7 +184,7 @@ if __name__ == "__main__":
 
     # Run all on startup
     SERVICES_ENABLED = [CONFIG.ombi_enabled, CONFIG.radarr_enabled, CONFIG.tautulli_enabled, CONFIG.unifi_enabled,
-                        CONFIG.sonarr_enabled, CONFIG.sickchill_enabled, CONFIG.lidarr_enabled]
+                        CONFIG.sonarr_enabled, CONFIG.sickchill_enabled, CONFIG.lidarr_enabled, CONFIG.overseerr_enabled]
     if not [enabled for enabled in SERVICES_ENABLED if enabled]:
         vl.logger.error("All services disabled. Exiting")
         exit(1)

varken/iniparser.py

@@ -300,12 +300,9 @@ class INIParser(object):
                             request_total_run_seconds = int(env.get(
                                 f'VRKN_{envsection}_REQUEST_TOTAL_RUN_SECONDS',
                                 self.config.getint(section, 'request_total_run_seconds')))
-                            get_latest_requests = boolcheck(env.get(
+                            num_latest_requests_to_fetch = int(env.get(
-                                f'VRKN_{envsection}_GET_LATEST_REQUESTS',
-                                self.config.get(section, 'get_latest_requests')))
-                            num_latest_requests_to_fetch = boolcheck(env.get(
                                 f'VRKN_{envsection}_GET_LATEST_REQUESTS_TO_FETCH',
-                                self.config.get(section, 'num_latest_requests_to_fetch')))
+                                self.config.getint(section, 'num_latest_requests_to_fetch')))
                             num_latest_requests_seconds = int(env.get(
                                 f'VRKN_{envsection}_NUM_LATEST_REQUESTS_SECONDS',
                                 self.config.getint(section, 'num_latest_requests_seconds')))
@@ -314,7 +311,6 @@ class INIParser(object):
                                                      verify_ssl=verify_ssl,
                                                      get_request_total_counts=get_request_total_counts,
                                                      request_total_run_seconds=request_total_run_seconds,
-                                                     get_latest_requests=get_latest_requests,
                                                      num_latest_requests_to_fetch=num_latest_requests_to_fetch,
                                                      num_latest_requests_seconds=num_latest_requests_seconds)
 

varken/overseerr.py

@@ -3,7 +3,7 @@ from requests import Session, Request
 from datetime import datetime, timezone
 
 from varken.helpers import connection_handler, hashit
-from varken.structures import OverseerrRequest, OverseerrRequestCounts
+from varken.structures import OverseerrRequestCounts
 
 
 class OverseerrAPI(object):
@@ -86,8 +86,8 @@ class OverseerrAPI(object):
                             "request_type": 0,
                             "status": get_tv_req['mediaInfo']['status'],
                             "title": get_tv_req['name'],
-                            "requested_user": get_tv_req['mediaInfo']['requests'][0]['requestedBy']['plexUsername'],
+                            "requested_user": get_tv_req['mediaInfo']['requests'][0]['requestedBy']['displayName'],
-                            "requested_date": get_tv_req['mediaInfo']['requests'][0]['media']['createdAt']
+                            "requested_date": get_tv_req['mediaInfo']['requests'][0]['createdAt']
                         },
                         "time": now,
                         "fields": {
@@ -113,8 +113,8 @@ class OverseerrAPI(object):
                             "request_type": 1,
                             "status": get_movie_req['mediaInfo']['status'],
                             "title": get_movie_req['title'],
-                            "requested_user": get_movie_req['mediaInfo']['requests'][0]['requestedBy']['plexUsername'],
+                            "requested_user": get_movie_req['mediaInfo']['requests'][0]['requestedBy']['displayName'],
-                            "requested_date": get_movie_req['mediaInfo']['requests'][0]['media']['createdAt']
+                            "requested_date": get_movie_req['mediaInfo']['requests'][0]['createdAt']
                         },
                         "time": now,
                         "fields": {

varken/structures.py

@@ -64,7 +64,6 @@ class OverseerrServer(NamedTuple):
     verify_ssl: bool = False
     get_request_total_counts: bool = False
     request_total_run_seconds: int = 30
-    get_latest_requests: bool = False
     num_latest_requests_to_fetch: int = 10
     num_latest_requests_seconds: int = 30
 
@@ -186,25 +185,6 @@ class OmbiMovieRequest(NamedTuple):
 
 
 # Overseerr
-class OverseerrRequest(NamedTuple):
-    id: int = None
-    status: int = None
-    createdAt: str = None
-    updatedAt: str = None
-    type: str = None
-    is4k: bool = None
-    serverId: int = None
-    profileId: int = None
-    rootFolder: str = None
-    languageProfileId: int = None
-    tags: list = None
-    media: dict = None
-    seasons: list = None
-    modifiedBy: dict = None
-    requestedBy: dict = None
-    seasonCount: int = None
-
-
 class OverseerrRequestCounts(NamedTuple):
     pending: int = None
     approved: int = None
@@ -298,6 +278,8 @@ class SonarrQueue(NamedTuple):
     outputPath: str = None
     series: SonarrTVShow = None
     episode: SonarrEpisode = None
+    timeleft: int = None
+    estimatedCompletionTime: int = None
 
 
 # Radarr
@@ -364,6 +346,7 @@ class RadarrQueue(NamedTuple):
     errorMessage: str = None
     outputPath: str = None
     movie: RadarrMovie = None
+    timeleft: str = None
 
 
 # Sickchill