github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 08:16:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Save Imgur URL to database

Browse source
This commit is contained in:
JonnyWong16 2016-02-21 09:34:51 -08:00
parent bc42e79bb5
commit f663fac220
3 changed files with 107 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plexpy/__init__.py
View file

@ -446,7 +446,7 @@ def dbcheck():
'CREATE TABLE IF NOT EXISTS notify_log (id INTEGER PRIMARY KEY AUTOINCREMENT, ' 'CREATE TABLE IF NOT EXISTS notify_log (id INTEGER PRIMARY KEY AUTOINCREMENT, '
'session_key INTEGER, rating_key INTEGER, user_id INTEGER, user TEXT, ' 'session_key INTEGER, rating_key INTEGER, user_id INTEGER, user TEXT, '
'agent_id INTEGER, agent_name TEXT, on_play INTEGER, on_stop INTEGER, on_watched INTEGER, ' 'agent_id INTEGER, agent_name TEXT, on_play INTEGER, on_stop INTEGER, on_watched INTEGER, '
'on_pause INTEGER, on_resume INTEGER, on_buffer INTEGER, on_created INTEGER)' 'on_pause INTEGER, on_resume INTEGER, on_buffer INTEGER, on_created INTEGER, poster_url TEXT)'
) )
# library_sections table :: This table keeps record of the servers library sections # library_sections table :: This table keeps record of the servers library sections
@ -724,6 +724,15 @@ def dbcheck():
'ALTER TABLE notify_log ADD COLUMN on_created INTEGER' 'ALTER TABLE notify_log ADD COLUMN on_created INTEGER'
) )
# Upgrade session_history_metadata table from earlier versions
try:
c_db.execute('SELECT poster_url FROM notify_log')
except sqlite3.OperationalError:
logger.debug(u"Altering database. Updating database table notify_log.")
c_db.execute(
'ALTER TABLE notify_log ADD COLUMN poster_url TEXT'
)
# Upgrade library_sections table from earlier versions (remove UNIQUE constraint on section_id) # Upgrade library_sections table from earlier versions (remove UNIQUE constraint on section_id)
try: try:
result = c_db.execute('SELECT SQL FROM sqlite_master WHERE type="table" AND name="library_sections"').fetchone() result = c_db.execute('SELECT SQL FROM sqlite_master WHERE type="table" AND name="library_sections"').fetchone()

17
plexpy/datafactory.py
View file

@ -856,6 +856,23 @@ class DataFactory(object):
return ip_address return ip_address
def get_poster_url(self, rating_key=''):
monitor_db = database.MonitorDatabase()
if rating_key:
query = 'SELECT id, poster_url FROM notify_log WHERE rating_key = %d ' \
'ORDER BY id DESC LIMIT 1' % int(rating_key)
result = monitor_db.select(query)
else:
return None
poster_url = ''
for item in result:
poster_url = item['poster_url']
return poster_url
def get_search_query(self, rating_key=''): def get_search_query(self, rating_key=''):
monitor_db = database.MonitorDatabase() monitor_db = database.MonitorDatabase()

141
plexpy/notification_handler.py
View file

