From 1ff58a85dc2305d21c888fcad291a24644c3023d Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 18 Oct 2015 10:27:18 -0700 Subject: [PATCH 01/84] Fix bug in "Last Watched" statistics *Fix if two users watched the same item, it would only show the most recent user. --- plexpy/datafactory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index f09ae30c..1ffdc2e5 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -564,7 +564,7 @@ class DataFactory(object): 'AND (session_history_metadata.media_type = "movie" ' \ 'OR session_history_metadata.media_type = "episode") ' \ 'AND percent_complete >= %s ' \ - 'GROUP BY session_history_metadata.full_title ' \ + 'GROUP BY session_history.id ' \ 'ORDER BY last_watch DESC ' \ 'LIMIT %s' % (time_range, notify_watched_percent, stats_count) result = monitor_db.select(query) From 2243cd1de9a12f7e4c38c9ef7bc24f595939b5e4 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 18 Oct 2015 11:50:01 -0700 Subject: [PATCH 02/84] Add filtering of media_type from history table --- data/interfaces/default/history.html | 55 ++++++++++++++++++++++------ data/interfaces/default/user.html | 42 ++++++++++++++++++--- plexpy/datatables.py | 13 ++++--- plexpy/webserve.py | 17 +++++---- 4 files changed, 98 insertions(+), 29 deletions(-) diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html index 3f589390..050e82c4 100644 --- a/data/interfaces/default/history.html +++ b/data/interfaces/default/history.html @@ -76,19 +76,52 @@ % endif +% if data['type'] != 'library': + +% endif % if data['type'] != 'library' and data['rating']: -% if data['type'] == 'library': +% if data['media_type'] == 'library': -% elif data['type'] == 'show' or data['type'] == 'artist': +% elif data['media_type'] == 'show' or data['media_type'] == 'artist': -% elif data['type'] == 'season' or data['type'] == 'album': +% elif data['media_type'] == 'season' or data['media_type'] == 'album': -% elif data['type'] == 'episode' or data['type'] == 'track' or data['type'] == 'movie': +% elif data['media_type'] == 'episode' or data['media_type'] == 'track' or data['media_type'] == 'movie': -% if data['type'] == 'show' or data['type'] == 'season' or data['type'] == 'artist' or data['type'] == 'album': +% if data['media_type'] == 'show' or data['media_type'] == 'season' or data['media_type'] == 'artist' or data['media_type'] == 'album': % endif -% if data['type'] != 'library': +% if data['media_type'] != 'library': % endif -% if data['type'] != 'library' and data['rating']: +% if data['media_type'] != 'library' and data['rating']: diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 75873d0b..c15be036 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -515,7 +515,7 @@ available_notification_agents = notifiers.available_notification_agents() here to view usage information.


