open-source-mirrors
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #787 from ngosang/feature/clean1

Browse Source 
code cleanup: notifier, utils
pull/791/head
morpheus65535 5 years ago committed by GitHub
parent 9cf2cdb868 f49d30d722
commit f2a0e13359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 72 deletions
Show Stats Download Patch File Download Diff File

58
bazarr/notifier.py
Unescape View File

@ -2,23 +2,21 @@
from __future__ import absolute_import from __future__ import absolute_import
import apprise import apprise
import os
import logging import logging
from get_args import args
from database import database from database import database
def update_notifier(): def update_notifier():
# define apprise object # define apprise object
a = apprise.Apprise() a = apprise.Apprise()
# Retrieve all of the details # Retrieve all of the details
results = a.details() results = a.details()
notifiers_new = [] notifiers_new = []
notifiers_old = [] notifiers_old = []
notifiers_current_db = database.execute("SELECT name FROM table_settings_notifier") notifiers_current_db = database.execute("SELECT name FROM table_settings_notifier")
notifiers_current = [] notifiers_current = []
@ -31,66 +29,68 @@ def update_notifier():
logging.debug('Adding new notifier agent: ' + x['service_name']) logging.debug('Adding new notifier agent: ' + x['service_name'])
else: else:
notifiers_old.append([x['service_name']]) notifiers_old.append([x['service_name']])
notifiers_to_delete = [item for item in notifiers_current if item not in notifiers_old] notifiers_to_delete = [item for item in notifiers_current if item not in notifiers_old]
database.execute("INSERT INTO table_settings_notifier (name, enabled) VALUES (?, ?)", notifiers_new, execute_many=True) database.execute("INSERT INTO table_settings_notifier (name, enabled) VALUES (?, ?)", notifiers_new,
execute_many=True)
database.execute("DELETE FROM table_settings_notifier WHERE name=?", notifiers_to_delete, execute_many=True) database.execute("DELETE FROM table_settings_notifier WHERE name=?", notifiers_to_delete, execute_many=True)
def get_notifier_providers(): def get_notifier_providers():
providers = database.execute("SELECT name, url FROM table_settings_notifier WHERE enabled=1") providers = database.execute("SELECT name, url FROM table_settings_notifier WHERE enabled=1")
return providers return providers
def get_series_name(sonarrSeriesId): def get_series_name(sonarr_series_id):
data = database.execute("SELECT title FROM table_shows WHERE sonarrSeriesId=?", (sonarrSeriesId,), only_one=True) data = database.execute("SELECT title FROM table_shows WHERE sonarrSeriesId=?", (sonarr_series_id,), only_one=True)
return data['title'] or None return data['title'] or None
def get_episode_name(sonarrEpisodeId): def get_episode_name(sonarr_episode_id):
data = database.execute("SELECT title, season, episode FROM table_episodes WHERE sonarrEpisodeId=?", data = database.execute("SELECT title, season, episode FROM table_episodes WHERE sonarrEpisodeId=?",
(sonarrEpisodeId,), only_one=True) (sonarr_episode_id,), only_one=True)
return data['title'], data['season'], data['episode'] return data['title'], data['season'], data['episode']
def get_movies_name(radarrId): def get_movies_name(radarr_id):
data = database.execute("SELECT title FROM table_movies WHERE radarrId=?", (radarrId,), only_one=True) data = database.execute("SELECT title FROM table_movies WHERE radarrId=?", (radarr_id,), only_one=True)
return data['title'] return data['title']
def send_notifications(sonarrSeriesId, sonarrEpisodeId, message): def send_notifications(sonarr_series_id, sonarr_episode_id, message):
providers = get_notifier_providers() providers = get_notifier_providers()
series = get_series_name(sonarrSeriesId) series = get_series_name(sonarr_series_id)
episode = get_episode_name(sonarrEpisodeId) episode = get_episode_name(sonarr_episode_id)
apobj = apprise.Apprise() apobj = apprise.Apprise()
for provider in providers: for provider in providers:
if provider['url'] is not None: if provider['url'] is not None:
apobj.add(provider['url']) apobj.add(provider['url'])
apobj.notify( apobj.notify(
title='Bazarr notification', title='Bazarr notification',
body=(series + ' - S' + str(episode[1]).zfill(2) + 'E' + str(episode[2]).zfill(2) + ' - ' + episode[0] + ' : ' + message), body="{} - S{:02d}E{:02d} - {} : {}".format(series, episode[1], episode[2], episode[0], message),
) )
def send_notifications_movie(radarrId, message): def send_notifications_movie(radarr_id, message):
providers = get_notifier_providers() providers = get_notifier_providers()
movie = get_movies_name(radarrId) movie = get_movies_name(radarr_id)
apobj = apprise.Apprise() apobj = apprise.Apprise()
for provider in providers: for provider in providers:
if provider['url'] is not None: if provider['url'] is not None:
apobj.add(provider['url']) apobj.add(provider['url'])
apobj.notify( apobj.notify(
title='Bazarr notification', title='Bazarr notification',
body=movie + ' : ' + message, body="{} : {}".format(movie, message),
) )

