github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-14 01:02:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nightly' into python3

Browse source 
# Conflicts:
#	plexpy/datafactory.py
This commit is contained in:
JonnyWong16 2020-04-03 21:10:32 -07:00
commit fb395fc2e9
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plexpy/datafactory.py
View file

@ -354,7 +354,6 @@ class DataFactory(object):
'user': '', 'user': '',
'friendly_name': '', 'friendly_name': '',
'platform': '', 'platform': '',
'platform': '',
'live': item['live'], 'live': item['live'],
'guid': item['guid'], 'guid': item['guid'],
'row_id': item['id'] 'row_id': item['id']
@ -1433,7 +1432,7 @@ class DataFactory(object):
if rating_key: if rating_key:
logger.info("Tautulli DataFactory :: Deleting lookup info for rating_key %s from the database." logger.info("Tautulli DataFactory :: Deleting lookup info for rating_key %s from the database."
% (title, rating_key)) % rating_key)
result_themoviedb = monitor_db.action('DELETE FROM themoviedb_lookup WHERE rating_key = ?', [rating_key]) result_themoviedb = monitor_db.action('DELETE FROM themoviedb_lookup WHERE rating_key = ?', [rating_key])
result_tvmaze = monitor_db.action('DELETE FROM tvmaze_lookup WHERE rating_key = ?', [rating_key]) result_tvmaze = monitor_db.action('DELETE FROM tvmaze_lookup WHERE rating_key = ?', [rating_key])
result_musicbrainz = monitor_db.action('DELETE FROM musicbrainz_lookup WHERE rating_key = ?', [rating_key]) result_musicbrainz = monitor_db.action('DELETE FROM musicbrainz_lookup WHERE rating_key = ?', [rating_key])

4
plexpy/helpers.py
View file

@ -462,7 +462,11 @@ def create_https_certificates(ssl_cert, ssl_key):
This code is stolen from SickBeard (http://github.com/midgetspy/Sick-Beard). This code is stolen from SickBeard (http://github.com/midgetspy/Sick-Beard).
""" """
try:
from OpenSSL import crypto from OpenSSL import crypto
except ImportError:
logger.error("Unable to generate self-signed certificates: Missing OpenSSL module.")
return False
from certgen import createKeyPair, createSelfSignedCertificate, TYPE_RSA from certgen import createKeyPair, createSelfSignedCertificate, TYPE_RSA
serial = timestamp() serial = timestamp()

2
plexpy/newsletters.py
View file

@ -301,7 +301,7 @@ def send_newsletter(newsletter_id=None, subject=None, body=None, message=None, n
email_config=newsletter_config['email_config'], email_config=newsletter_config['email_config'],
subject=subject, subject=subject,
body=body, body=body,
messsage=message) message=message)
return agent.send() return agent.send()
else: else:
logger.debug("Tautulli Newsletters :: Notification requested but no newsletter_id received.") logger.debug("Tautulli Newsletters :: Notification requested but no newsletter_id received.")