@ -20,7 +20,7 @@ import re
import time import time
import urllib import urllib
from plexpy import logger, config, notifiers, database, helpers, plextv, pmsconnect from plexpy import logger, config, notifiers, database, helpers, plextv, pmsconnect, datafactory
import plexpy import plexpy
@ -50,66 +50,66 @@ def notify(stream_data=None, notify_action=None):
for agent in notifiers.available_notification_agents(): for agent in notifiers.available_notification_agents():
if agent['on_play'] and notify_action == 'play': if agent['on_play'] and notify_action == 'play':
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
# Set the notification state in the db # Set the notification state in the db
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif agent['on_stop'] and notify_action == 'stop' \ elif agent['on_stop'] and notify_action == 'stop' \
and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < plexpy.CONFIG.NOTIFY_WATCHED_PERCENT): and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < plexpy.CONFIG.NOTIFY_WATCHED_PERCENT):
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif agent['on_pause'] and notify_action == 'pause' \ elif agent['on_pause'] and notify_action == 'pause' \
and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99): and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99):
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif agent['on_resume'] and notify_action == 'resume' \ elif agent['on_resume'] and notify_action == 'resume' \
and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99): and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99):
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif agent['on_buffer'] and notify_action == 'buffer': elif agent['on_buffer'] and notify_action == 'buffer':
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2]) script_args=metadata)
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif agent['on_watched'] and notify_action == 'watched': elif agent['on_watched'] and notify_action == 'watched':
# Get the current states for notifications from our db # Get the current states for notifications from our db
@ -118,100 +118,100 @@ def notify(stream_data=None, notify_action=None):
# If there is nothing in the notify_log for our agent id but it is enabled we should notify # If there is nothing in the notify_log for our agent id but it is enabled we should notify
if not any(d['agent_id'] == agent['id'] for d in notify_states): if not any(d['agent_id'] == agent['id'] for d in notify_states):
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
# Set the notification state in the db # Set the notification state in the db
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
else: else:
# Check in our notify log if the notification has already been sent # Check in our notify log if the notification has already been sent
for notify_state in notify_states: for notify_state in notify_states:
if not notify_state['on_watched'] and (notify_state['agent_id'] == agent['id']): if not notify_state['on_watched'] and (notify_state['agent_id'] == agent['id']):
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
# Set the notification state in the db # Set the notification state in the db
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif (stream_data['media_type'] == 'track' and plexpy.CONFIG.MUSIC_NOTIFY_ENABLE): elif (stream_data['media_type'] == 'track' and plexpy.CONFIG.MUSIC_NOTIFY_ENABLE):
for agent in notifiers.available_notification_agents(): for agent in notifiers.available_notification_agents():
if agent['on_play'] and notify_action == 'play': if agent['on_play'] and notify_action == 'play':
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
# Set the notification state in the db # Set the notification state in the db
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif agent['on_stop'] and notify_action == 'stop': elif agent['on_stop'] and notify_action == 'stop':
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
# Set the notification state in the db # Set the notification state in the db
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif agent['on_pause'] and notify_action == 'pause': elif agent['on_pause'] and notify_action == 'pause':
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
# Set the notification state in the db # Set the notification state in the db
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif agent['on_resume'] and notify_action == 'resume': elif agent['on_resume'] and notify_action == 'resume':
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
# Set the notification state in the db # Set the notification state in the db
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif agent['on_buffer'] and notify_action == 'buffer': elif agent['on_buffer'] and notify_action == 'buffer':
# Build and send notification # Build and send notification
notify_strings = build_notify_text(session=stream_data, state=notify_action) notify_strings, metadata = build_notify_text(session=stream_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
# Set the notification state in the db # Set the notification state in the db
set_notify_state(session=stream_data, state=notify_action, agent_info=agent) set_notify_state(session=stream_data, state=notify_action, agent_info=agent, metadata=metadata)
elif stream_data['media_type'] == 'clip': elif stream_data['media_type'] == 'clip':
pass pass
@ -227,15 +227,15 @@ def notify_timeline(timeline_data=None, notify_action=None):
for agent in notifiers.available_notification_agents(): for agent in notifiers.available_notification_agents():
if agent['on_created'] and notify_action == 'created': if agent['on_created'] and notify_action == 'created':
# Build and send notification # Build and send notification
notify_strings = build_notify_text(timeline=timeline_data, state=notify_action) notify_strings, metadata = build_notify_text(timeline=timeline_data, state=notify_action)
notifiers.send_notification(agent_id=agent['id'], notifiers.send_notification(agent_id=agent['id'],
subject=notify_strings[0], subject=notify_strings[0],
body=notify_strings[1], body=notify_strings[1],
notify_action=notify_action, notify_action=notify_action,
script_args=notify_strings[2], script_args=notify_strings[2],
metadata=notify_strings[3]) metadata=metadata)
# Set the notification state in the db # Set the notification state in the db
set_notify_state(session=timeline_data, state=notify_action, agent_info=agent) set_notify_state(session=timeline_data, state=notify_action, agent_info=agent, metadata=metadata)
elif not timeline_data and notify_action: elif not timeline_data and notify_action:
for agent in notifiers.available_notification_agents(): for agent in notifiers.available_notification_agents():
@ -314,39 +314,42 @@ def get_notify_state_timeline(timeline):
return notify_states return notify_states
def set_notify_state(session, state, agent_info): def set_notify_state(session, state, agent_info, metadata):
if session and state and agent_info: if session and state and agent_info:
monitor_db = database.MonitorDatabase() monitor_db = database.MonitorDatabase()
notify_time = int(time.time())
if state == 'play': if state == 'play':
values = {'on_play': int(time.time())} values = {'on_play': notify_time}
elif state == 'stop': elif state == 'stop':
values = {'on_stop': int(time.time())} values = {'on_stop': notify_time}
elif state == 'pause': elif state == 'pause':
values = {'on_pause': int(time.time())} values = {'on_pause': notify_time}
elif state == 'resume': elif state == 'resume':
values = {'on_resume': int(time.time())} values = {'on_resume': notify_time}
elif state == 'buffer': elif state == 'buffer':
values = {'on_buffer': int(time.time())} values = {'on_buffer': notify_time}
elif state == 'watched': elif state == 'watched':
values = {'on_watched': int(time.time())} values = {'on_watched': notify_time}
elif state == 'created': elif state == 'created':
values = {'on_created': int(time.time())} values = {'on_created': notify_time}
else: else:
return return
if state == 'created': if state == 'created':
keys = {'rating_key': session['rating_key'], keys = {'rating_key': session['rating_key'],
'agent_id': agent_info['id'], 'agent_id': agent_info['id'],
'agent_name': agent_info['name']} 'agent_name': agent_info['name'],
'poster_url': metadata.get('poster_url', None)}
else: else:
keys = {'session_key': session['session_key'], keys = {'session_key': session['session_key'],
'rating_key': session['rating_key'], 'rating_key': session['rating_key'],
'user_id': session['user_id'], 'user_id': session['user_id'],
'user': session['user'], 'user': session['user'],
'agent_id': agent_info['id'], 'agent_id': agent_info['id'],
'agent_name': agent_info['name']} 'agent_name': agent_info['name'],
'poster_url': metadata.get('poster_url', None)}
monitor_db.upsert(table_name='notify_log', key_dict=keys, value_dict=values) monitor_db.upsert(table_name='notify_log', key_dict=keys, value_dict=values)
else: else:
@ -512,11 +515,19 @@ def build_notify_text(session=None, timeline=None, state=None):
thumb = None thumb = None
if thumb: if thumb:
# Try to retrieve a poster_url from the database
data_factory = datafactory.DataFactory()
poster_url = data_factory.get_poster_url(rating_key=rating_key)
# If no previous poster_url
if not poster_url:
# Retrieve the poster from Plex and cache to file # Retrieve the poster from Plex and cache to file
urllib.urlretrieve(plexpy.CONFIG.PMS_URL + thumb + '?X-Plex-Token=' + plexpy.CONFIG.PMS_TOKEN, urllib.urlretrieve(plexpy.CONFIG.PMS_URL + thumb + '?X-Plex-Token=' + plexpy.CONFIG.PMS_TOKEN,
os.path.join(plexpy.CONFIG.CACHE_DIR, 'cache-poster.jpg')) os.path.join(plexpy.CONFIG.CACHE_DIR, 'cache-poster.jpg'))
# Upload thumb to Imgur and get link # Upload thumb to Imgur and get link
metadata['poster_url'] = helpers.uploadToImgur(os.path.join(plexpy.CONFIG.CACHE_DIR, 'cache-poster.jpg'), full_title) poster_url = helpers.uploadToImgur(os.path.join(plexpy.CONFIG.CACHE_DIR, 'cache-poster.jpg'), full_title)
metadata['poster_url'] = poster_url
# Fix metadata params for notify recently added grandparent # Fix metadata params for notify recently added grandparent
if state == 'created' and plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT: if state == 'created' and plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT:
@ -649,9 +660,9 @@ def build_notify_text(session=None, timeline=None, state=None):
except: except:
logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.")
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
else: else:
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
elif state == 'stop': elif state == 'stop':
# Default body text # Default body text
body_text = '%s (%s) has stopped %s' % (session['friendly_name'], body_text = '%s (%s) has stopped %s' % (session['friendly_name'],
@ -673,9 +684,9 @@ def build_notify_text(session=None, timeline=None, state=None):
except: except:
logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.")
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
else: else:
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
elif state == 'pause': elif state == 'pause':
# Default body text # Default body text
body_text = '%s (%s) has paused %s' % (session['friendly_name'], body_text = '%s (%s) has paused %s' % (session['friendly_name'],
@ -697,9 +708,9 @@ def build_notify_text(session=None, timeline=None, state=None):
except: except:
logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.")
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
else: else:
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
elif state == 'resume': elif state == 'resume':
# Default body text # Default body text
body_text = '%s (%s) has resumed %s' % (session['friendly_name'], body_text = '%s (%s) has resumed %s' % (session['friendly_name'],
@ -721,9 +732,9 @@ def build_notify_text(session=None, timeline=None, state=None):
except: except:
logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.")
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
else: else:
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
elif state == 'buffer': elif state == 'buffer':
# Default body text # Default body text
body_text = '%s (%s) is buffering %s' % (session['friendly_name'], body_text = '%s (%s) is buffering %s' % (session['friendly_name'],
@ -745,9 +756,9 @@ def build_notify_text(session=None, timeline=None, state=None):
except: except:
logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.")
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
else: else:
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
elif state == 'watched': elif state == 'watched':
# Default body text # Default body text
body_text = '%s (%s) has watched %s' % (session['friendly_name'], body_text = '%s (%s) has watched %s' % (session['friendly_name'],
@ -769,9 +780,9 @@ def build_notify_text(session=None, timeline=None, state=None):
except: except:
logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.")
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
else: else:
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
elif state == 'created': elif state == 'created':
# Default body text # Default body text
body_text = '%s was recently added to Plex.' % full_title body_text = '%s was recently added to Plex.' % full_title
@ -791,9 +802,9 @@ def build_notify_text(session=None, timeline=None, state=None):
except: except:
logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.")
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
else: else:
return [subject_text, body_text, script_args, metadata] return [subject_text, body_text, script_args], metadata
else: else:
return None return None