71
bazarr/utils.py
Unescape View File

@ -4,7 +4,6 @@ from __future__ import absolute_import
import os import os
import time import time
import platform import platform
import sys
import logging import logging
import requests import requests
@ -17,22 +16,20 @@ import datetime
import glob import glob
def history_log(action, sonarrSeriesId, sonarrEpisodeId, description, video_path=None, language=None, provider=None, def history_log(action, sonarr_series_id, sonarr_episode_id, description, video_path=None, language=None, provider=None,
score=None, forced=False): score=None):
from database import database from database import database
database.execute("INSERT INTO table_history (action, sonarrSeriesId, sonarrEpisodeId, timestamp, description," database.execute("INSERT INTO table_history (action, sonarrSeriesId, sonarrEpisodeId, timestamp, description,"
"video_path, language, provider, score) VALUES (?,?,?,?,?,?,?,?,?)", (action, sonarrSeriesId, "video_path, language, provider, score) VALUES (?,?,?,?,?,?,?,?,?)",
sonarrEpisodeId, time.time(), (action, sonarr_series_id, sonarr_episode_id, time.time(), description, video_path, language,
description, video_path, provider, score))
language, provider, score))
def history_log_movie(action, radarrId, description, video_path=None, language=None, provider=None, score=None, def history_log_movie(action, radarr_id, description, video_path=None, language=None, provider=None, score=None):
forced=False):
from database import database from database import database
database.execute("INSERT INTO table_history_movie (action, radarrId, timestamp, description, video_path, language, " database.execute("INSERT INTO table_history_movie (action, radarrId, timestamp, description, video_path, language, "
"provider, score) VALUES (?,?,?,?,?,?,?,?)", (action, radarrId, time.time(), description, "provider, score) VALUES (?,?,?,?,?,?,?,?)",
video_path, language, provider, score)) (action, radarr_id, time.time(), description, video_path, language, provider, score))
def get_binary(name): def get_binary(name):
@ -46,10 +43,8 @@ def get_binary(name):
else: else:
if platform.system() == "Windows": # Windows if platform.system() == "Windows": # Windows
exe = os.path.abspath(os.path.join(binaries_dir, "Windows", "i386", name, "%s.exe" % name)) exe = os.path.abspath(os.path.join(binaries_dir, "Windows", "i386", name, "%s.exe" % name))
elif platform.system() == "Darwin": # MacOSX elif platform.system() == "Darwin": # MacOSX
exe = os.path.abspath(os.path.join(binaries_dir, "MacOSX", "i386", name, name)) exe = os.path.abspath(os.path.join(binaries_dir, "MacOSX", "i386", name, name))
elif platform.system() == "Linux": # Linux elif platform.system() == "Linux": # Linux
exe = os.path.abspath(os.path.join(binaries_dir, "Linux", platform.machine(), name, name)) exe = os.path.abspath(os.path.join(binaries_dir, "Linux", platform.machine(), name, name))
@ -82,62 +77,52 @@ def cache_maintenance():
def get_sonarr_version(): def get_sonarr_version():
use_sonarr = settings.general.getboolean('use_sonarr')
apikey_sonarr = settings.sonarr.apikey
sv = url_sonarr() + "/api/system/status?apikey=" + apikey_sonarr
sonarr_version = '' sonarr_version = ''
if use_sonarr: if settings.general.getboolean('use_sonarr'):
try: try:
sv = url_sonarr() + "/api/system/status?apikey=" + settings.sonarr.apikey
sonarr_version = requests.get(sv, timeout=60, verify=False).json()['version'] sonarr_version = requests.get(sv, timeout=60, verify=False).json()['version']
except Exception as e: except Exception:
logging.debug('BAZARR cannot get Sonarr version') logging.debug('BAZARR cannot get Sonarr version')
return sonarr_version return sonarr_version
def get_sonarr_platform(): def get_sonarr_platform():
use_sonarr = settings.general.getboolean('use_sonarr')
apikey_sonarr = settings.sonarr.apikey
sv = url_sonarr() + "/api/system/status?apikey=" + apikey_sonarr
sonarr_platform = '' sonarr_platform = ''
if use_sonarr: if settings.general.getboolean('use_sonarr'):
try: try:
if requests.get(sv, timeout=60, verify=False).json()['isLinux'] or requests.get(sv, timeout=60, verify=False).json()['isOsx']: sv = url_sonarr() + "/api/system/status?apikey=" + settings.sonarr.apikey
response = requests.get(sv, timeout=60, verify=False).json()
if response['isLinux'] or response['isOsx']:
sonarr_platform = 'posix' sonarr_platform = 'posix'
elif requests.get(sv, timeout=60, verify=False).json()['isWindows']: elif response['isWindows']:
sonarr_platform = 'nt' sonarr_platform = 'nt'
except Exception as e: except Exception:
logging.DEBUG('BAZARR cannot get Sonarr platform') logging.debug('BAZARR cannot get Sonarr platform')
return sonarr_platform return sonarr_platform
def get_radarr_version(): def get_radarr_version():
use_radarr = settings.general.getboolean('use_radarr')
apikey_radarr = settings.radarr.apikey
rv = url_radarr() + "/api/system/status?apikey=" + apikey_radarr
radarr_version = '' radarr_version = ''
if use_radarr: if settings.general.getboolean('use_radarr'):
try: try:
rv = url_radarr() + "/api/system/status?apikey=" + settings.radarr.apikey
radarr_version = requests.get(rv, timeout=60, verify=False).json()['version'] radarr_version = requests.get(rv, timeout=60, verify=False).json()['version']
except Exception as e: except Exception:
logging.debug('BAZARR cannot get Radarr version') logging.debug('BAZARR cannot get Radarr version')
return radarr_version return radarr_version
def get_radarr_platform(): def get_radarr_platform():
use_radarr = settings.general.getboolean('use_radarr')
apikey_radarr = settings.radarr.apikey
rv = url_radarr() + "/api/system/status?apikey=" + apikey_radarr
radarr_platform = '' radarr_platform = ''
if use_radarr: if settings.general.getboolean('use_radarr'):
try: try:
if requests.get(rv, timeout=60, verify=False).json()['isLinux'] or requests.get(rv, timeout=60, verify=False).json()['isOsx']: rv = url_radarr() + "/api/system/status?apikey=" + settings.radarr.apikey
response = requests.get(rv, timeout=60, verify=False).json()
if response['isLinux'] or response['isOsx']:
radarr_platform = 'posix' radarr_platform = 'posix'
elif requests.get(rv, timeout=60, verify=False).json()['isWindows']: elif response['isWindows']:
radarr_platform = 'nt' radarr_platform = 'nt'
except Exception as e: except Exception:
logging.DEBUG('BAZARR cannot get Radarr platform') logging.debug('BAZARR cannot get Radarr platform')
return radarr_platform return radarr_platform

Write Preview
Loading…
Cancel
Save