- +
  • +
    Server Down
    +
      +
    • +
      + + +

      Set a custom subject line.

      +
      +
      + + +

      Set a custom body.

      +
      +
      • +
    +

    • diff --git a/plexpy/config.py b/plexpy/config.py index 4415f2cd..00b3dac5 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -46,6 +46,7 @@ _CONFIG_DEFINITIONS = { 'BOXCAR_ON_BUFFER': (int, 'Boxcar', 0), 'BOXCAR_ON_WATCHED': (int, 'Boxcar', 0), 'BOXCAR_ON_CREATED': (int, 'Boxcar', 0), + 'BOXCAR_ON_DOWN': (int, 'Boxcar', 0), 'BUFFER_THRESHOLD': (int, 'Monitoring', 3), 'BUFFER_WAIT': (int, 'Monitoring', 900), 'CACHE_DIR': (str, 'General', ''), @@ -71,6 +72,7 @@ _CONFIG_DEFINITIONS = { 'EMAIL_ON_BUFFER': (int, 'Email', 0), 'EMAIL_ON_WATCHED': (int, 'Email', 0), 'EMAIL_ON_CREATED': (int, 'Email', 0), + 'EMAIL_ON_DOWN': (int, 'Email', 0), 'ENABLE_HTTPS': (int, 'General', 0), 'FIRST_RUN_COMPLETE': (int, 'General', 0), 'FREEZE_DB': (int, 'General', 0), @@ -88,6 +90,7 @@ _CONFIG_DEFINITIONS = { 'GROWL_ON_BUFFER': (int, 'Growl', 0), 'GROWL_ON_WATCHED': (int, 'Growl', 0), 'GROWL_ON_CREATED': (int, 'Growl', 0), + 'GROWL_ON_DOWN': (int, 'Growl', 0), 'HOME_LIBRARY_CARDS': (str, 'General', 'library_statistics_first'), 'HOME_STATS_LENGTH': (int, 'General', 30), 'HOME_STATS_TYPE': (int, 'General', 0), @@ -113,6 +116,7 @@ _CONFIG_DEFINITIONS = { 'IFTTT_ON_BUFFER': (int, 'IFTTT', 0), 'IFTTT_ON_WATCHED': (int, 'IFTTT', 0), 'IFTTT_ON_CREATED': (int, 'IFTTT', 0), + 'IFTTT_ON_DOWN': (int, 'IFTTT', 0), 'JOURNAL_MODE': (str, 'Advanced', 'wal'), 'LAUNCH_BROWSER': (int, 'General', 1), 'LOG_DIR': (str, 'General', ''), @@ -138,6 +142,7 @@ _CONFIG_DEFINITIONS = { 'NMA_ON_BUFFER': (int, 'NMA', 0), 'NMA_ON_WATCHED': (int, 'NMA', 0), 'NMA_ON_CREATED': (int, 'NMA', 0), + 'NMA_ON_DOWN': (int, 'NMA', 0), 'NOTIFY_CONSECUTIVE': (int, 'Monitoring', 1), 'NOTIFY_RECENTLY_ADDED_GRANDPARENT': (int, 'Monitoring', 0), 'NOTIFY_RECENTLY_ADDED_DELAY': (int, 'Monitoring', 60), @@ -156,6 +161,8 @@ _CONFIG_DEFINITIONS = { 'NOTIFY_ON_WATCHED_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has watched {title}.'), 'NOTIFY_ON_CREATED_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), 'NOTIFY_ON_CREATED_BODY_TEXT': (str, 'Monitoring', '{title} was recently added to Plex.'), + 'NOTIFY_ON_DOWN_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_DOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex server is down.'), 'OSX_NOTIFY_APP': (str, 'OSX_Notify', '/Applications/PlexPy'), 'OSX_NOTIFY_ENABLED': (int, 'OSX_Notify', 0), 'OSX_NOTIFY_ON_PLAY': (int, 'OSX_Notify', 0), @@ -165,6 +172,7 @@ _CONFIG_DEFINITIONS = { 'OSX_NOTIFY_ON_BUFFER': (int, 'OSX_Notify', 0), 'OSX_NOTIFY_ON_WATCHED': (int, 'OSX_Notify', 0), 'OSX_NOTIFY_ON_CREATED': (int, 'OSX_Notify', 0), + 'OSX_NOTIFY_ON_DOWN': (int, 'OSX_Notify', 0), 'PLEX_CLIENT_HOST': (str, 'Plex', ''), 'PLEX_ENABLED': (int, 'Plex', 0), 'PLEX_PASSWORD': (str, 'Plex', ''), @@ -176,6 +184,7 @@ _CONFIG_DEFINITIONS = { 'PLEX_ON_BUFFER': (int, 'Plex', 0), 'PLEX_ON_WATCHED': (int, 'Plex', 0), 'PLEX_ON_CREATED': (int, 'Plex', 0), + 'PLEX_ON_DOWN': (int, 'Plex', 0), 'PROWL_ENABLED': (int, 'Prowl', 0), 'PROWL_KEYS': (str, 'Prowl', ''), 'PROWL_PRIORITY': (int, 'Prowl', 0), @@ -186,6 +195,7 @@ _CONFIG_DEFINITIONS = { 'PROWL_ON_BUFFER': (int, 'Prowl', 0), 'PROWL_ON_WATCHED': (int, 'Prowl', 0), 'PROWL_ON_CREATED': (int, 'Prowl', 0), + 'PROWL_ON_DOWN': (int, 'Prowl', 0), 'PUSHALOT_APIKEY': (str, 'Pushalot', ''), 'PUSHALOT_ENABLED': (int, 'Pushalot', 0), 'PUSHALOT_ON_PLAY': (int, 'Pushalot', 0), @@ -195,6 +205,7 @@ _CONFIG_DEFINITIONS = { 'PUSHALOT_ON_BUFFER': (int, 'Pushalot', 0), 'PUSHALOT_ON_WATCHED': (int, 'Pushalot', 0), 'PUSHALOT_ON_CREATED': (int, 'Pushalot', 0), + 'PUSHALOT_ON_DOWN': (int, 'Pushalot', 0), 'PUSHBULLET_APIKEY': (str, 'PushBullet', ''), 'PUSHBULLET_DEVICEID': (str, 'PushBullet', ''), 'PUSHBULLET_CHANNEL_TAG': (str, 'PushBullet', ''), @@ -206,6 +217,7 @@ _CONFIG_DEFINITIONS = { 'PUSHBULLET_ON_BUFFER': (int, 'PushBullet', 0), 'PUSHBULLET_ON_WATCHED': (int, 'PushBullet', 0), 'PUSHBULLET_ON_CREATED': (int, 'PushBullet', 0), + 'PUSHBULLET_ON_DOWN': (int, 'PushBullet', 0), 'PUSHOVER_APITOKEN': (str, 'Pushover', ''), 'PUSHOVER_ENABLED': (int, 'Pushover', 0), 'PUSHOVER_KEYS': (str, 'Pushover', ''), @@ -218,6 +230,7 @@ _CONFIG_DEFINITIONS = { 'PUSHOVER_ON_BUFFER': (int, 'Pushover', 0), 'PUSHOVER_ON_WATCHED': (int, 'Pushover', 0), 'PUSHOVER_ON_CREATED': (int, 'Pushover', 0), + 'PUSHOVER_ON_DOWN': (int, 'Pushover', 0), 'REFRESH_USERS_INTERVAL': (int, 'Monitoring', 12), 'REFRESH_USERS_ON_STARTUP': (int, 'Monitoring', 1), 'TELEGRAM_BOT_TOKEN': (str, 'Telegram', ''), @@ -230,6 +243,7 @@ _CONFIG_DEFINITIONS = { 'TELEGRAM_ON_BUFFER': (int, 'Telegram', 0), 'TELEGRAM_ON_WATCHED': (int, 'Telegram', 0), 'TELEGRAM_ON_CREATED': (int, 'Telegram', 0), + 'TELEGRAM_ON_DOWN': (int, 'Telegram', 0), 'TV_NOTIFY_ENABLE': (int, 'Monitoring', 0), 'TV_NOTIFY_ON_START': (int, 'Monitoring', 1), 'TV_NOTIFY_ON_STOP': (int, 'Monitoring', 0), @@ -245,6 +259,7 @@ _CONFIG_DEFINITIONS = { 'TWITTER_ON_BUFFER': (int, 'Twitter', 0), 'TWITTER_ON_WATCHED': (int, 'Twitter', 0), 'TWITTER_ON_CREATED': (int, 'Twitter', 0), + 'TWITTER_ON_DOWN': (int, 'Twitter', 0), 'UPDATE_DB_INTERVAL': (int, 'General', 24), 'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1), 'VIDEO_LOGGING_ENABLE': (int, 'Monitoring', 1), @@ -258,7 +273,8 @@ _CONFIG_DEFINITIONS = { 'XBMC_ON_RESUME': (int, 'XBMC', 0), 'XBMC_ON_BUFFER': (int, 'XBMC', 0), 'XBMC_ON_WATCHED': (int, 'XBMC', 0), - 'XBMC_ON_CREATED': (int, 'XBMC', 0) + 'XBMC_ON_CREATED': (int, 'XBMC', 0), + 'XBMC_ON_DOWN': (int, 'XBMC', 0) } # pylint:disable=R0902 # it might be nice to refactor for fewer instance variables diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index fae6db6b..1e1768c9 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -179,6 +179,14 @@ def notify_timeline(timeline_data=None, notify_action=None): body=notify_strings[1]) # Set the notification state in the db set_notify_state(session=timeline_data, state=notify_action, agent_info=agent) + elif notify_action == 'down': + for agent in notifiers.available_notification_agents(): + if agent['on_down'] and notify_action == 'down': + # Build and send notification + notify_strings = build_server_notify_text(state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) else: logger.debug(u"PlexPy Notifier :: Notify timeline called but incomplete data received.") @@ -583,6 +591,42 @@ def build_notify_text(session=None, timeline=None, state=None): else: return None +def build_server_notify_text(state=None): + # Get the server name + server_name = plexpy.CONFIG.PMS_NAME + + on_down_subject = plexpy.CONFIG.NOTIFY_ON_DOWN_SUBJECT_TEXT + on_down_body = plexpy.CONFIG.NOTIFY_ON_DOWN_BODY_TEXT + + available_params = {'server_name': server_name} + + # Default text + subject_text = 'PlexPy (%s)' % server_name + + if state == 'down': + # Default body text + body_text = 'Unable to get a response from the server.' + + if on_down_subject and on_down_body: + try: + subject_text = unicode(on_down_subject).format(**available_params) + except LookupError, e: + logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + except: + logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + + try: + body_text = unicode(on_down_body).format(**available_params) + except LookupError, e: + logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + except: + logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + + return [subject_text, body_text] + else: + return [subject_text, body_text] + else: + return None def strip_tag(data): import re diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index 2589d388..863a597e 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -66,7 +66,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.GROWL_ON_RESUME, 'on_buffer': plexpy.CONFIG.GROWL_ON_BUFFER, 'on_watched': plexpy.CONFIG.GROWL_ON_WATCHED, - 'on_created': plexpy.CONFIG.GROWL_ON_CREATED + 'on_created': plexpy.CONFIG.GROWL_ON_CREATED, + 'on_down': plexpy.CONFIG.GROWL_ON_DOWN }, {'name': 'Prowl', 'id': AGENT_IDS['Prowl'], @@ -79,7 +80,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.PROWL_ON_RESUME, 'on_buffer': plexpy.CONFIG.PROWL_ON_BUFFER, 'on_watched': plexpy.CONFIG.PROWL_ON_WATCHED, - 'on_created': plexpy.CONFIG.PROWL_ON_CREATED + 'on_created': plexpy.CONFIG.PROWL_ON_CREATED, + 'on_down': plexpy.CONFIG.PROWL_ON_DOWN }, {'name': 'XBMC', 'id': AGENT_IDS['XBMC'], @@ -92,7 +94,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.XBMC_ON_RESUME, 'on_buffer': plexpy.CONFIG.XBMC_ON_BUFFER, 'on_watched': plexpy.CONFIG.XBMC_ON_WATCHED, - 'on_created': plexpy.CONFIG.XBMC_ON_CREATED + 'on_created': plexpy.CONFIG.XBMC_ON_CREATED, + 'on_down': plexpy.CONFIG.XBMC_ON_DOWN }, {'name': 'Plex', 'id': AGENT_IDS['Plex'], @@ -105,7 +108,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.PLEX_ON_RESUME, 'on_buffer': plexpy.CONFIG.PLEX_ON_BUFFER, 'on_watched': plexpy.CONFIG.PLEX_ON_WATCHED, - 'on_created': plexpy.CONFIG.PLEX_ON_CREATED + 'on_created': plexpy.CONFIG.PLEX_ON_CREATED, + 'on_down': plexpy.CONFIG.PLEX_ON_DOWN }, {'name': 'NotifyMyAndroid', 'id': AGENT_IDS['NMA'], @@ -118,7 +122,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.NMA_ON_RESUME, 'on_buffer': plexpy.CONFIG.NMA_ON_BUFFER, 'on_watched': plexpy.CONFIG.NMA_ON_WATCHED, - 'on_created': plexpy.CONFIG.NMA_ON_CREATED + 'on_created': plexpy.CONFIG.NMA_ON_CREATED, + 'on_down': plexpy.CONFIG.NMA_ON_DOWN }, {'name': 'Pushalot', 'id': AGENT_IDS['Pushalot'], @@ -131,7 +136,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.PUSHALOT_ON_RESUME, 'on_buffer': plexpy.CONFIG.PUSHALOT_ON_BUFFER, 'on_watched': plexpy.CONFIG.PUSHALOT_ON_WATCHED, - 'on_created': plexpy.CONFIG.PUSHALOT_ON_CREATED + 'on_created': plexpy.CONFIG.PUSHALOT_ON_CREATED, + 'on_down': plexpy.CONFIG.PUSHALOT_ON_DOWN }, {'name': 'Pushbullet', 'id': AGENT_IDS['Pushbullet'], @@ -144,7 +150,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.PUSHBULLET_ON_RESUME, 'on_buffer': plexpy.CONFIG.PUSHBULLET_ON_BUFFER, 'on_watched': plexpy.CONFIG.PUSHBULLET_ON_WATCHED, - 'on_created': plexpy.CONFIG.PUSHBULLET_ON_CREATED + 'on_created': plexpy.CONFIG.PUSHBULLET_ON_CREATED, + 'on_down': plexpy.CONFIG.PUSHBULLET_ON_DOWN }, {'name': 'Pushover', 'id': AGENT_IDS['Pushover'], @@ -157,7 +164,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.PUSHOVER_ON_RESUME, 'on_buffer': plexpy.CONFIG.PUSHOVER_ON_BUFFER, 'on_watched': plexpy.CONFIG.PUSHOVER_ON_WATCHED, - 'on_created': plexpy.CONFIG.PUSHOVER_ON_CREATED + 'on_created': plexpy.CONFIG.PUSHOVER_ON_CREATED, + 'on_down': plexpy.CONFIG.PUSHOVER_ON_DOWN }, {'name': 'Boxcar2', 'id': AGENT_IDS['Boxcar2'], @@ -170,7 +178,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.BOXCAR_ON_RESUME, 'on_buffer': plexpy.CONFIG.BOXCAR_ON_BUFFER, 'on_watched': plexpy.CONFIG.BOXCAR_ON_WATCHED, - 'on_created': plexpy.CONFIG.BOXCAR_ON_CREATED + 'on_created': plexpy.CONFIG.BOXCAR_ON_CREATED, + 'on_down': plexpy.CONFIG.BOXCAR_ON_DOWN }, {'name': 'E-mail', 'id': AGENT_IDS['Email'], @@ -183,7 +192,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.EMAIL_ON_RESUME, 'on_buffer': plexpy.CONFIG.EMAIL_ON_BUFFER, 'on_watched': plexpy.CONFIG.EMAIL_ON_WATCHED, - 'on_created': plexpy.CONFIG.EMAIL_ON_CREATED + 'on_created': plexpy.CONFIG.EMAIL_ON_CREATED, + 'on_down': plexpy.CONFIG.EMAIL_ON_DOWN }, {'name': 'Twitter', 'id': AGENT_IDS['Twitter'], @@ -196,7 +206,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.TWITTER_ON_RESUME, 'on_buffer': plexpy.CONFIG.TWITTER_ON_BUFFER, 'on_watched': plexpy.CONFIG.TWITTER_ON_WATCHED, - 'on_created': plexpy.CONFIG.TWITTER_ON_CREATED + 'on_created': plexpy.CONFIG.TWITTER_ON_CREATED, + 'on_down': plexpy.CONFIG.TWITTER_ON_DOWN }, {'name': 'IFTTT', 'id': AGENT_IDS['IFTTT'], @@ -209,7 +220,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.IFTTT_ON_RESUME, 'on_buffer': plexpy.CONFIG.IFTTT_ON_BUFFER, 'on_watched': plexpy.CONFIG.IFTTT_ON_WATCHED, - 'on_created': plexpy.CONFIG.IFTTT_ON_CREATED + 'on_created': plexpy.CONFIG.IFTTT_ON_CREATED, + 'on_down': plexpy.CONFIG.IFTTT_ON_DOWN }, {'name': 'Telegram', 'id': AGENT_IDS['Telegram'], @@ -222,7 +234,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.TELEGRAM_ON_RESUME, 'on_buffer': plexpy.CONFIG.TELEGRAM_ON_BUFFER, 'on_watched': plexpy.CONFIG.TELEGRAM_ON_WATCHED, - 'on_created': plexpy.CONFIG.TELEGRAM_ON_CREATED + 'on_created': plexpy.CONFIG.TELEGRAM_ON_CREATED, + 'on_down': plexpy.CONFIG.TELEGRAM_ON_DOWN } ] @@ -240,7 +253,8 @@ def available_notification_agents(): 'on_resume': plexpy.CONFIG.OSX_NOTIFY_ON_RESUME, 'on_buffer': plexpy.CONFIG.OSX_NOTIFY_ON_BUFFER, 'on_watched': plexpy.CONFIG.OSX_NOTIFY_ON_WATCHED, - 'on_created': plexpy.CONFIG.OSX_NOTIFY_ON_CREATED + 'on_created': plexpy.CONFIG.OSX_NOTIFY_ON_CREATED, + 'on_down': plexpy.CONFIG.OSX_NOTIFY_ON_DOWN }) return agents diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 249b1360..97bf78cf 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -462,6 +462,8 @@ class WebInterface(object): "notify_on_watched_body_text": plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT, "notify_on_created_subject_text": plexpy.CONFIG.NOTIFY_ON_CREATED_SUBJECT_TEXT, "notify_on_created_body_text": plexpy.CONFIG.NOTIFY_ON_CREATED_BODY_TEXT, + "notify_on_down_subject_text": plexpy.CONFIG.NOTIFY_ON_DOWN_SUBJECT_TEXT, + "notify_on_down_body_text": plexpy.CONFIG.NOTIFY_ON_DOWN_BODY_TEXT, "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH, "home_stats_type": checked(plexpy.CONFIG.HOME_STATS_TYPE), "home_stats_count": plexpy.CONFIG.HOME_STATS_COUNT, From 4d87666a42e72449fca9748f101a8667b146d1da Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Mon, 16 Nov 2015 23:19:59 -0800 Subject: [PATCH 59/84] Schedule job to check if server down --- plexpy/__init__.py | 2 ++ plexpy/activity_pinger.py | 20 ++++++++++++++++++++ plexpy/pmsconnect.py | 15 ++++++++++++++- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 39c9a470..9e3e25c6 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -287,6 +287,8 @@ def initialize_scheduler(): hours=12, minutes=0, seconds=0) schedule_job(activity_pinger.check_recently_added, 'Check for recently added items', hours=0, minutes=0, seconds=seconds) + schedule_job(activity_pinger.check_server_response, 'Check for server response', + hours=0, minutes=0, seconds=seconds) # If we're not using websockets then fall back to polling if not CONFIG.MONITORING_USE_WEBSOCKET or POLLING_FAILOVER: diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index baa280d2..9db9dd32 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -20,6 +20,7 @@ import plexpy import time monitor_lock = threading.Lock() +ping_count = 0 def check_active_sessions(ws_request=False): @@ -219,3 +220,22 @@ def check_recently_added(): # Fire off notifications threading.Thread(target=notification_handler.notify_timeline, kwargs=dict(timeline_data=item, notify_action='created')).start() + + +def check_server_response(): + + with monitor_lock: + pms_connect = pmsconnect.PmsConnect() + response = pms_connect.get_server_response() + global ping_count + + if not response: + ping_count += 1 + logger.warn(u"PlexPy Monitor :: Unable to get a response from the server, ping attempt %s." % str(ping_count)) + + if ping_count == 3: + # Fire off notifications + threading.Thread(target=notification_handler.notify_timeline, + kwargs=dict(notify_action='down')).start() + else: + ping_count = 0 \ No newline at end of file diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 9ab4fd80..e647b34c 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -1648,4 +1648,17 @@ class PmsConnect(object): 'children': parents} } - return key_list \ No newline at end of file + return key_list + + """ + Check for a server response. + + Output: bool + """ + def get_server_response(self): + response = self.get_server_list() + + if not response: + return False + else: + return True From 707c30b0afcce5f23be66c389815b894f525f67a Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Mon, 16 Nov 2015 23:28:43 -0800 Subject: [PATCH 60/84] Fix missing pmsconnect --- plexpy/notification_handler.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 1e1768c9..5282bb3c 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -269,6 +269,7 @@ def set_notify_state(session, state, agent_info): def build_notify_text(session=None, timeline=None, state=None): + from plexpy import pmsconnect import re # Get the server name @@ -280,6 +281,7 @@ def build_notify_text(session=None, timeline=None, state=None): elif timeline: rating_key = timeline['rating_key'] + pms_connect = pmsconnect.PmsConnect() metadata_list = pms_connect.get_metadata_details(rating_key=rating_key) if metadata_list: From 1c4df69e616745896d11a2c962ee4f48e86c1d30 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Mon, 16 Nov 2015 23:52:03 -0800 Subject: [PATCH 61/84] Toggle bell icon for on_down --- data/interfaces/default/settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 477678d7..2ae60de4 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -692,7 +692,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents() % for agent in available_notification_agents:
  • - % if agent['on_play'] or agent['on_stop'] or agent['on_pause'] or agent['on_resume'] or agent['on_buffer'] or agent['on_watched'] or agent['on_created']: + % if agent['on_play'] or agent['on_stop'] or agent['on_pause'] or agent['on_resume'] or agent['on_buffer'] or agent['on_watched'] or agent['on_created'] or agent['on_down']: % else: From c3ea35806ef3c470af66f9dac8b10060bf5e5e90 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 17 Nov 2015 06:57:02 -0800 Subject: [PATCH 62/84] Move check for server down to check_active_sessions --- plexpy/__init__.py | 2 -- plexpy/activity_pinger.py | 34 ++++++++++++++-------------------- plexpy/notification_handler.py | 2 +- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 9e3e25c6..39c9a470 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -287,8 +287,6 @@ def initialize_scheduler(): hours=12, minutes=0, seconds=0) schedule_job(activity_pinger.check_recently_added, 'Check for recently added items', hours=0, minutes=0, seconds=seconds) - schedule_job(activity_pinger.check_server_response, 'Check for server response', - hours=0, minutes=0, seconds=seconds) # If we're not using websockets then fall back to polling if not CONFIG.MONITORING_USE_WEBSOCKET or POLLING_FAILOVER: diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index 9db9dd32..c1701769 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -163,6 +163,19 @@ def check_active_sessions(ws_request=False): monitor_process.write_session(session) else: logger.debug(u"PlexPy Monitor :: Unable to read session list.") + response = pms_connect.get_server_response() + global ping_count + + if not response: + ping_count += 1 + logger.warn(u"PlexPy Monitor :: Unable to get a response from the server, ping attempt %s." % str(ping_count)) + + if ping_count == 3: + # Fire off notifications + threading.Thread(target=notification_handler.notify_timeline, + kwargs=dict(notify_action='down')).start() + else: + ping_count = 0 def check_recently_added(): @@ -219,23 +232,4 @@ def check_recently_added(): # Fire off notifications threading.Thread(target=notification_handler.notify_timeline, - kwargs=dict(timeline_data=item, notify_action='created')).start() - - -def check_server_response(): - - with monitor_lock: - pms_connect = pmsconnect.PmsConnect() - response = pms_connect.get_server_response() - global ping_count - - if not response: - ping_count += 1 - logger.warn(u"PlexPy Monitor :: Unable to get a response from the server, ping attempt %s." % str(ping_count)) - - if ping_count == 3: - # Fire off notifications - threading.Thread(target=notification_handler.notify_timeline, - kwargs=dict(notify_action='down')).start() - else: - ping_count = 0 \ No newline at end of file + kwargs=dict(timeline_data=item, notify_action='created')).start() \ No newline at end of file diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 5282bb3c..c9db601a 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -179,7 +179,7 @@ def notify_timeline(timeline_data=None, notify_action=None): body=notify_strings[1]) # Set the notification state in the db set_notify_state(session=timeline_data, state=notify_action, agent_info=agent) - elif notify_action == 'down': + elif not timeline_data and notify_action: for agent in notifiers.available_notification_agents(): if agent['on_down'] and notify_action == 'down': # Build and send notification From 4fffbf8a0cefacc129062bfda9b97b1d4496aad6 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 17 Nov 2015 19:31:13 -0800 Subject: [PATCH 63/84] Add server uptime --- data/interfaces/default/settings.html | 4 ++++ plexpy/activity_pinger.py | 4 +++- plexpy/helpers.py | 27 ++++++++++++++++++++++++- plexpy/notification_handler.py | 29 ++++++++++++++++++++++++--- plexpy/plextv.py | 19 ++++++++++++++++++ 5 files changed, 78 insertions(+), 5 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 2ae60de4..3d78c3e4 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -902,6 +902,10 @@ available_notification_agents = sorted(notifiers.available_notification_agents() {server_name} The name of your Plex Server. + + {server_uptime} + The uptime (in days, hours, mins, secs) of your Plex Server. + {user} The username of the person streaming. diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index c1701769..d01b49c1 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -26,6 +26,8 @@ ping_count = 0 def check_active_sessions(ws_request=False): with monitor_lock: + global ping_count + pms_connect = pmsconnect.PmsConnect() session_list = pms_connect.get_current_activity() monitor_db = database.MonitorDatabase() @@ -33,6 +35,7 @@ def check_active_sessions(ws_request=False): # logger.debug(u"PlexPy Monitor :: Checking for active streams.") if session_list: + ping_count = 0 media_container = session_list['sessions'] # Check our temp table for what we must do with the new streams @@ -164,7 +167,6 @@ def check_active_sessions(ws_request=False): else: logger.debug(u"PlexPy Monitor :: Unable to read session list.") response = pms_connect.get_server_response() - global ping_count if not response: ping_count += 1 diff --git a/plexpy/helpers.py b/plexpy/helpers.py index f81cbd84..fbefaaa1 100644 --- a/plexpy/helpers.py +++ b/plexpy/helpers.py @@ -1,4 +1,4 @@ -# This file is part of PlexPy. +# This file is part of PlexPy. # # PlexPy is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -144,6 +144,31 @@ def now(): now = datetime.datetime.now() return now.strftime("%Y-%m-%d %H:%M:%S") +def human_duration(s): + + hd = '' + + if str(s).isdigit(): + d = int(s / 84600) + h = int((s % 84600) / 3600) + m = int(((s % 84600) % 3600) / 60) + s = int(((s % 84600) % 3600) % 60) + + hd_list = [] + if d > 0: + hd_list.append(str(d) + ' days') + if h > 0: + hd_list.append(str(h) + ' hrs') + if m > 0: + hd_list.append(str(m) + ' mins') + if s > 0: + hd_list.append(str(s) + ' secs') + + hd = ' '.join(hd_list) + + return hd + else: + return hd def get_age(date): diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index c9db601a..09a3a417 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with PlexPy. If not, see . -from plexpy import logger, config, notifiers, database, helpers +from plexpy import logger, config, notifiers, database, helpers, plextv, pmsconnect import plexpy import time @@ -269,12 +269,22 @@ def set_notify_state(session, state, agent_info): def build_notify_text(session=None, timeline=None, state=None): - from plexpy import pmsconnect import re # Get the server name server_name = plexpy.CONFIG.PMS_NAME + # Get the server uptime + plex_tv = plextv.PlexTV() + server_times = plex_tv.get_server_times() + + if server_times: + updated_at = server_times[0]['updated_at'] + server_uptime = helpers.human_duration(int(time.time() - helpers.cast_to_float(updated_at))) + else: + logger.error(u"PlexPy Notifier :: Unable to retrieve server uptime.") + server_uptime = 'N/A' + # Get metadata feed for item if session: rating_key = session['rating_key'] @@ -388,6 +398,7 @@ def build_notify_text(session=None, timeline=None, state=None): progress_percent = helpers.get_percent(view_offset, duration) available_params = {'server_name': server_name, + 'server_uptime': server_uptime, 'user': user, 'platform': platform, 'player': player, @@ -597,10 +608,22 @@ def build_server_notify_text(state=None): # Get the server name server_name = plexpy.CONFIG.PMS_NAME + # Get the server uptime + plex_tv = plextv.PlexTV() + server_times = plex_tv.get_server_times() + + if server_times: + updated_at = server_times[0]['updated_at'] + server_uptime = helpers.human_duration(int(time.time() - helpers.cast_to_float(updated_at))) + else: + logger.error(u"PlexPy Notifier :: Unable to retrieve server uptime.") + server_uptime = 'N/A' + on_down_subject = plexpy.CONFIG.NOTIFY_ON_DOWN_SUBJECT_TEXT on_down_body = plexpy.CONFIG.NOTIFY_ON_DOWN_BODY_TEXT - available_params = {'server_name': server_name} + available_params = {'server_name': server_name, + 'server_uptime': server_uptime} # Default text subject_text = 'PlexPy (%s)' % server_name diff --git a/plexpy/plextv.py b/plexpy/plextv.py index 03372fdc..4610121a 100644 --- a/plexpy/plextv.py +++ b/plexpy/plextv.py @@ -444,3 +444,22 @@ class PlexTV(object): return clean_servers return json.dumps(clean_servers, indent=4) + + def get_server_times(self): + servers = self.get_plextv_server_list(output_format='xml') + server_times = [] + + try: + xml_head = servers.getElementsByTagName('Server') + except: + logger.warn("Error parsing XML for Plex servers.") + return [] + + for a in xml_head: + if helpers.get_xml_attr(a, 'machineIdentifier') == plexpy.CONFIG.PMS_IDENTIFIER: + server_times.append({"created_at": helpers.get_xml_attr(a, 'createdAt'), + "updated_at": helpers.get_xml_attr(a, 'updatedAt') + }) + break + + return server_times From ca91adbd53888d8d686e4a4d8640c72a8dbab261 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 17 Nov 2015 21:54:54 -0800 Subject: [PATCH 64/84] Add check for Plex external port down --- plexpy/__init__.py | 2 ++ plexpy/activity_pinger.py | 76 +++++++++++++++++++++++++++------------ plexpy/plextv.py | 19 ++++++++++ 3 files changed, 75 insertions(+), 22 deletions(-) diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 39c9a470..9e3e25c6 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -287,6 +287,8 @@ def initialize_scheduler(): hours=12, minutes=0, seconds=0) schedule_job(activity_pinger.check_recently_added, 'Check for recently added items', hours=0, minutes=0, seconds=seconds) + schedule_job(activity_pinger.check_server_response, 'Check for server response', + hours=0, minutes=0, seconds=seconds) # If we're not using websockets then fall back to polling if not CONFIG.MONITORING_USE_WEBSOCKET or POLLING_FAILOVER: diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index d01b49c1..9f4b6a0e 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -13,21 +13,21 @@ # You should have received a copy of the GNU General Public License # along with PlexPy. If not, see . -from plexpy import logger, pmsconnect, notification_handler, database, helpers, activity_processor +from plexpy import logger, pmsconnect, plextv, notification_handler, database, helpers, activity_processor import threading import plexpy import time +import urllib2 monitor_lock = threading.Lock() -ping_count = 0 +ext_ping_count = 0 +int_ping_count = 0 def check_active_sessions(ws_request=False): with monitor_lock: - global ping_count - pms_connect = pmsconnect.PmsConnect() session_list = pms_connect.get_current_activity() monitor_db = database.MonitorDatabase() @@ -35,7 +35,6 @@ def check_active_sessions(ws_request=False): # logger.debug(u"PlexPy Monitor :: Checking for active streams.") if session_list: - ping_count = 0 media_container = session_list['sessions'] # Check our temp table for what we must do with the new streams @@ -166,19 +165,6 @@ def check_active_sessions(ws_request=False): monitor_process.write_session(session) else: logger.debug(u"PlexPy Monitor :: Unable to read session list.") - response = pms_connect.get_server_response() - - if not response: - ping_count += 1 - logger.warn(u"PlexPy Monitor :: Unable to get a response from the server, ping attempt %s." % str(ping_count)) - - if ping_count == 3: - # Fire off notifications - threading.Thread(target=notification_handler.notify_timeline, - kwargs=dict(notify_action='down')).start() - else: - ping_count = 0 - def check_recently_added(): @@ -201,7 +187,7 @@ def check_recently_added(): metadata = [metadata_list['metadata']] else: logger.error(u"PlexPy Monitor :: Unable to retrieve metadata for rating_key %s" \ - % str(item['rating_key'])) + % str(item['rating_key'])) else: metadata_list = pms_connect.get_metadata_children_details(item['rating_key']) @@ -209,7 +195,7 @@ def check_recently_added(): metadata = metadata_list['metadata'] else: logger.error(u"PlexPy Monitor :: Unable to retrieve children metadata for rating_key %s" \ - % str(item['rating_key'])) + % str(item['rating_key'])) if metadata: if not plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT: @@ -230,8 +216,54 @@ def check_recently_added(): item = metadata_list['metadata'] else: logger.error(u"PlexPy Monitor :: Unable to retrieve grandparent metadata for grandparent_rating_key %s" \ - % str(item['rating_key'])) + % str(item['rating_key'])) # Fire off notifications threading.Thread(target=notification_handler.notify_timeline, - kwargs=dict(timeline_data=item, notify_action='created')).start() \ No newline at end of file + kwargs=dict(timeline_data=item, notify_action='created')).start() + +def check_server_response(): + + with monitor_lock: + plex_tv = plextv.PlexTV() + external_response = plex_tv.get_server_response() + pms_connect = pmsconnect.PmsConnect() + internal_response = pms_connect.get_server_response() + + global ext_ping_count + global int_ping_count + + if not external_response: + ext_ping_count += 1 + logger.warn(u"PlexPy Monitor :: Plex remote access port mapping failed, ping attempt %s." \ + % str(ext_ping_count)) + else: + host = external_response[0]['host'] + port = external_response[0]['port'] + + try: + http_response = urllib2.urlopen('http://' + host + ':' + port) + except urllib2.HTTPError, e: + ext_ping_count = 0 + except urllib2.URLError, e: + ext_ping_count += 1 + logger.warn(u"PlexPy Monitor :: Unable to get an external response from the server, ping attempt %s." \ + % str(ext_ping_count)) + else: + ext_ping_count = 0 + + if not internal_response: + int_ping_count += 1 + logger.warn(u"PlexPy Monitor :: Unable to get an internal response from the server, ping attempt %s." \ + % str(int_ping_count)) + else: + int_ping_count = 0 + + if ext_ping_count == 3: + # Fire off notifications + threading.Thread(target=notification_handler.notify_timeline, + kwargs=dict(notify_action='extdown')).start() + if int_ping_count == 3: + # Fire off notifications + threading.Thread(target=notification_handler.notify_timeline, + kwargs=dict(notify_action='intdown')).start() \ No newline at end of file diff --git a/plexpy/plextv.py b/plexpy/plextv.py index 4610121a..76c55d69 100644 --- a/plexpy/plextv.py +++ b/plexpy/plextv.py @@ -463,3 +463,22 @@ class PlexTV(object): break return server_times + + def get_server_response(self): + response = self.get_plextv_server_list(output_format='xml') + + server_url = [] + + try: + xml_head = response.getElementsByTagName('Server') + except: + return False + + for a in xml_head: + if helpers.get_xml_attr(a, 'machineIdentifier') == plexpy.CONFIG.PMS_IDENTIFIER: + server_url.append({"host": helpers.get_xml_attr(a, 'host'), + "port": helpers.get_xml_attr(a, 'port') + }) + break + + return server_url \ No newline at end of file From 223e2b2b323f5cc1ac5495637dfc39f086cde5a9 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 17 Nov 2015 21:55:07 -0800 Subject: [PATCH 65/84] Add notification for Plex external port down --- .../default/notification_triggers_modal.html | 13 +++-- data/interfaces/default/settings.html | 43 ++++++++++++----- plexpy/config.py | 48 ++++++++++++------- plexpy/notification_handler.py | 46 ++++++++++++++---- plexpy/notifiers.py | 42 ++++++++++------ plexpy/webserve.py | 6 ++- 6 files changed, 142 insertions(+), 56 deletions(-) diff --git a/data/interfaces/default/notification_triggers_modal.html b/data/interfaces/default/notification_triggers_modal.html index f6da7604..8b752907 100644 --- a/data/interfaces/default/notification_triggers_modal.html +++ b/data/interfaces/default/notification_triggers_modal.html @@ -66,10 +66,17 @@ from plexpy import helpers
    -

    Trigger notification when the Plex Media Server cannot be reached.

    +

    Trigger notification when the Plex Media Server cannot be reached externally.

    +
    +
    + +

    Trigger notification when the Plex Media Server cannot be reached internally.

    diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 3d78c3e4..47cda611 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -538,7 +538,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
    • -
      Playback Start
      +
       Playback Start
      • @@ -555,7 +555,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
    • -
      Playback Stop
      +
       Playback Stop
      • @@ -572,7 +572,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
    • -
      Playback Pause
      +
       Playback Pause
      • @@ -589,7 +589,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
    • -
      Playback Resume
      +
       Playback Resume
      • @@ -606,7 +606,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
    • -
      Watched
      +
       Watched
      • @@ -623,7 +623,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
    • -
      Buffer Warnings
      +
       Buffer Warnings
      • @@ -642,7 +642,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
      • -
        Recently Added
        +
         Recently Added
        • @@ -659,17 +659,34 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
      • -
        Server Down
        +
         Plex External Port Down
        • - - + +

          Set a custom subject line.

          - - + + +

          Set a custom body.

          +
          +
          • +
        +
        • +
      • +
         Plex Server Down
        +
          +
        • +
          + + +

          Set a custom subject line.

          +
          +
          + +

          Set a custom body.

          • @@ -692,7 +709,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents() % for agent in available_notification_agents:
        • - % if agent['on_play'] or agent['on_stop'] or agent['on_pause'] or agent['on_resume'] or agent['on_buffer'] or agent['on_watched'] or agent['on_created'] or agent['on_down']: + % if agent['on_play'] or agent['on_stop'] or agent['on_pause'] or agent['on_resume'] or agent['on_buffer'] or agent['on_watched'] or agent['on_created'] or agent['on_extdown'] or agent['on_intdown']: % else: diff --git a/plexpy/config.py b/plexpy/config.py index 00b3dac5..ae233fe1 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -46,7 +46,8 @@ _CONFIG_DEFINITIONS = { 'BOXCAR_ON_BUFFER': (int, 'Boxcar', 0), 'BOXCAR_ON_WATCHED': (int, 'Boxcar', 0), 'BOXCAR_ON_CREATED': (int, 'Boxcar', 0), - 'BOXCAR_ON_DOWN': (int, 'Boxcar', 0), + 'BOXCAR_ON_EXTDOWN': (int, 'Boxcar', 0), + 'BOXCAR_ON_INTDOWN': (int, 'Boxcar', 0), 'BUFFER_THRESHOLD': (int, 'Monitoring', 3), 'BUFFER_WAIT': (int, 'Monitoring', 900), 'CACHE_DIR': (str, 'General', ''), @@ -72,7 +73,8 @@ _CONFIG_DEFINITIONS = { 'EMAIL_ON_BUFFER': (int, 'Email', 0), 'EMAIL_ON_WATCHED': (int, 'Email', 0), 'EMAIL_ON_CREATED': (int, 'Email', 0), - 'EMAIL_ON_DOWN': (int, 'Email', 0), + 'EMAIL_ON_EXTDOWN': (int, 'Email', 0), + 'EMAIL_ON_INTDOWN': (int, 'Email', 0), 'ENABLE_HTTPS': (int, 'General', 0), 'FIRST_RUN_COMPLETE': (int, 'General', 0), 'FREEZE_DB': (int, 'General', 0), @@ -90,7 +92,8 @@ _CONFIG_DEFINITIONS = { 'GROWL_ON_BUFFER': (int, 'Growl', 0), 'GROWL_ON_WATCHED': (int, 'Growl', 0), 'GROWL_ON_CREATED': (int, 'Growl', 0), - 'GROWL_ON_DOWN': (int, 'Growl', 0), + 'GROWL_ON_EXTDOWN': (int, 'Growl', 0), + 'GROWL_ON_INTDOWN': (int, 'Growl', 0), 'HOME_LIBRARY_CARDS': (str, 'General', 'library_statistics_first'), 'HOME_STATS_LENGTH': (int, 'General', 30), 'HOME_STATS_TYPE': (int, 'General', 0), @@ -116,7 +119,8 @@ _CONFIG_DEFINITIONS = { 'IFTTT_ON_BUFFER': (int, 'IFTTT', 0), 'IFTTT_ON_WATCHED': (int, 'IFTTT', 0), 'IFTTT_ON_CREATED': (int, 'IFTTT', 0), - 'IFTTT_ON_DOWN': (int, 'IFTTT', 0), + 'IFTTT_ON_EXTDOWN': (int, 'IFTTT', 0), + 'IFTTT_ON_INTDOWN': (int, 'IFTTT', 0), 'JOURNAL_MODE': (str, 'Advanced', 'wal'), 'LAUNCH_BROWSER': (int, 'General', 1), 'LOG_DIR': (str, 'General', ''), @@ -142,7 +146,8 @@ _CONFIG_DEFINITIONS = { 'NMA_ON_BUFFER': (int, 'NMA', 0), 'NMA_ON_WATCHED': (int, 'NMA', 0), 'NMA_ON_CREATED': (int, 'NMA', 0), - 'NMA_ON_DOWN': (int, 'NMA', 0), + 'NMA_ON_EXTDOWN': (int, 'NMA', 0), + 'NMA_ON_INTDOWN': (int, 'NMA', 0), 'NOTIFY_CONSECUTIVE': (int, 'Monitoring', 1), 'NOTIFY_RECENTLY_ADDED_GRANDPARENT': (int, 'Monitoring', 0), 'NOTIFY_RECENTLY_ADDED_DELAY': (int, 'Monitoring', 60), @@ -161,8 +166,10 @@ _CONFIG_DEFINITIONS = { 'NOTIFY_ON_WATCHED_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has watched {title}.'), 'NOTIFY_ON_CREATED_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), 'NOTIFY_ON_CREATED_BODY_TEXT': (str, 'Monitoring', '{title} was recently added to Plex.'), - 'NOTIFY_ON_DOWN_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_DOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex server is down.'), + 'NOTIFY_ON_EXTDOWN_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_EXTDOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex external port is down.'), + 'NOTIFY_ON_INTDOWN_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_INTDOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex server is down.'), 'OSX_NOTIFY_APP': (str, 'OSX_Notify', '/Applications/PlexPy'), 'OSX_NOTIFY_ENABLED': (int, 'OSX_Notify', 0), 'OSX_NOTIFY_ON_PLAY': (int, 'OSX_Notify', 0), @@ -172,7 +179,8 @@ _CONFIG_DEFINITIONS = { 'OSX_NOTIFY_ON_BUFFER': (int, 'OSX_Notify', 0), 'OSX_NOTIFY_ON_WATCHED': (int, 'OSX_Notify', 0), 'OSX_NOTIFY_ON_CREATED': (int, 'OSX_Notify', 0), - 'OSX_NOTIFY_ON_DOWN': (int, 'OSX_Notify', 0), + 'OSX_NOTIFY_ON_EXTDOWN': (int, 'OSX_Notify', 0), + 'OSX_NOTIFY_ON_INTDOWN': (int, 'OSX_Notify', 0), 'PLEX_CLIENT_HOST': (str, 'Plex', ''), 'PLEX_ENABLED': (int, 'Plex', 0), 'PLEX_PASSWORD': (str, 'Plex', ''), @@ -184,7 +192,8 @@ _CONFIG_DEFINITIONS = { 'PLEX_ON_BUFFER': (int, 'Plex', 0), 'PLEX_ON_WATCHED': (int, 'Plex', 0), 'PLEX_ON_CREATED': (int, 'Plex', 0), - 'PLEX_ON_DOWN': (int, 'Plex', 0), + 'PLEX_ON_EXTDOWN': (int, 'Plex', 0), + 'PLEX_ON_INTDOWN': (int, 'Plex', 0), 'PROWL_ENABLED': (int, 'Prowl', 0), 'PROWL_KEYS': (str, 'Prowl', ''), 'PROWL_PRIORITY': (int, 'Prowl', 0), @@ -195,7 +204,8 @@ _CONFIG_DEFINITIONS = { 'PROWL_ON_BUFFER': (int, 'Prowl', 0), 'PROWL_ON_WATCHED': (int, 'Prowl', 0), 'PROWL_ON_CREATED': (int, 'Prowl', 0), - 'PROWL_ON_DOWN': (int, 'Prowl', 0), + 'PROWL_ON_EXTDOWN': (int, 'Prowl', 0), + 'PROWL_ON_INTDOWN': (int, 'Prowl', 0), 'PUSHALOT_APIKEY': (str, 'Pushalot', ''), 'PUSHALOT_ENABLED': (int, 'Pushalot', 0), 'PUSHALOT_ON_PLAY': (int, 'Pushalot', 0), @@ -205,7 +215,8 @@ _CONFIG_DEFINITIONS = { 'PUSHALOT_ON_BUFFER': (int, 'Pushalot', 0), 'PUSHALOT_ON_WATCHED': (int, 'Pushalot', 0), 'PUSHALOT_ON_CREATED': (int, 'Pushalot', 0), - 'PUSHALOT_ON_DOWN': (int, 'Pushalot', 0), + 'PUSHALOT_ON_EXTDOWN': (int, 'Pushalot', 0), + 'PUSHALOT_ON_INTDOWN': (int, 'Pushalot', 0), 'PUSHBULLET_APIKEY': (str, 'PushBullet', ''), 'PUSHBULLET_DEVICEID': (str, 'PushBullet', ''), 'PUSHBULLET_CHANNEL_TAG': (str, 'PushBullet', ''), @@ -217,7 +228,8 @@ _CONFIG_DEFINITIONS = { 'PUSHBULLET_ON_BUFFER': (int, 'PushBullet', 0), 'PUSHBULLET_ON_WATCHED': (int, 'PushBullet', 0), 'PUSHBULLET_ON_CREATED': (int, 'PushBullet', 0), - 'PUSHBULLET_ON_DOWN': (int, 'PushBullet', 0), + 'PUSHBULLET_ON_EXTDOWN': (int, 'PushBullet', 0), + 'PUSHBULLET_ON_INTDOWN': (int, 'PushBullet', 0), 'PUSHOVER_APITOKEN': (str, 'Pushover', ''), 'PUSHOVER_ENABLED': (int, 'Pushover', 0), 'PUSHOVER_KEYS': (str, 'Pushover', ''), @@ -230,7 +242,8 @@ _CONFIG_DEFINITIONS = { 'PUSHOVER_ON_BUFFER': (int, 'Pushover', 0), 'PUSHOVER_ON_WATCHED': (int, 'Pushover', 0), 'PUSHOVER_ON_CREATED': (int, 'Pushover', 0), - 'PUSHOVER_ON_DOWN': (int, 'Pushover', 0), + 'PUSHOVER_ON_EXTDOWN': (int, 'Pushover', 0), + 'PUSHOVER_ON_INTDOWN': (int, 'Pushover', 0), 'REFRESH_USERS_INTERVAL': (int, 'Monitoring', 12), 'REFRESH_USERS_ON_STARTUP': (int, 'Monitoring', 1), 'TELEGRAM_BOT_TOKEN': (str, 'Telegram', ''), @@ -243,7 +256,8 @@ _CONFIG_DEFINITIONS = { 'TELEGRAM_ON_BUFFER': (int, 'Telegram', 0), 'TELEGRAM_ON_WATCHED': (int, 'Telegram', 0), 'TELEGRAM_ON_CREATED': (int, 'Telegram', 0), - 'TELEGRAM_ON_DOWN': (int, 'Telegram', 0), + 'TELEGRAM_ON_EXTDOWN': (int, 'Telegram', 0), + 'TELEGRAM_ON_INTDOWN': (int, 'Telegram', 0), 'TV_NOTIFY_ENABLE': (int, 'Monitoring', 0), 'TV_NOTIFY_ON_START': (int, 'Monitoring', 1), 'TV_NOTIFY_ON_STOP': (int, 'Monitoring', 0), @@ -259,7 +273,8 @@ _CONFIG_DEFINITIONS = { 'TWITTER_ON_BUFFER': (int, 'Twitter', 0), 'TWITTER_ON_WATCHED': (int, 'Twitter', 0), 'TWITTER_ON_CREATED': (int, 'Twitter', 0), - 'TWITTER_ON_DOWN': (int, 'Twitter', 0), + 'TWITTER_ON_EXTDOWN': (int, 'Twitter', 0), + 'TWITTER_ON_INTDOWN': (int, 'Twitter', 0), 'UPDATE_DB_INTERVAL': (int, 'General', 24), 'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1), 'VIDEO_LOGGING_ENABLE': (int, 'Monitoring', 1), @@ -274,7 +289,8 @@ _CONFIG_DEFINITIONS = { 'XBMC_ON_BUFFER': (int, 'XBMC', 0), 'XBMC_ON_WATCHED': (int, 'XBMC', 0), 'XBMC_ON_CREATED': (int, 'XBMC', 0), - 'XBMC_ON_DOWN': (int, 'XBMC', 0) + 'XBMC_ON_EXTDOWN': (int, 'XBMC', 0), + 'XBMC_ON_INTDOWN': (int, 'XBMC', 0) } # pylint:disable=R0902 # it might be nice to refactor for fewer instance variables diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 09a3a417..4a9f7b7e 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -181,7 +181,13 @@ def notify_timeline(timeline_data=None, notify_action=None): set_notify_state(session=timeline_data, state=notify_action, agent_info=agent) elif not timeline_data and notify_action: for agent in notifiers.available_notification_agents(): - if agent['on_down'] and notify_action == 'down': + if agent['on_extdown'] and notify_action == 'extdown': + # Build and send notification + notify_strings = build_server_notify_text(state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + if agent['on_intdown'] and notify_action == 'intdown': # Build and send notification notify_strings = build_server_notify_text(state=notify_action) notifiers.send_notification(config_id=agent['id'], @@ -619,8 +625,10 @@ def build_server_notify_text(state=None): logger.error(u"PlexPy Notifier :: Unable to retrieve server uptime.") server_uptime = 'N/A' - on_down_subject = plexpy.CONFIG.NOTIFY_ON_DOWN_SUBJECT_TEXT - on_down_body = plexpy.CONFIG.NOTIFY_ON_DOWN_BODY_TEXT + on_extdown_subject = plexpy.CONFIG.NOTIFY_ON_EXTDOWN_SUBJECT_TEXT + on_extdown_body = plexpy.CONFIG.NOTIFY_ON_EXTDOWN_BODY_TEXT + on_intdown_subject = plexpy.CONFIG.NOTIFY_ON_INTDOWN_SUBJECT_TEXT + on_intdown_body = plexpy.CONFIG.NOTIFY_ON_INTDOWN_BODY_TEXT available_params = {'server_name': server_name, 'server_uptime': server_uptime} @@ -628,20 +636,42 @@ def build_server_notify_text(state=None): # Default text subject_text = 'PlexPy (%s)' % server_name - if state == 'down': + if state == 'extdown': # Default body text - body_text = 'Unable to get a response from the server.' + body_text = 'The Plex external port is down.' - if on_down_subject and on_down_body: + if on_extdown_subject and on_extdown_body: try: - subject_text = unicode(on_down_subject).format(**available_params) + subject_text = unicode(on_extdown_subject).format(**available_params) except LookupError, e: logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) except: logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") try: - body_text = unicode(on_down_body).format(**available_params) + body_text = unicode(on_extdown_body).format(**available_params) + except LookupError, e: + logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + except: + logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + + return [subject_text, body_text] + else: + return [subject_text, body_text] + elif state == 'intdown': + # Default body text + body_text = 'The Plex server is down.' + + if on_intdown_subject and on_intdown_body: + try: + subject_text = unicode(on_intdown_subject).format(**available_params) + except LookupError, e: + logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + except: + logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + + try: + body_text = unicode(on_intdown_body).format(**available_params) except LookupError, e: logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) except: diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index 863a597e..11798ff3 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -67,7 +67,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.GROWL_ON_BUFFER, 'on_watched': plexpy.CONFIG.GROWL_ON_WATCHED, 'on_created': plexpy.CONFIG.GROWL_ON_CREATED, - 'on_down': plexpy.CONFIG.GROWL_ON_DOWN + 'on_extdown': plexpy.CONFIG.GROWL_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.GROWL_ON_INTDOWN }, {'name': 'Prowl', 'id': AGENT_IDS['Prowl'], @@ -81,7 +82,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.PROWL_ON_BUFFER, 'on_watched': plexpy.CONFIG.PROWL_ON_WATCHED, 'on_created': plexpy.CONFIG.PROWL_ON_CREATED, - 'on_down': plexpy.CONFIG.PROWL_ON_DOWN + 'on_extdown': plexpy.CONFIG.PROWL_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.PROWL_ON_INTDOWN }, {'name': 'XBMC', 'id': AGENT_IDS['XBMC'], @@ -95,7 +97,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.XBMC_ON_BUFFER, 'on_watched': plexpy.CONFIG.XBMC_ON_WATCHED, 'on_created': plexpy.CONFIG.XBMC_ON_CREATED, - 'on_down': plexpy.CONFIG.XBMC_ON_DOWN + 'on_extdown': plexpy.CONFIG.XBMC_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.XBMC_ON_INTDOWN }, {'name': 'Plex', 'id': AGENT_IDS['Plex'], @@ -109,7 +112,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.PLEX_ON_BUFFER, 'on_watched': plexpy.CONFIG.PLEX_ON_WATCHED, 'on_created': plexpy.CONFIG.PLEX_ON_CREATED, - 'on_down': plexpy.CONFIG.PLEX_ON_DOWN + 'on_extdown': plexpy.CONFIG.PLEX_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.PLEX_ON_INTDOWN }, {'name': 'NotifyMyAndroid', 'id': AGENT_IDS['NMA'], @@ -123,7 +127,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.NMA_ON_BUFFER, 'on_watched': plexpy.CONFIG.NMA_ON_WATCHED, 'on_created': plexpy.CONFIG.NMA_ON_CREATED, - 'on_down': plexpy.CONFIG.NMA_ON_DOWN + 'on_extdown': plexpy.CONFIG.NMA_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.NMA_ON_INTDOWN }, {'name': 'Pushalot', 'id': AGENT_IDS['Pushalot'], @@ -137,7 +142,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.PUSHALOT_ON_BUFFER, 'on_watched': plexpy.CONFIG.PUSHALOT_ON_WATCHED, 'on_created': plexpy.CONFIG.PUSHALOT_ON_CREATED, - 'on_down': plexpy.CONFIG.PUSHALOT_ON_DOWN + 'on_extdown': plexpy.CONFIG.PUSHALOT_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.PUSHALOT_ON_INTDOWN }, {'name': 'Pushbullet', 'id': AGENT_IDS['Pushbullet'], @@ -151,7 +157,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.PUSHBULLET_ON_BUFFER, 'on_watched': plexpy.CONFIG.PUSHBULLET_ON_WATCHED, 'on_created': plexpy.CONFIG.PUSHBULLET_ON_CREATED, - 'on_down': plexpy.CONFIG.PUSHBULLET_ON_DOWN + 'on_extdown': plexpy.CONFIG.PUSHBULLET_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.PUSHBULLET_ON_INTDOWN }, {'name': 'Pushover', 'id': AGENT_IDS['Pushover'], @@ -165,7 +172,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.PUSHOVER_ON_BUFFER, 'on_watched': plexpy.CONFIG.PUSHOVER_ON_WATCHED, 'on_created': plexpy.CONFIG.PUSHOVER_ON_CREATED, - 'on_down': plexpy.CONFIG.PUSHOVER_ON_DOWN + 'on_extdown': plexpy.CONFIG.PUSHOVER_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.PUSHOVER_ON_INTDOWN }, {'name': 'Boxcar2', 'id': AGENT_IDS['Boxcar2'], @@ -179,7 +187,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.BOXCAR_ON_BUFFER, 'on_watched': plexpy.CONFIG.BOXCAR_ON_WATCHED, 'on_created': plexpy.CONFIG.BOXCAR_ON_CREATED, - 'on_down': plexpy.CONFIG.BOXCAR_ON_DOWN + 'on_extdown': plexpy.CONFIG.BOXCAR_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.BOXCAR_ON_INTDOWN }, {'name': 'E-mail', 'id': AGENT_IDS['Email'], @@ -193,7 +202,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.EMAIL_ON_BUFFER, 'on_watched': plexpy.CONFIG.EMAIL_ON_WATCHED, 'on_created': plexpy.CONFIG.EMAIL_ON_CREATED, - 'on_down': plexpy.CONFIG.EMAIL_ON_DOWN + 'on_extdown': plexpy.CONFIG.EMAIL_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.EMAIL_ON_INTDOWN }, {'name': 'Twitter', 'id': AGENT_IDS['Twitter'], @@ -207,7 +217,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.TWITTER_ON_BUFFER, 'on_watched': plexpy.CONFIG.TWITTER_ON_WATCHED, 'on_created': plexpy.CONFIG.TWITTER_ON_CREATED, - 'on_down': plexpy.CONFIG.TWITTER_ON_DOWN + 'on_extdown': plexpy.CONFIG.TWITTER_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.TWITTER_ON_INTDOWN }, {'name': 'IFTTT', 'id': AGENT_IDS['IFTTT'], @@ -221,7 +232,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.IFTTT_ON_BUFFER, 'on_watched': plexpy.CONFIG.IFTTT_ON_WATCHED, 'on_created': plexpy.CONFIG.IFTTT_ON_CREATED, - 'on_down': plexpy.CONFIG.IFTTT_ON_DOWN + 'on_extdown': plexpy.CONFIG.IFTTT_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.IFTTT_ON_INTDOWN }, {'name': 'Telegram', 'id': AGENT_IDS['Telegram'], @@ -235,7 +247,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.TELEGRAM_ON_BUFFER, 'on_watched': plexpy.CONFIG.TELEGRAM_ON_WATCHED, 'on_created': plexpy.CONFIG.TELEGRAM_ON_CREATED, - 'on_down': plexpy.CONFIG.TELEGRAM_ON_DOWN + 'on_extdown': plexpy.CONFIG.TELEGRAM_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.TELEGRAM_ON_INTDOWN } ] @@ -254,7 +267,8 @@ def available_notification_agents(): 'on_buffer': plexpy.CONFIG.OSX_NOTIFY_ON_BUFFER, 'on_watched': plexpy.CONFIG.OSX_NOTIFY_ON_WATCHED, 'on_created': plexpy.CONFIG.OSX_NOTIFY_ON_CREATED, - 'on_down': plexpy.CONFIG.OSX_NOTIFY_ON_DOWN + 'on_extdown': plexpy.CONFIG.OSX_NOTIFY_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.OSX_NOTIFY_ON_INTDOWN }) return agents diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 97bf78cf..12a79f42 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -462,8 +462,10 @@ class WebInterface(object): "notify_on_watched_body_text": plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT, "notify_on_created_subject_text": plexpy.CONFIG.NOTIFY_ON_CREATED_SUBJECT_TEXT, "notify_on_created_body_text": plexpy.CONFIG.NOTIFY_ON_CREATED_BODY_TEXT, - "notify_on_down_subject_text": plexpy.CONFIG.NOTIFY_ON_DOWN_SUBJECT_TEXT, - "notify_on_down_body_text": plexpy.CONFIG.NOTIFY_ON_DOWN_BODY_TEXT, + "notify_on_extdown_subject_text": plexpy.CONFIG.NOTIFY_ON_EXTDOWN_SUBJECT_TEXT, + "notify_on_extdown_body_text": plexpy.CONFIG.NOTIFY_ON_EXTDOWN_BODY_TEXT, + "notify_on_intdown_subject_text": plexpy.CONFIG.NOTIFY_ON_INTDOWN_SUBJECT_TEXT, + "notify_on_intdown_body_text": plexpy.CONFIG.NOTIFY_ON_INTDOWN_BODY_TEXT, "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH, "home_stats_type": checked(plexpy.CONFIG.HOME_STATS_TYPE), "home_stats_count": plexpy.CONFIG.HOME_STATS_COUNT, From 9aea663754ed56c5d4f34ac3bc03f15de0aa426c Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 17 Nov 2015 23:22:12 -0800 Subject: [PATCH 66/84] Logger info for email notification sent --- plexpy/notifiers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index 11798ff3..607cd3b0 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -1348,6 +1348,8 @@ class Email(object): mailserver.sendmail(plexpy.CONFIG.EMAIL_FROM, plexpy.CONFIG.EMAIL_TO, message.as_string()) mailserver.quit() + + logger.info(u"Email notifications sent.") return True except Exception, e: From fd43cf5dd446ad11d36e498a4b4d5389d33d0783 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Thu, 19 Nov 2015 19:40:50 -0800 Subject: [PATCH 67/84] Add setting to enable remote access monitoring --- .../default/notification_triggers_modal.html | 2 +- data/interfaces/default/settings.html | 10 +++- plexpy/activity_pinger.py | 58 ++++++++++--------- plexpy/config.py | 5 +- plexpy/notification_handler.py | 4 +- plexpy/webserve.py | 3 +- 6 files changed, 46 insertions(+), 36 deletions(-) diff --git a/data/interfaces/default/notification_triggers_modal.html b/data/interfaces/default/notification_triggers_modal.html index 8b752907..82971ac2 100644 --- a/data/interfaces/default/notification_triggers_modal.html +++ b/data/interfaces/default/notification_triggers_modal.html @@ -67,7 +67,7 @@ from plexpy import helpers

          Trigger notification when the Plex Media Server cannot be reached externally.

          diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 47cda611..2a4f45d1 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -403,6 +403,12 @@ available_notification_agents = sorted(notifiers.available_notification_agents()

          Instead of polling the server at regular intervals let the server tell us when something happens. This is currently experimental. Encrypted websocket is not currently supported.

          +
          + +

          Enable to have PlexPy check if remote access to the Plex Media Server goes down. (Must have remote access set up in Plex.)

          +

          History Logging

          @@ -659,7 +665,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
      • -
         Plex External Port Down
        +
         Plex Remote Access Down
        • @@ -1305,7 +1311,7 @@ $(document).ready(function() { 'X-Plex-Version': '${common.VERSION_NUMBER}', 'X-Plex-Platform': '${common.PLATFORM}', 'X-Plex-Platform-Version': '${common.PLATFORM_VERSION}', - 'X-Plex-Client-Identifier': '${config['pms_uuid']}', + 'X-Plex-Client-Identifier': '${config["pms_uuid"]}', 'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val()) }, error: function(jqXHR, textStatus, errorThrown) { diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index 9f4b6a0e..d2340d4a 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -225,32 +225,9 @@ def check_recently_added(): def check_server_response(): with monitor_lock: - plex_tv = plextv.PlexTV() - external_response = plex_tv.get_server_response() pms_connect = pmsconnect.PmsConnect() internal_response = pms_connect.get_server_response() - - global ext_ping_count global int_ping_count - - if not external_response: - ext_ping_count += 1 - logger.warn(u"PlexPy Monitor :: Plex remote access port mapping failed, ping attempt %s." \ - % str(ext_ping_count)) - else: - host = external_response[0]['host'] - port = external_response[0]['port'] - - try: - http_response = urllib2.urlopen('http://' + host + ':' + port) - except urllib2.HTTPError, e: - ext_ping_count = 0 - except urllib2.URLError, e: - ext_ping_count += 1 - logger.warn(u"PlexPy Monitor :: Unable to get an external response from the server, ping attempt %s." \ - % str(ext_ping_count)) - else: - ext_ping_count = 0 if not internal_response: int_ping_count += 1 @@ -259,11 +236,36 @@ def check_server_response(): else: int_ping_count = 0 - if ext_ping_count == 3: - # Fire off notifications - threading.Thread(target=notification_handler.notify_timeline, - kwargs=dict(notify_action='extdown')).start() + if plexpy.CONFIG.MONITOR_REMOTE_ACCESS: + plex_tv = plextv.PlexTV() + external_response = plex_tv.get_server_response() + global ext_ping_count + + if not external_response: + ext_ping_count += 1 + logger.warn(u"PlexPy Monitor :: Plex remote access port mapping failed, ping attempt %s." \ + % str(ext_ping_count)) + else: + host = external_response[0]['host'] + port = external_response[0]['port'] + + try: + http_response = urllib2.urlopen('http://' + host + ':' + port) + except urllib2.HTTPError, e: + ext_ping_count = 0 + except urllib2.URLError, e: + ext_ping_count += 1 + logger.warn(u"PlexPy Monitor :: Unable to get an external response from the server, ping attempt %s." \ + % str(ext_ping_count)) + else: + ext_ping_count = 0 + if int_ping_count == 3: # Fire off notifications threading.Thread(target=notification_handler.notify_timeline, - kwargs=dict(notify_action='intdown')).start() \ No newline at end of file + kwargs=dict(notify_action='intdown')).start() + + if ext_ping_count == 3: + # Fire off notifications + threading.Thread(target=notification_handler.notify_timeline, + kwargs=dict(notify_action='extdown')).start() \ No newline at end of file diff --git a/plexpy/config.py b/plexpy/config.py index ae233fe1..c0f4b104 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -134,6 +134,7 @@ _CONFIG_DEFINITIONS = { 'MUSIC_NOTIFY_ON_STOP': (int, 'Monitoring', 0), 'MUSIC_NOTIFY_ON_PAUSE': (int, 'Monitoring', 0), 'MUSIC_LOGGING_ENABLE': (int, 'Monitoring', 0), + 'MONITOR_REMOTE_ACCESS': (int, 'Monitoring', 0), 'MONITORING_INTERVAL': (int, 'Monitoring', 60), 'MONITORING_USE_WEBSOCKET': (int, 'Monitoring', 0), 'NMA_APIKEY': (str, 'NMA', ''), @@ -167,9 +168,9 @@ _CONFIG_DEFINITIONS = { 'NOTIFY_ON_CREATED_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), 'NOTIFY_ON_CREATED_BODY_TEXT': (str, 'Monitoring', '{title} was recently added to Plex.'), 'NOTIFY_ON_EXTDOWN_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_EXTDOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex external port is down.'), + 'NOTIFY_ON_EXTDOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex Media Server remote access is down.'), 'NOTIFY_ON_INTDOWN_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_INTDOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex server is down.'), + 'NOTIFY_ON_INTDOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex Media Server is down.'), 'OSX_NOTIFY_APP': (str, 'OSX_Notify', '/Applications/PlexPy'), 'OSX_NOTIFY_ENABLED': (int, 'OSX_Notify', 0), 'OSX_NOTIFY_ON_PLAY': (int, 'OSX_Notify', 0), diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 4a9f7b7e..9d943697 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -638,7 +638,7 @@ def build_server_notify_text(state=None): if state == 'extdown': # Default body text - body_text = 'The Plex external port is down.' + body_text = 'The Plex Media Server remote access is down.' if on_extdown_subject and on_extdown_body: try: @@ -660,7 +660,7 @@ def build_server_notify_text(state=None): return [subject_text, body_text] elif state == 'intdown': # Default body text - body_text = 'The Plex server is down.' + body_text = 'The Plex Media Server is down.' if on_intdown_subject and on_intdown_body: try: diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 12a79f42..24233bc1 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -435,6 +435,7 @@ class WebInterface(object): "tv_notify_on_pause": checked(plexpy.CONFIG.TV_NOTIFY_ON_PAUSE), "movie_notify_on_pause": checked(plexpy.CONFIG.MOVIE_NOTIFY_ON_PAUSE), "music_notify_on_pause": checked(plexpy.CONFIG.MUSIC_NOTIFY_ON_PAUSE), + "monitor_remote_access": checked(plexpy.CONFIG.MONITOR_REMOTE_ACCESS), "monitoring_interval": plexpy.CONFIG.MONITORING_INTERVAL, "monitoring_use_websocket": checked(plexpy.CONFIG.MONITORING_USE_WEBSOCKET), "refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL, @@ -490,7 +491,7 @@ class WebInterface(object): "tv_notify_on_stop", "movie_notify_on_stop", "music_notify_on_stop", "tv_notify_on_pause", "movie_notify_on_pause", "music_notify_on_pause", "refresh_users_on_startup", "ip_logging_enable", "video_logging_enable", "music_logging_enable", "pms_is_remote", "home_stats_type", - "group_history_tables", "notify_consecutive", "notify_recently_added_grandparent" + "group_history_tables", "notify_consecutive", "notify_recently_added_grandparent", "monitor_remote_access" ] for checked_config in checked_configs: if checked_config not in kwargs: From 99e064e040a274d781f353a46d25c93a25a9cadf Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Fri, 20 Nov 2015 19:00:29 -0800 Subject: [PATCH 68/84] Add wording for Pushover group key --- plexpy/notifiers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index 607cd3b0..c072cefc 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -1004,10 +1004,10 @@ class PUSHOVER(object): return {'': ''} def return_config_options(self): - config_option = [{'label': 'Pushover User Key', + config_option = [{'label': 'Pushover User or Group Key', 'value': self.keys, 'name': 'pushover_keys', - 'description': 'Your Pushover user key.', + 'description': 'Your Pushover user or group key.', 'input_type': 'text' }, {'label': 'Priority', From 013d957e47a919ebe8bc139ce12a1b9c7f2dc900 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sat, 21 Nov 2015 09:43:21 -0800 Subject: [PATCH 69/84] Use Plex API to check remote access down --- data/interfaces/default/settings.html | 4 +-- plexpy/activity_pinger.py | 49 +++++++++++++-------------- plexpy/plextv.py | 21 +----------- plexpy/pmsconnect.py | 43 +++++++++++++++++------ 4 files changed, 60 insertions(+), 57 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 2a4f45d1..ad29c0c6 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -405,9 +405,9 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
          -

          Enable to have PlexPy check if remote access to the Plex Media Server goes down. (Must have remote access set up in Plex.)

          +

          Enable to have PlexPy check if remote access to the Plex Media Server goes down. Your server needs to have remote access enabled.

          diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index d2340d4a..e890e719 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -18,7 +18,6 @@ from plexpy import logger, pmsconnect, plextv, notification_handler, database, h import threading import plexpy import time -import urllib2 monitor_lock = threading.Lock() ext_ping_count = 0 @@ -226,39 +225,39 @@ def check_server_response(): with monitor_lock: pms_connect = pmsconnect.PmsConnect() - internal_response = pms_connect.get_server_response() - global int_ping_count + server_response = pms_connect.get_server_response() - if not internal_response: + global int_ping_count + global ext_ping_count + + # Check for internal server response + if not server_response: int_ping_count += 1 logger.warn(u"PlexPy Monitor :: Unable to get an internal response from the server, ping attempt %s." \ % str(int_ping_count)) + # Reset internal ping counter else: int_ping_count = 0 - if plexpy.CONFIG.MONITOR_REMOTE_ACCESS: - plex_tv = plextv.PlexTV() - external_response = plex_tv.get_server_response() - global ext_ping_count + # Check for remote access + if server_response and plexpy.CONFIG.MONITOR_REMOTE_ACCESS: - if not external_response: - ext_ping_count += 1 - logger.warn(u"PlexPy Monitor :: Plex remote access port mapping failed, ping attempt %s." \ - % str(ext_ping_count)) - else: - host = external_response[0]['host'] - port = external_response[0]['port'] + mapping_state = server_response['mapping_state'] + mapping_error = server_response['mapping_error'] - try: - http_response = urllib2.urlopen('http://' + host + ':' + port) - except urllib2.HTTPError, e: - ext_ping_count = 0 - except urllib2.URLError, e: - ext_ping_count += 1 - logger.warn(u"PlexPy Monitor :: Unable to get an external response from the server, ping attempt %s." \ - % str(ext_ping_count)) - else: - ext_ping_count = 0 + # Check if the port is mapped + if not mapping_state == 'mapped': + ext_ping_count += 1 + logger.warn(u"PlexPy Monitor :: Plex remote access port not mapped, ping attempt %s." \ + % str(ext_ping_count)) + # Check if the port is open + elif mapping_error == 'unreachable': + ext_ping_count += 1 + logger.warn(u"PlexPy Monitor :: Plex remote access port mapped, but mapping failed, ping attempt %s." \ + % str(ext_ping_count)) + # Reset external ping counter + else: + ext_ping_count = 0 if int_ping_count == 3: # Fire off notifications diff --git a/plexpy/plextv.py b/plexpy/plextv.py index 76c55d69..1c6682a1 100644 --- a/plexpy/plextv.py +++ b/plexpy/plextv.py @@ -462,23 +462,4 @@ class PlexTV(object): }) break - return server_times - - def get_server_response(self): - response = self.get_plextv_server_list(output_format='xml') - - server_url = [] - - try: - xml_head = response.getElementsByTagName('Server') - except: - return False - - for a in xml_head: - if helpers.get_xml_attr(a, 'machineIdentifier') == plexpy.CONFIG.PMS_IDENTIFIER: - server_url.append({"host": helpers.get_xml_attr(a, 'host'), - "port": helpers.get_xml_attr(a, 'port') - }) - break - - return server_url \ No newline at end of file + return server_times \ No newline at end of file diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index e647b34c..76df52dd 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -270,6 +270,22 @@ class PmsConnect(object): return request + """ + Return account details. + + Optional parameters: output_format { dict, json } + + Output: array + """ + def get_account(self, output_format=''): + uri = '/myplex/account' + request = self.request_handler.make_request(uri=uri, + proto=self.protocol, + request_type='GET', + output_format=output_format) + + return request + """ Return processed and validated list of recently added items. @@ -1650,15 +1666,22 @@ class PmsConnect(object): return key_list - """ - Check for a server response. - - Output: bool - """ def get_server_response(self): - response = self.get_server_list() + account_data = self.get_account(output_format='xml') + + try: + xml_head = account_data.getElementsByTagName('MyPlex') + except: + logger.warn("Unable to parse XML for get_server_response.") + return None + + server_response = {} - if not response: - return False - else: - return True + for a in xml_head: + server_response = {'mapping_state': helpers.get_xml_attr(a, 'mappingState'), + 'mapping_error': helpers.get_xml_attr(a, 'mappingError'), + 'public_address': helpers.get_xml_attr(a, 'publicAddress'), + 'public_port': helpers.get_xml_attr(a, 'publicPort') + } + + return server_response \ No newline at end of file From e6aef015081752cc068120d7a55de5a5324eee73 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sat, 21 Nov 2015 10:27:51 -0800 Subject: [PATCH 70/84] Separate out TV notification toggle in settings --- data/interfaces/default/settings.html | 9 +- data/interfaces/default/welcome.html | 7 +- plexpy/api.py | 2 +- plexpy/notification_handler.py | 223 +++++++++++++------------- plexpy/webserve.py | 6 +- 5 files changed, 127 insertions(+), 120 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index ad29c0c6..f8e39615 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -479,7 +479,12 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
          +
          +
          +
          @@ -527,7 +532,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
          -

          Set the delay for recently added notifications to allow metadata to be processes. Minimum 60 seconds.

          +

          Set the delay for recently added notifications to allow metadata to be processed. Minimum 60 seconds.

          diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html index 3f50ad63..e4388b65 100644 --- a/data/interfaces/default/welcome.html +++ b/data/interfaces/default/welcome.html @@ -1,4 +1,4 @@ -<% +<% import plexpy from plexpy import common %> @@ -130,7 +130,10 @@ from plexpy import common

          PlexPy supports a wide variety of notification options. To set up a notification agent conifgure this in Settings -> Notification Agents after you have completed this setup wizard.


          - Enable notifications on Movie and TV playback + Enable notifications on Movie playback +
          +
          + Enable notifications on TV Show playback
          Enable notifications on Music playback diff --git a/plexpy/api.py b/plexpy/api.py index 38714b35..dc9d30ac 100644 --- a/plexpy/api.py +++ b/plexpy/api.py @@ -394,8 +394,8 @@ class Api(object): "grouping_global_history": bool(plexpy.CONFIG.GROUPING_GLOBAL_HISTORY), "grouping_user_history": bool(plexpy.CONFIG.GROUPING_USER_HISTORY), "grouping_charts": bool(plexpy.CONFIG.GROUPING_CHARTS), - "tv_notify_enable": bool(plexpy.CONFIG.TV_NOTIFY_ENABLE), "movie_notify_enable": bool(plexpy.CONFIG.MOVIE_NOTIFY_ENABLE), + "tv_notify_enable": bool(plexpy.CONFIG.TV_NOTIFY_ENABLE), "music_notify_enable": bool(plexpy.CONFIG.MUSIC_NOTIFY_ENABLE), "tv_notify_on_start": bool(plexpy.CONFIG.TV_NOTIFY_ON_START), "movie_notify_on_start": bool(plexpy.CONFIG.MOVIE_NOTIFY_ON_START), diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 9d943697..24485fc5 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -30,13 +30,66 @@ def notify(stream_data=None, notify_action=None): if not user_details['do_notify']: return - if stream_data['media_type'] == 'movie' or stream_data['media_type'] == 'episode': - if plexpy.CONFIG.MOVIE_NOTIFY_ENABLE or plexpy.CONFIG.TV_NOTIFY_ENABLE: + if (stream_data['media_type'] == 'movie' and plexpy.CONFIG.MOVIE_NOTIFY_ENABLE) \ + or (stream_data['media_type'] == 'episode' and plexpy.CONFIG.TV_NOTIFY_ENABLE): - progress_percent = helpers.get_percent(stream_data['view_offset'], stream_data['duration']) + progress_percent = helpers.get_percent(stream_data['view_offset'], stream_data['duration']) - for agent in notifiers.available_notification_agents(): - if agent['on_play'] and notify_action == 'play': + for agent in notifiers.available_notification_agents(): + if agent['on_play'] and notify_action == 'play': + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + # Set the notification state in the db + set_notify_state(session=stream_data, state=notify_action, agent_info=agent) + + elif agent['on_stop'] and notify_action == 'stop' \ + and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < plexpy.CONFIG.NOTIFY_WATCHED_PERCENT): + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + + set_notify_state(session=stream_data, state=notify_action, agent_info=agent) + + elif agent['on_pause'] and notify_action == 'pause' \ + and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99): + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + + set_notify_state(session=stream_data, state=notify_action, agent_info=agent) + + elif agent['on_resume'] and notify_action == 'resume' \ + and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99): + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + + set_notify_state(session=stream_data, state=notify_action, agent_info=agent) + + elif agent['on_buffer'] and notify_action == 'buffer': + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + + set_notify_state(session=stream_data, state=notify_action, agent_info=agent) + + elif agent['on_watched'] and notify_action == 'watched': + # Get the current states for notifications from our db + notify_states = get_notify_state(session=stream_data) + + # 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): # Build and send notification notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], @@ -45,119 +98,65 @@ def notify(stream_data=None, notify_action=None): # Set the notification state in the db set_notify_state(session=stream_data, state=notify_action, agent_info=agent) - elif agent['on_stop'] and notify_action == 'stop' \ - and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < plexpy.CONFIG.NOTIFY_WATCHED_PERCENT): - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) + else: + # Check in our notify log if the notification has already been sent + for notify_state in notify_states: + if not notify_state['on_watched'] and (notify_state['agent_id'] == agent['id']): + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + # 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) + elif (stream_data['media_type'] == 'track' and plexpy.CONFIG.MUSIC_NOTIFY_ENABLE): - elif agent['on_pause'] and notify_action == 'pause' \ - and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99): - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) + for agent in notifiers.available_notification_agents(): + if agent['on_play'] and notify_action == 'play': + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + # 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) + elif agent['on_stop'] and notify_action == 'stop': + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + # Set the notification state in the db + set_notify_state(session=stream_data, state=notify_action, agent_info=agent) - elif agent['on_resume'] and notify_action == 'resume' \ - and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99): - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) + elif agent['on_pause'] and notify_action == 'pause': + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + # 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) + elif agent['on_resume'] and notify_action == 'resume': + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + # Set the notification state in the db + set_notify_state(session=stream_data, state=notify_action, agent_info=agent) - elif agent['on_buffer'] and notify_action == 'buffer': - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) - - set_notify_state(session=stream_data, state=notify_action, agent_info=agent) - - elif agent['on_watched'] and notify_action == 'watched': - # Get the current states for notifications from our db - notify_states = get_notify_state(session=stream_data) - - # 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): - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) - # Set the notification state in the db - set_notify_state(session=stream_data, state=notify_action, agent_info=agent) - - else: - # Check in our notify log if the notification has already been sent - for notify_state in notify_states: - if not notify_state['on_watched'] and (notify_state['agent_id'] == agent['id']): - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) - # Set the notification state in the db - set_notify_state(session=stream_data, state=notify_action, agent_info=agent) - - elif stream_data['media_type'] == 'track': - if plexpy.CONFIG.MUSIC_NOTIFY_ENABLE: - - for agent in notifiers.available_notification_agents(): - if agent['on_play'] and notify_action == 'play': - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) - # Set the notification state in the db - set_notify_state(session=stream_data, state=notify_action, agent_info=agent) - - elif agent['on_stop'] and notify_action == 'stop': - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) - # Set the notification state in the db - set_notify_state(session=stream_data, state=notify_action, agent_info=agent) - - elif agent['on_pause'] and notify_action == 'pause': - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) - # Set the notification state in the db - set_notify_state(session=stream_data, state=notify_action, agent_info=agent) - - elif agent['on_resume'] and notify_action == 'resume': - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) - # Set the notification state in the db - set_notify_state(session=stream_data, state=notify_action, agent_info=agent) - - elif agent['on_buffer'] and notify_action == 'buffer': - # Build and send notification - notify_strings = build_notify_text(session=stream_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) - # Set the notification state in the db - set_notify_state(session=stream_data, state=notify_action, agent_info=agent) + elif agent['on_buffer'] and notify_action == 'buffer': + # Build and send notification + notify_strings = build_notify_text(session=stream_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + # Set the notification state in the db + set_notify_state(session=stream_data, state=notify_action, agent_info=agent) elif stream_data['media_type'] == 'clip': pass diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 24233bc1..ba09435d 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -90,8 +90,8 @@ class WebInterface(object): "pms_token": plexpy.CONFIG.PMS_TOKEN, "pms_ssl": checked(plexpy.CONFIG.PMS_SSL), "pms_uuid": plexpy.CONFIG.PMS_UUID, - "tv_notify_enable": checked(plexpy.CONFIG.TV_NOTIFY_ENABLE), "movie_notify_enable": checked(plexpy.CONFIG.MOVIE_NOTIFY_ENABLE), + "tv_notify_enable": checked(plexpy.CONFIG.TV_NOTIFY_ENABLE), "music_notify_enable": checked(plexpy.CONFIG.MUSIC_NOTIFY_ENABLE), "tv_notify_on_start": checked(plexpy.CONFIG.TV_NOTIFY_ON_START), "movie_notify_on_start": checked(plexpy.CONFIG.MOVIE_NOTIFY_ON_START), @@ -423,8 +423,8 @@ class WebInterface(object): "grouping_global_history": checked(plexpy.CONFIG.GROUPING_GLOBAL_HISTORY), "grouping_user_history": checked(plexpy.CONFIG.GROUPING_USER_HISTORY), "grouping_charts": checked(plexpy.CONFIG.GROUPING_CHARTS), - "tv_notify_enable": checked(plexpy.CONFIG.TV_NOTIFY_ENABLE), "movie_notify_enable": checked(plexpy.CONFIG.MOVIE_NOTIFY_ENABLE), + "tv_notify_enable": checked(plexpy.CONFIG.TV_NOTIFY_ENABLE), "music_notify_enable": checked(plexpy.CONFIG.MUSIC_NOTIFY_ENABLE), "tv_notify_on_start": checked(plexpy.CONFIG.TV_NOTIFY_ON_START), "movie_notify_on_start": checked(plexpy.CONFIG.MOVIE_NOTIFY_ON_START), @@ -486,7 +486,7 @@ class WebInterface(object): checked_configs = [ "launch_browser", "enable_https", "api_enabled", "freeze_db", "check_github", "grouping_global_history", "grouping_user_history", "grouping_charts", "pms_use_bif", "pms_ssl", - "tv_notify_enable", "movie_notify_enable", "music_notify_enable", "monitoring_use_websocket", + "movie_notify_enable", "tv_notify_enable", "music_notify_enable", "monitoring_use_websocket", "tv_notify_on_start", "movie_notify_on_start", "music_notify_on_start", "tv_notify_on_stop", "movie_notify_on_stop", "music_notify_on_stop", "tv_notify_on_pause", "movie_notify_on_pause", "music_notify_on_pause", "refresh_users_on_startup", From 17bb57d5f59f7f2c3b7d0c80a6d8c02cd6e908f9 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sat, 21 Nov 2015 10:28:26 -0800 Subject: [PATCH 71/84] Apply media type toggles to recently added --- plexpy/notification_handler.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 24485fc5..2b91cc85 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -169,15 +169,22 @@ def notify(stream_data=None, notify_action=None): def notify_timeline(timeline_data=None, notify_action=None): if timeline_data and notify_action: - for agent in notifiers.available_notification_agents(): - if agent['on_created'] and notify_action == 'created': - # Build and send notification - notify_strings = build_notify_text(timeline=timeline_data, state=notify_action) - notifiers.send_notification(config_id=agent['id'], - subject=notify_strings[0], - body=notify_strings[1]) - # Set the notification state in the db - set_notify_state(session=timeline_data, state=notify_action, agent_info=agent) + if (timeline_data['media_type'] == 'movie' and plexpy.CONFIG.MOVIE_NOTIFY_ENABLE) \ + or ((timeline_data['media_type'] == 'show' or timeline_data['media_type'] == 'episode') \ + and plexpy.CONFIG.TV_NOTIFY_ENABLE) \ + or ((timeline_data['media_type'] == 'artist' or timeline_data['media_type'] == 'track') \ + and plexpy.CONFIG.MUSIC_NOTIFY_ENABLE): + + for agent in notifiers.available_notification_agents(): + if agent['on_created'] and notify_action == 'created': + # Build and send notification + notify_strings = build_notify_text(timeline=timeline_data, state=notify_action) + notifiers.send_notification(config_id=agent['id'], + subject=notify_strings[0], + body=notify_strings[1]) + # Set the notification state in the db + set_notify_state(session=timeline_data, state=notify_action, agent_info=agent) + elif not timeline_data and notify_action: for agent in notifiers.available_notification_agents(): if agent['on_extdown'] and notify_action == 'extdown': From a20a52f5f182c3b32fff26c788a22f3ab93590f6 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 22 Nov 2015 10:22:15 -0800 Subject: [PATCH 72/84] Refresh port mapping before checking remote access --- plexpy/pmsconnect.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 76df52dd..a313813a 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -287,6 +287,20 @@ class PmsConnect(object): return request """ + Refresh Plex remote access port mapping. + + Optional parameters: None + + Output: None + """ + def put_refresh_reachability(self): + uri = '/myplex/refreshReachability' + request = self.request_handler.make_request(uri=uri, + proto=self.protocol, + request_type='PUT') + + return request + """ Return processed and validated list of recently added items. Parameters required: count { number of results to return } @@ -1667,6 +1681,8 @@ class PmsConnect(object): return key_list def get_server_response(self): + # Refresh Plex remote access port mapping first + self.put_refresh_reachability() account_data = self.get_account(output_format='xml') try: From 1d86187f7997f026e08258261cd397d7d9a7b042 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 22 Nov 2015 12:11:22 -0800 Subject: [PATCH 73/84] Fix "Please verify your server" setting bug --- data/interfaces/default/settings.html | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index f8e39615..55a2ed78 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -1168,17 +1168,22 @@ $(document).ready(function() { } var configForm = $("#configUpdate"); + function saveSettings() { + if (configForm.parsley().validate()) { + doAjaxCall('configUpdate', $(this), 'tabs', true); + postSaveChecks(); + return false; + } else { + showMsg(' Please verify your settings.', false, true, 2000, true) + } + } + $('.save-button').click(function() { if ($("#pms_identifier").val() == "") { - showMsg(' Please verify your server.',false,true,2000,true) + //showMsg(' Please verify your server.', false, true, 2000, true) + verifyServer(function () { saveSettings() }); } else { - if (configForm.parsley().validate()) { - doAjaxCall('configUpdate',$(this),'tabs',true); - postSaveChecks(); - return false; - } else { - showMsg(' Please verify your settings.',false,true,2000,true) - } + saveSettings(); } }); @@ -1264,7 +1269,7 @@ $(document).ready(function() { verifyServer(); }); - function verifyServer() { + function verifyServer(_callback) { var pms_ip = $("#pms_ip").val() var pms_port = $("#pms_port").val() if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) { @@ -1292,6 +1297,9 @@ $(document).ready(function() { $('#pms-verify').fadeIn('fast'); $("#pms-ip-group").addClass("has-error"); } + if (_callback) { + _callback(); + } } }); } else { From 21a1870884f41e54e239db9a3546f69741a40211 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 22 Nov 2015 12:24:57 -0800 Subject: [PATCH 74/84] Fix callback in wrong spot --- data/interfaces/default/settings.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 55a2ed78..6ec7cd44 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -1180,7 +1180,6 @@ $(document).ready(function() { $('.save-button').click(function() { if ($("#pms_identifier").val() == "") { - //showMsg(' Please verify your server.', false, true, 2000, true) verifyServer(function () { saveSettings() }); } else { saveSettings(); @@ -1292,13 +1291,15 @@ $(document).ready(function() { $("#pms-verify").html(''); $('#pms-verify').fadeIn('fast'); $("#pms-ip-group").removeClass("has-error"); + + if (_callback) { + _callback(); + } } else { $("#pms-verify").html(''); $('#pms-verify').fadeIn('fast'); $("#pms-ip-group").addClass("has-error"); - } - if (_callback) { - _callback(); + showMsg(' Could not verify your server.', false, true, 2000, true) } } }); @@ -1306,6 +1307,7 @@ $(document).ready(function() { $("#pms-verify").html(''); $('#pms-verify').fadeIn('fast'); $("#pms-ip-group").addClass("has-error"); + showMsg(' Could not verify your server.', false, true, 2000, true) } } From 35fa8a749bc475438d78159ee34cc06ada18312f Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 22 Nov 2015 12:28:24 -0800 Subject: [PATCH 75/84] Fix PMS IP error message --- data/interfaces/default/settings.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 6ec7cd44..01411d21 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -273,9 +273,10 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
          - +
          +

          IP Address or hostname for Plex Media Server.

          From 168e74aa23c27a469d2f7bf4b0d0293538557cc7 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 22 Nov 2015 22:15:28 -0800 Subject: [PATCH 76/84] Add logger for recently added --- plexpy/activity_pinger.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index e890e719..aa41d1fe 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -200,6 +200,7 @@ def check_recently_added(): if not plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT: for item in metadata: if 0 < int(item['added_at']) - time_threshold <= time_interval: + logger.debug(u"PlexPy Monitor :: Library item %s has been added to Plex." % str(item['rating_key'])) # Fire off notifications threading.Thread(target=notification_handler.notify_timeline, kwargs=dict(timeline_data=item, notify_action='created')).start() @@ -217,6 +218,7 @@ def check_recently_added(): logger.error(u"PlexPy Monitor :: Unable to retrieve grandparent metadata for grandparent_rating_key %s" \ % str(item['rating_key'])) + logger.debug(u"PlexPy Monitor :: Library item %s has been added to Plex." % str(item['rating_key'])) # Fire off notifications threading.Thread(target=notification_handler.notify_timeline, kwargs=dict(timeline_data=item, notify_action='created')).start() From d297597fa63a6fcf718584baef367229d78dae75 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 22 Nov 2015 22:19:37 -0800 Subject: [PATCH 77/84] Separate out movie and tv logging --- data/interfaces/default/settings.html | 12 +++++++++--- data/interfaces/default/welcome.html | 18 ++++++++++-------- plexpy/activity_processor.py | 7 +++++-- plexpy/api.py | 3 ++- plexpy/config.py | 5 +++-- plexpy/webserve.py | 13 ++++++++----- 6 files changed, 37 insertions(+), 21 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 01411d21..045f4957 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -416,15 +416,21 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
          -

          Keep records of all video items played from your Plex Media Server.

          +

          Keep records of all movie items played from your Plex Media Server.

          +
          +
          + +

          Keep records of all TV show items played from your Plex Media Server.

          -

          Keep records of all audio items played from your Plex Media Server. VERY experimental.

          +

          Keep records of all audio items played from your Plex Media Server.

          diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html index e4388b65..d5f132f6 100644 --- a/data/interfaces/default/welcome.html +++ b/data/interfaces/default/welcome.html @@ -105,8 +105,16 @@ from plexpy import common

          Monitoring

          - Log Movies and TV -

          Keep records of all video items played from your Plex Media Server.

          + Log Movies +

          Keep records of all movie items played.

          +
          +
          + Log TV Shows +

          Keep records of all TV show items played.

          +
          +
          + Log Music +

          Keep records of all audio items played.

          @@ -118,12 +126,6 @@ from plexpy import common

          The interval (in seconds) PlexPy will wait for a video item to be active before logging it. 0 to disable.

          -

          Notifications

          diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index 2e582f5d..fda00ac1 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -110,8 +110,11 @@ class ActivityProcessor(object): else: stopped = int(time.time()) - if plexpy.CONFIG.VIDEO_LOGGING_ENABLE and str(session['rating_key']).isdigit() and \ - (session['media_type'] == 'movie' or session['media_type'] == 'episode'): + if plexpy.CONFIG.MOVIE_LOGGING_ENABLE and str(session['rating_key']).isdigit() and \ + session['media_type'] == 'movie': + logging_enabled = True + elif plexpy.CONFIG.TV_LOGGING_ENABLE and str(session['rating_key']).isdigit() and \ + session['media_type'] == 'episode': logging_enabled = True elif plexpy.CONFIG.MUSIC_LOGGING_ENABLE and str(session['rating_key']).isdigit() and \ session['media_type'] == 'track': diff --git a/plexpy/api.py b/plexpy/api.py index dc9d30ac..d2d0d432 100644 --- a/plexpy/api.py +++ b/plexpy/api.py @@ -410,7 +410,8 @@ class Api(object): "refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL, "refresh_users_on_startup": bool(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP), "ip_logging_enable": bool(plexpy.CONFIG.IP_LOGGING_ENABLE), - "video_logging_enable": bool(plexpy.CONFIG.VIDEO_LOGGING_ENABLE), + "movie_logging_enable": bool(plexpy.CONFIG.MOVIE_LOGGING_ENABLE), + "tv_logging_enable": bool(plexpy.CONFIG.TV_LOGGING_ENABLE), "music_logging_enable": bool(plexpy.CONFIG.MUSIC_LOGGING_ENABLE), "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL, "pms_is_remote": bool(plexpy.CONFIG.PMS_IS_REMOTE), diff --git a/plexpy/config.py b/plexpy/config.py index c0f4b104..15ac6cbd 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -125,15 +125,16 @@ _CONFIG_DEFINITIONS = { 'LAUNCH_BROWSER': (int, 'General', 1), 'LOG_DIR': (str, 'General', ''), 'LOGGING_IGNORE_INTERVAL': (int, 'Monitoring', 120), + 'MOVIE_LOGGING_ENABLE': (int, 'Monitoring', 1), 'MOVIE_NOTIFY_ENABLE': (int, 'Monitoring', 0), 'MOVIE_NOTIFY_ON_START': (int, 'Monitoring', 1), 'MOVIE_NOTIFY_ON_STOP': (int, 'Monitoring', 0), 'MOVIE_NOTIFY_ON_PAUSE': (int, 'Monitoring', 0), + 'MUSIC_LOGGING_ENABLE': (int, 'Monitoring', 1), 'MUSIC_NOTIFY_ENABLE': (int, 'Monitoring', 0), 'MUSIC_NOTIFY_ON_START': (int, 'Monitoring', 1), 'MUSIC_NOTIFY_ON_STOP': (int, 'Monitoring', 0), 'MUSIC_NOTIFY_ON_PAUSE': (int, 'Monitoring', 0), - 'MUSIC_LOGGING_ENABLE': (int, 'Monitoring', 0), 'MONITOR_REMOTE_ACCESS': (int, 'Monitoring', 0), 'MONITORING_INTERVAL': (int, 'Monitoring', 60), 'MONITORING_USE_WEBSOCKET': (int, 'Monitoring', 0), @@ -259,6 +260,7 @@ _CONFIG_DEFINITIONS = { 'TELEGRAM_ON_CREATED': (int, 'Telegram', 0), 'TELEGRAM_ON_EXTDOWN': (int, 'Telegram', 0), 'TELEGRAM_ON_INTDOWN': (int, 'Telegram', 0), + 'TV_LOGGING_ENABLE': (int, 'Monitoring', 1), 'TV_NOTIFY_ENABLE': (int, 'Monitoring', 0), 'TV_NOTIFY_ON_START': (int, 'Monitoring', 1), 'TV_NOTIFY_ON_STOP': (int, 'Monitoring', 0), @@ -278,7 +280,6 @@ _CONFIG_DEFINITIONS = { 'TWITTER_ON_INTDOWN': (int, 'Twitter', 0), 'UPDATE_DB_INTERVAL': (int, 'General', 24), 'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1), - 'VIDEO_LOGGING_ENABLE': (int, 'Monitoring', 1), 'XBMC_ENABLED': (int, 'XBMC', 0), 'XBMC_HOST': (str, 'XBMC', ''), 'XBMC_PASSWORD': (str, 'XBMC', ''), diff --git a/plexpy/webserve.py b/plexpy/webserve.py index ba09435d..62b16cc5 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -93,10 +93,11 @@ class WebInterface(object): "movie_notify_enable": checked(plexpy.CONFIG.MOVIE_NOTIFY_ENABLE), "tv_notify_enable": checked(plexpy.CONFIG.TV_NOTIFY_ENABLE), "music_notify_enable": checked(plexpy.CONFIG.MUSIC_NOTIFY_ENABLE), - "tv_notify_on_start": checked(plexpy.CONFIG.TV_NOTIFY_ON_START), "movie_notify_on_start": checked(plexpy.CONFIG.MOVIE_NOTIFY_ON_START), + "tv_notify_on_start": checked(plexpy.CONFIG.TV_NOTIFY_ON_START), "music_notify_on_start": checked(plexpy.CONFIG.MUSIC_NOTIFY_ON_START), - "video_logging_enable": checked(plexpy.CONFIG.VIDEO_LOGGING_ENABLE), + "movie_logging_enable": checked(plexpy.CONFIG.MOVIE_LOGGING_ENABLE), + "tv_logging_enable": checked(plexpy.CONFIG.TV_LOGGING_ENABLE), "music_logging_enable": checked(plexpy.CONFIG.MUSIC_LOGGING_ENABLE), "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL, "check_github": checked(plexpy.CONFIG.CHECK_GITHUB) @@ -441,7 +442,8 @@ class WebInterface(object): "refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL, "refresh_users_on_startup": checked(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP), "ip_logging_enable": checked(plexpy.CONFIG.IP_LOGGING_ENABLE), - "video_logging_enable": checked(plexpy.CONFIG.VIDEO_LOGGING_ENABLE), + "movie_logging_enable": checked(plexpy.CONFIG.MOVIE_LOGGING_ENABLE), + "tv_logging_enable": checked(plexpy.CONFIG.TV_LOGGING_ENABLE), "music_logging_enable": checked(plexpy.CONFIG.MUSIC_LOGGING_ENABLE), "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL, "pms_is_remote": checked(plexpy.CONFIG.PMS_IS_REMOTE), @@ -490,8 +492,9 @@ class WebInterface(object): "tv_notify_on_start", "movie_notify_on_start", "music_notify_on_start", "tv_notify_on_stop", "movie_notify_on_stop", "music_notify_on_stop", "tv_notify_on_pause", "movie_notify_on_pause", "music_notify_on_pause", "refresh_users_on_startup", - "ip_logging_enable", "video_logging_enable", "music_logging_enable", "pms_is_remote", "home_stats_type", - "group_history_tables", "notify_consecutive", "notify_recently_added_grandparent", "monitor_remote_access" + "ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable", + "pms_is_remote", "home_stats_type", "group_history_tables", "notify_consecutive", + "notify_recently_added_grandparent", "monitor_remote_access" ] for checked_config in checked_configs: if checked_config not in kwargs: From 44cb2400d0719584a8fda6d10155a29d31a085a2 Mon Sep 17 00:00:00 2001 From: drzoidberg33 Date: Mon, 23 Nov 2015 10:56:44 +0200 Subject: [PATCH 78/84] Remove donate link --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 3bbd6a6c..56a90ac3 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,7 @@ A python based web application for monitoring, analytics and notifications for P This project is based on code from Headphones (https://github.com/rembo10/headphones) and PlexWatchWeb (https://github.com/ecleese/plexWatchWeb). -* plexPy forum thread: https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program - -If you'd like to buy me a beer, hit the donate button below. All donations go to the project maintainer (primarily for the procurement of liquid refreshment). - -[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G9HZK9BDJLKT6) +* PlexPy forum thread: https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program ###Support From f7cdfd3f30c96371220fea95fa11122b75d93c10 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Mon, 23 Nov 2015 21:19:16 -0800 Subject: [PATCH 79/84] Upgrade config file from previous versions --- plexpy/config.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/plexpy/config.py b/plexpy/config.py index 15ac6cbd..6362b96a 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -280,6 +280,7 @@ _CONFIG_DEFINITIONS = { 'TWITTER_ON_INTDOWN': (int, 'Twitter', 0), 'UPDATE_DB_INTERVAL': (int, 'General', 24), 'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1), + 'VIDEO_LOGGING_ENABLE': (int, 'Monitoring', 1), 'XBMC_ENABLED': (int, 'XBMC', 0), 'XBMC_HOST': (str, 'XBMC', ''), 'XBMC_PASSWORD': (str, 'XBMC', ''), @@ -305,6 +306,7 @@ class Config(object): self._config = ConfigObj(self._config_file, encoding='utf-8') for key in _CONFIG_DEFINITIONS.keys(): self.check_setting(key) + self._upgrade() def _define(self, name): key = name.upper() @@ -393,4 +395,18 @@ class Config(object): """ for name, value in kwargs.items(): key, definition_type, section, ini_key, default = self._define(name) - self._config[section][ini_key] = definition_type(value) \ No newline at end of file + self._config[section][ini_key] = definition_type(value) + + def _upgrade(self): + """ + Upgrades config file from previous verisions and bumps up config version + """ + if self.CONFIG_VERSION == '0': + # Separate out movie and tv notifications + if self.MOVIE_NOTIFY_ENABLE == 1: + self.TV_NOTIFY_ENABLE = 1 + # Separate out movie and tv logging + if self.VIDEO_LOGGING_ENABLE == 0: + self.MOVIE_LOGGING_ENABLE = 0 + self.TV_LOGGING_ENABLE = 0 + self.CONFIG_VERSION = '1' \ No newline at end of file From c296b38b7859011b5761a73cb706dc115b116146 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Mon, 23 Nov 2015 21:20:09 -0800 Subject: [PATCH 80/84] Fix text glitch on welcome wizard --- data/interfaces/default/settings.html | 2 +- data/interfaces/default/welcome.html | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 045f4957..bee3db05 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -430,7 +430,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents() -

          Keep records of all audio items played from your Plex Media Server.

          +

          Keep records of all music items played from your Plex Media Server.

          diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html index d5f132f6..a841eb92 100644 --- a/data/interfaces/default/welcome.html +++ b/data/interfaces/default/welcome.html @@ -104,17 +104,15 @@ from plexpy import common

          Monitoring

          +

          Keep records of all movie, TV show, or music items played from your Plex Media Server.

          Log Movies -

          Keep records of all movie items played.

          Log TV Shows -

          Keep records of all TV show items played.

          Log Music -

          Keep records of all audio items played.

          From 50e0629890375b747ecd08a8c0bb7ae4a523b510 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Mon, 23 Nov 2015 23:05:12 -0800 Subject: [PATCH 81/84] Fix unicode server name --- plexpy/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexpy/config.py b/plexpy/config.py index 6362b96a..08054742 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -26,7 +26,7 @@ _CONFIG_DEFINITIONS = { 'PMS_IP': (str, 'PMS', '127.0.0.1'), 'PMS_IS_REMOTE': (int, 'PMS', 0), 'PMS_LOGS_FOLDER': (str, 'PMS', ''), - 'PMS_NAME': (str, 'PMS', ''), + 'PMS_NAME': (unicode, 'PMS', ''), 'PMS_PORT': (int, 'PMS', 32400), 'PMS_TOKEN': (str, 'PMS', ''), 'PMS_SSL': (int, 'General', 0), From 244b03ba3e086aeef1167637a35aa6cdeafbbfa5 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Mon, 23 Nov 2015 23:07:45 -0800 Subject: [PATCH 82/84] No restart required for monitoring remote access --- data/interfaces/default/settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index bee3db05..2129b5aa 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -406,7 +406,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()

          Enable to have PlexPy check if remote access to the Plex Media Server goes down. Your server needs to have remote access enabled.

          From af2d0446dac5836f16f575b75b026cf1d6eecb5e Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 24 Nov 2015 18:21:59 -0800 Subject: [PATCH 83/84] Hide fix metadata button for now --- data/interfaces/default/info.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 5e35dfc0..eb0bf32a 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -612,11 +612,13 @@ DOCUMENTATION :: END % endif % if data['media_type'] != 'library': + % endif % if data['media_type'] != 'library' and data['rating']: