From 8ef4b7fd0f167f2721dd03eb1de93ebd40182c87 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Sun, 2 Dec 2018 22:19:05 -0600 Subject: [PATCH] added hashing to radarr --- Varken/radarr.py | 18 +++++++++++------- Varken/sonarr.py | 6 +++++- Varken/tautulli.py | 1 + 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Varken/radarr.py b/Varken/radarr.py index 091bb77..2e170a1 100644 --- a/Varken/radarr.py +++ b/Varken/radarr.py @@ -2,7 +2,7 @@ from requests import Session from datetime import datetime, timezone from Varken.logger import logging -from Varken.helpers import Movie, Queue +from Varken.helpers import Movie, Queue, hashit class RadarrAPI(object): @@ -34,6 +34,7 @@ class RadarrAPI(object): missing.append((movie_name, ma, movie.tmdbId)) for title, ma, mid in missing: + hash_id = hashit('{}{}{}'.format(self.server.id, title, mid)) influx_payload.append( { "measurement": "Radarr", @@ -41,11 +42,12 @@ class RadarrAPI(object): "Missing": True, "Missing_Available": ma, "tmdbId": mid, - "server": self.server.id + "server": self.server.id, + "name": title }, "time": self.now, "fields": { - "name": title + "hash": hash_id } } ) @@ -77,20 +79,22 @@ class RadarrAPI(object): protocol_id, queue_item.id)) for movie, quality, protocol, protocol_id, qid in queue: + hash_id = hashit('{}{}{}'.format(self.server.id, movie, quality)) influx_payload.append( { "measurement": "Radarr", "tags": { "type": "Queue", "tmdbId": qid, - "server": self.server.id - }, - "time": self.now, - "fields": { + "server": self.server.id, "name": movie, "quality": quality, "protocol": protocol, "protocol_id": protocol_id + }, + "time": self.now, + "fields": { + "hash": hash_id } } ) diff --git a/Varken/sonarr.py b/Varken/sonarr.py index 6409af5..70277fc 100644 --- a/Varken/sonarr.py +++ b/Varken/sonarr.py @@ -77,7 +77,11 @@ class SonarrAPI(object): for show in tv_shows: sxe = 'S{:0>2}E{:0>2}'.format(show.seasonNumber, show.episodeNumber) - air_days.append((show.series['title'], show.hasFile, sxe, show.title, show.airDate, show.id)) + if show.hasFile: + downloaded = 1 + else: + downloaded = 0 + air_days.append((show.series['title'], downloaded, sxe, show.title, show.airDate, show.id)) for series_title, dl_status, sxe, episode_title, air_date, sonarr_id in air_days: hash_id = hashit('{}{}{}'.format(self.server.id, series_title, sxe)) diff --git a/Varken/tautulli.py b/Varken/tautulli.py index 62f42a1..6f9cd97 100644 --- a/Varken/tautulli.py +++ b/Varken/tautulli.py @@ -1,6 +1,7 @@ from datetime import datetime, timezone from geoip2.errors import AddressNotFoundError from requests import Session + from Varken.helpers import TautulliStream, geo_lookup from Varken.logger import logging