- Note: Either Image Hosting on Imgur or Self-Hosted Newsletters must be enabled.
+ Note: Either Image Hosting or Self-Hosted Newsletters must be enabled.
@@ -2538,6 +2578,11 @@ $(document).ready(function() {
} else {
$('#self_host_image_options').slideUp();
}
+ if (upload_val === '3') {
+ $('#cloudinary_upload_options').slideDown();
+ } else {
+ $('#cloudinary_upload_options').slideUp();
+ }
}
$('#notify_upload_posters').change(function () {
imageUpload();
@@ -2557,7 +2602,7 @@ $(document).ready(function() {
});
function newsletterUploadEnabled() {
- if ($('#notify_upload_posters').val() === '1' || $('#newsletter_self_hosted').is(':checked')) {
+ if ($('#notify_upload_posters').val() !== '2' || $('#newsletter_self_hosted').is(':checked')) {
$('#newsletter_upload_warning').hide();
} else {
$('#newsletter_upload_warning').show();
diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index 74c4f676..a8ecae2b 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -693,6 +693,12 @@ def dbcheck():
'img_hash TEXT, imgur_title TEXT, imgur_url TEXT, delete_hash TEXT)'
)
+ # cloudinary_lookup table :: This table keeps record of the Cloudinary uploads
+ c_db.execute(
+ 'CREATE TABLE IF NOT EXISTS cloudinary_lookup (id INTEGER PRIMARY KEY AUTOINCREMENT, '
+ 'img_hash TEXT, cloudinary_title TEXT, cloudinary_url TEXT)'
+ )
+
# Upgrade sessions table from earlier versions
try:
c_db.execute('SELECT started FROM sessions')
@@ -1689,7 +1695,8 @@ def dbcheck():
img_hash = notification_handler.set_hash_image_info(
rating_key=row['rating_key'], width=600, height=1000, fallback='poster')
data_factory.set_imgur_info(img_hash=img_hash, imgur_title=row['poster_title'],
- imgur_url=row['poster_url'], delete_hash=row['delete_hash'])
+ imgur_url=row['poster_url'], delete_hash=row['delete_hash'],
+ service='imgur')
db.action('DROP TABLE poster_urls')
except sqlite3.OperationalError:
diff --git a/plexpy/config.py b/plexpy/config.py
index 57c92a22..b0d26188 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -115,6 +115,9 @@ _CONFIG_DEFINITIONS = {
'CHECK_GITHUB_INTERVAL': (int, 'General', 360),
'CHECK_GITHUB_ON_STARTUP': (int, 'General', 1),
'CLEANUP_FILES': (int, 'General', 0),
+ 'CLOUDINARY_CLOUD_NAME': (str, 'Cloudinary', ''),
+ 'CLOUDINARY_API_KEY': (str, 'Cloudinary', ''),
+ 'CLOUDINARY_API_SECRET': (str, 'Cloudinary', ''),
'CONFIG_VERSION': (int, 'Advanced', 0),
'DO_NOT_OVERRIDE_GIT_BRANCH': (int, 'General', 0),
'EMAIL_ENABLED': (int, 'Email', 0),
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 9727699b..59313226 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -1132,12 +1132,12 @@ class DataFactory(object):
return ip_address
- def get_imgur_info(self, img=None, rating_key=None, width=None, height=None,
- opacity=None, background=None, blur=None, fallback=None,
- order_by=''):
+ def get_img_info(self, img=None, rating_key=None, width=None, height=None,
+ opacity=None, background=None, blur=None, fallback=None,
+ order_by='', service=None):
monitor_db = database.MonitorDatabase()
- imgur_info = []
+ img_info = []
where_params = []
args = []
@@ -1174,26 +1174,46 @@ class DataFactory(object):
if order_by:
order_by = 'ORDER BY ' + order_by + ' DESC'
- query = 'SELECT imgur_title, imgur_url FROM imgur_lookup ' \
- 'JOIN image_hash_lookup ON imgur_lookup.img_hash = image_hash_lookup.img_hash ' \
- '%s %s' % (where, order_by)
+ if service == 'imgur':
+ query = 'SELECT imgur_title AS img_title, imgur_url AS img_url FROM imgur_lookup ' \
+ 'JOIN image_hash_lookup ON imgur_lookup.img_hash = image_hash_lookup.img_hash ' \
+ '%s %s' % (where, order_by)
+ elif service == 'cloudinary':
+ query = 'SELECT cloudinary_title AS img_title, cloudinary_url AS img_url FROM cloudinary_lookup ' \
+ 'JOIN image_hash_lookup ON cloudinary_lookup.img_hash = image_hash_lookup.img_hash ' \
+ '%s %s' % (where, order_by)
+ else:
+ logger.warn(u"Tautulli DataFactory :: Unable to execute database query for get_img_info: "
+ "service not provided.")
+ return img_info
try:
- imgur_info = monitor_db.select(query, args=args)
+ img_info = monitor_db.select(query, args=args)
except Exception as e:
- logger.warn(u"Tautulli DataFactory :: Unable to execute database query for get_imgur_info: %s." % e)
+ logger.warn(u"Tautulli DataFactory :: Unable to execute database query for get_img_info: %s." % e)
- return imgur_info
+ return img_info
- def set_imgur_info(self, img_hash=None, imgur_title=None, imgur_url=None, delete_hash=None):
+ def set_img_info(self, img_hash=None, img_title=None, img_url=None, delete_hash=None, service=None):
monitor_db = database.MonitorDatabase()
keys = {'img_hash': img_hash}
- values = {'imgur_title': imgur_title,
- 'imgur_url': imgur_url,
- 'delete_hash': delete_hash}
- monitor_db.upsert('imgur_lookup', key_dict=keys, value_dict=values)
+ if service == 'imgur':
+ table = 'imgur_lookup'
+ values = {'imgur_title': img_title,
+ 'imgur_url': img_url,
+ 'delete_hash': delete_hash}
+ elif service == 'cloudinary':
+ table = 'cloudinary_lookup'
+ values = {'cloudinary_title': img_title,
+ 'cloudinary_url': img_url}
+ else:
+ logger.warn(u"Tautulli DataFactory :: Unable to execute database query for set_img_info: "
+ "service not provided.")
+ return
+
+ monitor_db.upsert(table, key_dict=keys, value_dict=values)
def delete_imgur_info(self, rating_key=None):
monitor_db = database.MonitorDatabase()
@@ -1234,7 +1254,7 @@ class DataFactory(object):
poster_info = {}
if poster_key:
- imgur_info = self.get_imgur_info(rating_key=poster_key, order_by='height', fallback='poster')
+ imgur_info = self.get_img_info(rating_key=poster_key, order_by='height', fallback='poster', service='imgur')
if imgur_info:
poster_info = {'poster_title': imgur_info[0]['imgur_title'],
'poster_url': imgur_info[0]['imgur_url']}
diff --git a/plexpy/helpers.py b/plexpy/helpers.py
index d3d587f1..1dace202 100644
--- a/plexpy/helpers.py
+++ b/plexpy/helpers.py
@@ -14,6 +14,8 @@
# along with Tautulli. If not, see