v2.0.26-beta

API.md

@@ -1674,7 +1674,8 @@ Optional parameters:
     remote (int):       0 or 1
 
 Returns:
-    string:             The unique PMS identifier
+    json:
+        {'identifier': '08u2phnlkdshf890bhdlksghnljsahgleikjfg9t'}
 ```
 
 

CHANGELOG.md

@@ -1,5 +1,60 @@
 # Changelog
 
+## v2.0.26-beta (2018-03-30)
+
+* Monitoring:
+  * New: Setting to change the refresh interval on the homepage.
+  * Fix: Identify extras correctly on the activity cards.
+* Notifications:
+  * Change: Send Telegram image and text separately if the caption is longer than 200 characters.
+* UI:
+  * Fix: Error when clicking on synced playlist links.
+
+
+## v2.0.25 (2018-03-22)
+
+* Monitoring:
+  * Fix: Websocket not reconnecting causing activity monitoring and notifications to not work.
+  * Fix: Error checking for synced streams without Plex Pass.
+
+
+## v2.0.24 (2018-03-18)
+
+* Monitoring:
+  * Fix: Fix stream data not showing for history recorded before v2.
+* Notifications:
+  * Fix: Set all environment variables for scripts.
+  * Change: Moved all notification agent instructions to the wiki.
+  * Change: XBMC notification agent renamed to Kodi.
+  * Change: OSX Notify notification agent renamed to macOS Notification Center.
+
+
+## v2.0.23-beta (2018-03-16)
+
+* Monitoring:
+  * Fix: Certain transcode stream showing incorrectly as direct play in history. Fix is not retroactive.
+* Notifications:
+  * New: Added season/episode/album/track count to notification parameters.
+  * New: Added "Value 3" setting for IFTTT notifications.
+  * New: Set PLEX_URL, PLEX_TOKEN, TAUTULLI_URL, and TAUTULLI_APIKEY environment variables for scripts.
+  * Fix: Notifications failing to send with invalid custom conditions json.
+  * Fix: Email notifications failing with unicode username/passwords.
+  * Change: Facebook Graph API version updated to v2.12.
+* UI:
+  * New: Show the Plex Server URL in the settings.
+  * Fix: Incorrect info displayed in the Tautulli login logs.
+* API:
+  * Fix: API returning empty data if a message was in the original data.
+  * Change: get_server_id command returns json instead of string.
+* Other:
+  * Fix: Forgot git pull when changing branches in the web UI.
+
+
+## v2.0.22 (2018-03-10)
+
+* Tautulli v2 release!
+
+
 ## v2.0.22-beta (2018-03-09)
 
 * Notifications:

Tautulli.py

@@ -186,8 +186,12 @@ def main():
     plexpy.DB_FILE = os.path.join(plexpy.DATA_DIR, database.FILENAME)
 
     # Move 'plexpy.db' to 'tautulli.db'
-    if os.path.isfile(os.path.join(plexpy.DATA_DIR, 'plexpy.db')):
-        os.rename(os.path.join(plexpy.DATA_DIR, 'plexpy.db'), plexpy.DB_FILE)
+    if os.path.isfile(os.path.join(plexpy.DATA_DIR, 'plexpy.db')) and \
+            not os.path.isfile(os.path.join(plexpy.DATA_DIR, plexpy.DB_FILE)):
+        try:
+            os.rename(os.path.join(plexpy.DATA_DIR, 'plexpy.db'), plexpy.DB_FILE)
+        except OSError as e:
+            raise SystemExit("Unable to rename plexpy.db to tautulli.db: %s", e)
 
     if plexpy.DAEMON:
         plexpy.daemonize()

data/interfaces/default/css/tautulli.css

@@ -134,9 +134,6 @@ div.form-control .selectize-input {
     text-transform: uppercase;
     font-size: 10px;
 }
-.react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values.negative-operator .value-wrapper:not(:first-child):before {
-    content: "and" !important;
-}
 .react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values .resizable-input {
     padding-top: 3px !important;
     padding-bottom: 3px !important;
@@ -297,10 +294,6 @@ object {
     font-weight: bold;
     text-transform: uppercase;
 }
-.padded-header h3 small {
-    font-size: 13px;
-    text-transform: none;
-}
 .btn {
     outline:0px !important;
 }
@@ -2380,6 +2373,18 @@ a .library-user-instance-box:hover {
     margin-top: 9px;
     width: 175px;
 }
+.home-padded-header .info-bar {
+    float: left;
+    margin-left: 15px;
+    line-height: 35px;
+}
+.home-padded-header .info-bar small {
+    font-size: 13px;
+    font-weight: normal;
+    text-transform: none;
+    line-height: 1;
+    color: #777;
+}
 .home-padded-header .button-bar {
     float: left;
 }
@@ -3694,6 +3699,7 @@ a:hover .overlay-refresh-image:hover {
 }
 .git-group select.form-control {
     width: 50%;
+    height: 32px;
 }
 #changelog-modal .modal-body > h2 {
     margin-bottom: 10px;

data/interfaces/default/current_activity_instance.html

@@ -64,7 +64,7 @@ DOCUMENTATION :: END
     from collections import defaultdict
     from urllib import quote
     from plexpy import helpers
-    from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES
+    from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES, EXTRA_TYPES
     import plexpy
 %>
 <%
@@ -108,7 +108,11 @@ DOCUMENTATION :: END
                         <div id="poster-${sk}" class="dashboard-activity-cover" style="background-image: url(pms_image_proxy?img=${data['parent_thumb']}&width=300&height=300&fallback=cover&refresh=true);"></div>
                     </a>
                     % elif data['media_type'] in ('photo', 'clip'):
-                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['parent_thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
+                        % if data['extra_type']:
+                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['art'].replace('/art', '/thumb') or data['thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
+                        % else:
+                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['parent_thumb'] or data['thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
+                        % endif
                     % else:
                     <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(images/art.png);"></div>
                     % endif
@@ -301,14 +305,13 @@ DOCUMENTATION :: END
                             <li class="dashboard-activity-info-item">
                                 <div class="sub-heading">Bandwidth</div>
                                 <div class="sub-value time-right">
-                                    % if data['media_type'] != 'photo' and helpers.cast_to_int(data['bandwidth']):
+                                    % if data['media_type'] != 'photo' and data['bandwidth'] != 'Unknown':
                                     <%
                                         bw = helpers.cast_to_int(data['bandwidth'])
-                                        if bw != "Unknown":
-                                            if bw > 1000:
-                                                bw = str(round(bw / 1000.0, 1)) + ' Mbps'
-                                            else:
-                                                bw = str(bw) + ' kbps'
+                                        if bw > 1000:
+                                            bw = str(round(bw / 1000.0, 1)) + ' Mbps'
+                                        else:
+                                            bw = str(bw) + ' kbps'
                                     %>
                                     <span id="stream-bandwidth-${sk}">${bw}</span>
                                     <span id="streaming-brain-${sk}" data-toggle="tooltip" title="Streaming Brain Estimate (Required Bandwidth)"><i class="fa fa-info-circle"></i></span>
@@ -440,7 +443,12 @@ DOCUMENTATION :: END
                     % elif data['media_type'] == 'photo':
                     <span title="${data['title']}" class="sub-heading">${data['title']}</span>
                     % else:
-                    <span title="${data['year']}" class="sub-heading">${data['year']}</span>
+                        % if data['extra_type']:
+                        <% extra_type = EXTRA_TYPES.get(data['extra_type'], data['sub_type'].capitalize()) %>
+                        <span title="${data['year']} (${extra_type})" class="sub-heading">${data['year']} (${extra_type})</span>
+                        % else:
+                        <span title="${data['year']}" class="sub-heading">${data['year']}</span>
+                        % endif
                     % endif
                 % elif data['channel_title']:
                 <span title="${data['channel_title']}" class="sub-heading">${data['channel_title']}</span>

data/interfaces/default/history.html

@@ -113,7 +113,7 @@
         // Load user ids and names (for the selector)
         $.ajax({
             url: 'get_user_names',
-            type: 'get',
+            type: 'GET',
             dataType: 'json',
             success: function (data) {
                 var select = $('#history-user');
@@ -130,6 +130,7 @@
         function loadHistoryTable(media_type, selected_user_id) {
             history_table_options.ajax = {
                 url: 'get_history',
+                type: 'POST',
                 data: function (d) {
                     return {
                         json_data: JSON.stringify(d),
@@ -163,7 +164,7 @@
         }
 
         var media_type = null;
-        var selected_user_id = "${_session['user_id']}" == "None" ? null : "${_session['user_id']}";
+        var selected_user_id = "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}";
         loadHistoryTable(media_type, selected_user_id);
 
         % if _session['user_group'] == 'admin':

data/interfaces/default/index.html

@@ -10,8 +10,16 @@
     % if section == 'current_activity':
     <div class="row">
         <div class="col-md-12">
-            <div class="padded-header" id="current-activity-header">
-                <h3><span id="sessions-shortcut">Activity</span> &nbsp;&nbsp;
+            <div class="home-padded-header padded-header" id="current-activity-header">
+                <h3 class="pull-left"><span id="sessions-shortcut">Current Activity</span></h3>
+                <div class="button-bar">
+                    <div class="input-group pull-left" style="width: 1px; margin-right: 3px" id="activity-refresh-interval-selection">
+                        <span class="input-group-addon btn-dark inactive">Refresh Every</span>
+                        <input type="number" class="form-control number-input" name="activity-refresh-interval" id="activity-refresh-interval" value="${config['home_refresh_interval']}" min="2" data-default="2" data-toggle="tooltip" title="Min: 2 seconds" />
+                        <span class="input-group-addon btn-dark inactive">seconds</span>
+                    </div>
+                </div>
+                <div class="info-bar">
                     <small>
                         <span id="currentActivityHeader" style="display: none;">
                             Streams: <span id="currentActivityHeader-streams"></span> |
@@ -19,7 +27,7 @@
                             <span id="currentActivityHeader-bandwidth-tooltip" data-toggle="tooltip" title="Streaming Brain Estimate (Required Bandwidth)"><i class="fa fa-info-circle"></i></span>
                         </span>
                     </small>
-                </h3>
+                </div>
             </div>
             <div id="currentActivity">
                 <% from plexpy import PLEX_SERVER_UP %>
@@ -507,17 +515,15 @@
 
                         $('#location-' + key).html(s.location.toUpperCase());
 
-                        if (s.media_type !== 'photo' && parseInt(s.bandwidth)) {
-                            var bw = parseInt(s.bandwidth);
-                            if (bw !== "Unknown") {
-                                if (bw > 1000) {
-                                    bw = (bw / 1000).toFixed(1) + ' Mbps';
-                                } else {
-                                    bw = bw + ' kbps'
-                                }
+                        if (s.media_type !== 'photo' && s.bandwidth !== 'Unknown') {
+                            var bw = parseInt(s.bandwidth) || 0;
+                            if (bw > 1000) {
+                                bw = (bw / 1000).toFixed(1) + ' Mbps';
+                            } else {
+                                bw = bw + ' kbps'
                             }
                             $('#stream-bandwidth-' + key).html(bw);
-                        }
+                        };
 
                         // Update the stream progress times
                         $('#stream-eta-' + key).html(moment().add(parseInt(s.duration) - parseInt(s.view_offset), 'milliseconds').format(time_format));
@@ -585,11 +591,16 @@
     }
 
     getCurrentActivity();
-    setInterval(function () {
-        if (!(create_instances.length) && activity_ready) {
-            getCurrentActivity();
-        }
-    }, 2000);
+
+    function refreshActivity(seconds) {
+        return setInterval(function () {
+            if (!(create_instances.length) && activity_ready) {
+                getCurrentActivity();
+            }
+        }, seconds * 1000);
+    }
+    var refresh_interval = $('#activity-refresh-interval').val();
+    var activityRefresh = refreshActivity(refresh_interval);
 
     setInterval(function(){
         $('.progress_time_offset').each(function () {
@@ -604,7 +615,7 @@
             if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
                 var view_offset = parseInt($(this).data('view_offset'));
                 var stream_duration = parseInt($(this).data('stream_duration'));
-                var progress_percent = Math.min(Math.trunc(view_offset / stream_duration * 100), 100)
+                var progress_percent = Math.min(Math.trunc(view_offset / stream_duration * 100), 100);
                 $(this).width(progress_percent - 3 + '%').html(progress_percent + '%')
                     .attr('data-original-title', 'Stream Progress ' + progress_percent + '%')
                     .data('view_offset', Math.min(view_offset + 1000, stream_duration));
@@ -685,6 +696,16 @@
            window.open(sessions_url, '_blank');
         });
     });
+
+    $('#activity-refresh-interval').change(function () {
+        forceMinMax($(this));
+        clearInterval(activityRefresh);
+        refresh_interval = $(this).val();
+        activityRefresh = refreshActivity(refresh_interval);
+        $.post('set_home_stats_config', { refresh_interval: refresh_interval });
+    });
+
+    $('#activity-refresh-interval').tooltip({ container: 'body', placement: 'top', html: true });
     % endif
 </script>
 % endif

data/interfaces/default/info.html

@@ -547,12 +547,12 @@ DOCUMENTATION :: END
     function get_history() {
         history_table_options.ajax = {
             url: 'get_history',
-            type: 'post',
+            type: 'POST',
             data: function ( d ) {
                 return { 
                     json_data: JSON.stringify( d ),
                     grandparent_rating_key: "${data['rating_key']}",
-                    user_id: "${_session['user_id']}" == "None" ? null : "${_session['user_id']}"
+                    user_id: "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"
                 };
             }
         }
@@ -563,12 +563,12 @@ DOCUMENTATION :: END
     function get_history() {
         history_table_options.ajax = {
             url: 'get_history',
-            type: 'post',
+            type: 'POST',
             data: function ( d ) {
                 return { 
                     json_data: JSON.stringify( d ),
                     parent_rating_key: "${data['rating_key']}",
-                    user_id: "${_session['user_id']}" == "None" ? null : "${_session['user_id']}"
+                    user_id: "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"
                 };
             }
         }
@@ -579,12 +579,12 @@ DOCUMENTATION :: END
     function get_history() {
         history_table_options.ajax = {
             url: 'get_history',
-            type: 'post',
+            type: 'POST',
             data: function ( d ) {
                 return { 
                     json_data: JSON.stringify( d ),
                     rating_key: "${data['rating_key']}",
-                    user_id: "${_session['user_id']}" == "None" ? null : "${_session['user_id']}"
+                    user_id: "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"
                 };
             }
         }

data/interfaces/default/js/script.js

@@ -292,7 +292,11 @@ function millisecondsToMinutes(ms, roundToMinute) {
     if (ms > 0) {
       var minutes = Math.floor(ms / 60000);
       var seconds = ((ms % 60000) / 1000).toFixed(0);
-      return (seconds == 60 ? (minutes+1) + ":00" : minutes + ":" + (seconds < 10 ? "0" : "") + seconds);
+      if (roundToMinute) {
+          return (seconds >= 30 ? (minutes + 1) : minutes);
+      } else {
+          return (seconds == 60 ? (minutes + 1) + ":00" : minutes + ":" + (seconds < 10 ? "0" : "") + seconds);
+      }
     } else {
         if (roundToMinute) {
             return '0';

data/interfaces/default/js/tables/sync_table.js

@@ -37,7 +37,6 @@ sync_table_options = {
             "data": "state",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData === 'pending') {
-                    $(td).addClass('currentlyWatching');
                     $(td).html('Pending...');
                 } else {
                     $(td).html(cellData.toProperCase());
@@ -66,7 +65,7 @@ sync_table_options = {
             "data": "sync_title",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
-                    if (rowData['metadata_type'] !== '') {
+                    if (rowData['rating_key']) {
                         $(td).html('<a href="info?rating_key=' + rowData['rating_key'] + '">' + cellData + '</a>');
                     } else {
                         $(td).html(cellData);
@@ -74,7 +73,7 @@ sync_table_options = {
                 }
             },
             "className": "datatable-wrap"
-},
+        },
         {
             "targets": [4],
             "data": "metadata_type",
@@ -150,6 +149,11 @@ sync_table_options = {
     "preDrawCallback": function (settings) {
         var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
         showMsg(msg, false, false, 0)
+    },
+    "rowCallback": function (row, rowData, rowIndex) {
+        if (rowData['state'] === 'pending') {
+            $(row).addClass('current-activity-row');
+        }
     }
 };
 

data/interfaces/default/libraries.html

@@ -91,7 +91,7 @@
                     json_data: JSON.stringify(d)
                 };
             }
-        }
+        };
 
         libraries_list_table = $('#libraries_list_table').DataTable(libraries_list_table_options);
         var colvis = new $.fn.dataTable.ColVis(libraries_list_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 1] });

data/interfaces/default/library.html

@@ -374,12 +374,12 @@ DOCUMENTATION :: END
         // Build watch history table
         history_table_options.ajax = {
             url: 'get_history',
-            type: 'post',
+            type: 'POST',
             data: function ( d ) {
                 return {
                     json_data: JSON.stringify( d ),
                     section_id: section_id,
-                    user_id: "${_session['user_id']}" == "None" ? null : "${_session['user_id']}"
+                    user_id: "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"
                 };
             }
         };
@@ -406,7 +406,7 @@ DOCUMENTATION :: END
         // Build media info table
         media_info_table_options.ajax = {
             url: 'get_library_media_info',
-            type: 'post',
+            type: 'POST',
             data: function ( d ) {
                 return {
                     json_data: JSON.stringify( d ),

data/interfaces/default/logs.html

@@ -229,8 +229,8 @@
         var selected_log_level = null;
         function loadtautullilogs(logfile, selected_log_level) {
             log_table_options.ajax = {
-                url: "get_log",
-                type: 'post',
+                url: 'get_log',
+                type: 'POST',
                 data: function (d) {
                     return {
                         logfile: logfile,
@@ -249,7 +249,8 @@
 
         function loadPlexLogs() {
             plex_log_table_options.ajax = {
-                url: "get_plex_log?log_type=server"
+                url: 'get_plex_log?log_type=server',
+                type: 'POST'
             };
             plex_log_table_options.initComplete = bindLogLevelFilter;
             plex_log_table = $('#plex_log_table').DataTable(plex_log_table_options);
@@ -257,7 +258,8 @@
 
         function loadPlexScannerLogs() {
             plex_log_table_options.ajax = {
-                url: "get_plex_log?log_type=scanner"
+                url: 'get_plex_log?log_type=scanner',
+                type: 'POST'
             };
             plex_log_table_options.initComplete = bindLogLevelFilter;
             plex_scanner_log_table = $('#plex_scanner_log_table').DataTable(plex_log_table_options);
@@ -265,7 +267,8 @@
 
         function loadNotificationLogs() {
             notification_log_table_options.ajax = {
-                url: "get_notification_log",
+                url: 'get_notification_log',
+                type: 'POST',
                 data: function (d) {
                     return {
                         json_data: JSON.stringify(d)
@@ -278,7 +281,8 @@
         function loadLoginLogs() {
             login_log_table_options.pageLength = 50;
             login_log_table_options.ajax = {
-                url: "get_user_logins",
+                url: 'get_user_logins',
+                type: 'POST',
                 data: function (d) {
                     return {
                         json_data: JSON.stringify(d)

data/interfaces/default/mobile_devices_table.html

@@ -55,7 +55,7 @@ DOCUMENTATION :: END
             })
         }
         return deferred;
-    }
+    };
 
     function checkQRAddress(url) {
         var parser = document.createElement('a');
@@ -82,7 +82,7 @@ DOCUMENTATION :: END
         verifiedDevice = false;
 
         getPlexPyURL().then(function (url) {
-            checkQRAddress(url)
+            checkQRAddress(url);
 
             $.get('generate_api_key', { device: true }).then(function (token) {
                 $('#api_qr_address').val(url);
@@ -120,7 +120,7 @@ DOCUMENTATION :: END
 
     $('#api_qr_address').change(function () {
         var url = $(this).val();
-        checkQRAddress(url)
+        checkQRAddress(url);
 
         $('#api_qr_code').empty().qrcode({
             text: url + '|' + $('#api_qr_token').val()

data/interfaces/default/notifier_config.html

@@ -45,9 +45,6 @@
                                         <div class="row">
                                             <div class="col-md-12">
                                                 <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" ${'readonly' if item.get('readonly') else ''}>
-                                                % if item['name'] == 'osx_notify_app':
-                                                <a href="javascript:void(0)" id="osxnotifyregister">Register</a>
-                                                % endif
                                             </div>
                                         </div>
                                         <p class="help-block">${item['description'] | n}</p>
@@ -171,7 +168,7 @@
 
                             <div class="form-group">
                                 <label for="custom_conditions_logic">Condition Logic</label>
-                                <input type="text" class="form-control" name="custom_conditions_logic" id="custom_conditions_logic" value="${notifier['custom_conditions_logic']}" required />
+                                <input type="text" class="form-control" name="custom_conditions_logic" id="custom_conditions_logic" value="${notifier['custom_conditions_logic']}" />
                                 <div id="custom_conditions_logic_error" class="alert alert-danger" role="alert" style="padding-top: 5px; padding-bottom: 5px; margin: 0; display: none;"><i class="fa fa-exclamation-triangle" style="color: #a94442;"></i> <span></span></div>
                                 <p class="help-block">
                                     Optional: Enter custom logic to use when evaluating the conditions (e.g. <span class="inline-pre">{1} and ({2} or {3})</span>).
@@ -333,31 +330,16 @@
     $('#notifier-config-modal').unbind('hidden.bs.modal');
 
     // Need this for setting conditions since conditions contain the character "
-    $('#custom_conditions').val(${json.dumps(notifier["custom_conditions"]) | n});
+    $('#custom_conditions').val(JSON.stringify(${json.dumps(notifier["custom_conditions"]) | n}));
 
     $('#condition-widget').filterer({
-        parameters: ${parameters | n},
-        conditions: ${notifier["custom_conditions"] | n},
+        parameters: ${json.dumps(parameters) | n},
+        conditions: ${json.dumps(notifier["custom_conditions"]) | n},
         updateConditions: function(newConditions){
             $('#custom_conditions').val(JSON.stringify(newConditions));
         }
     });
 
-    function setNegativeOperator(select) {
-       if (select.val() === 'does not contain' || select.val() === 'is not') {
-           select.closest('.form-group').find('.react-selectize-search-field-and-selected-values').addClass('negative-operator');
-       } else {
-           select.closest('.form-group').find('.react-selectize-search-field-and-selected-values').removeClass('negative-operator');
-       }
-    }
-
-    $('#condition-widget select[name=operator]').each(function () {
-        setNegativeOperator($(this));
-    });
-    $('#condition-widget').on('change', 'select[name=operator]', function () {
-        setNegativeOperator($(this));
-    });
-
     function reloadModal() {
         $.ajax({
             url: 'get_notifier_config_modal',
@@ -433,16 +415,30 @@
     });
 
     % if notifier['agent_name'] == 'facebook':
+    if (location.protocol !== 'https:') {
+        $('#tabs-config .form-group:first').prepend(
+            '<div class="form-group">' +
+            '<label>Warning</label>' +
+            '<p class="help-block" style="color: #eb8600;">Facebook requires HTTPS for authorization. ' +
+            'Please enable HTTPS for Tautulli under <a data-tab-destination="tabs-web_interface" data-dismiss="modal" style="cursor: pointer;">Web Interface</a>.</p>' +
+            '</div>'
+        );
+        $('#facebook_redirect_uri').val('HTTPS not enabled');
+
+    } else {
+        $('#facebook_redirect_uri').val(location.href.split('/settings')[0] + '/facebook_redirect');
+    }
+
     function disableFacebookRequest() {
-        if ($('#facebook_app_id').val() !== '' && $('#facebook_app_secret').val() !== '') { $('#facebook_facebookStep1').prop('disabled', false); }
-        else { $('#facebook_facebookStep1').prop('disabled', true); }
+        if ($('#facebook_app_id').val() !== '' && $('#facebook_app_secret').val() !== '') { $('#facebook_facebook_auth').prop('disabled', false); }
+        else { $('#facebook_facebook_auth').prop('disabled', true); }
     }
     disableFacebookRequest();
     $('#facebook_app_id, #facebook_app_secret').on('change', function () {
         disableFacebookRequest();
     });
 
-    $('#facebook_facebookStep1').click(function () {
+    $('#facebook_facebook_auth').click(function () {
         // Remove trailing '/' from Facebook redirect URI
         if ($('#facebook_redirect_uri') && $('#facebook_redirect_uri').val().endsWith('/')) {
             $('#facebook_redirect_uri').val($('#facebook_redirect_uri').val().slice(0, -1));
@@ -450,7 +446,7 @@
 
         var facebook_token;
         $.ajax({
-            url: 'facebookStep1',
+            url: 'facebook_auth',
             data: {
                 app_id: $('#facebook_app_id').val(),
                 app_secret: $('#facebook_app_secret').val(),
@@ -508,7 +504,7 @@
     });
 
     % elif notifier['agent_name'] == 'osx':
-    $('#osxnotifyregister').click(function () {
+    $('#osx_notify_register').click(function () {
         var osx_notify_app = $('#osx_notify_app').val();
         $.get('osxnotifyregister', { 'app': osx_notify_app }, function (data) { showMsg('<i class="fa fa-check"></i> ' + data, false, true, 3000); });
     });

data/interfaces/default/notifiers_table.html

@@ -10,7 +10,7 @@ DOCUMENTATION :: END
 </%doc>
 
 <ul class="stacked-configs list-unstyled">
-    % for notifier in sorted(notifiers_list, key=lambda k: (k['agent_label'], k['friendly_name'], k['id'])):
+    % for notifier in sorted(notifiers_list, key=lambda k: (k['agent_label'].lower(), k['friendly_name'], k['id'])):
     <li class="notification-agent" data-id="${notifier['id']}">
         <span>
             <span class="toggle-left trigger-tooltip ${'active' if notifier['active'] else ''}" data-toggle="tooltip" data-placement="top" title="Triggers ${'active' if notifier['active'] else 'inactive'}"><i class="fa fa-lg fa-bell"></i></span>

data/interfaces/default/settings.html

@@ -267,6 +267,10 @@
 
                     <div role="tabpanel" class="tab-pane" id="tabs-homepage">
 
+                        <div class="padded-header">
+                            <h3>Activity</h3>
+                        </div>
+
                         <div class="padded-header">
                             <h3>Sections</h3>
                         </div>
@@ -642,7 +646,7 @@
                             <label for="pms_port">Plex Port</label>
                             <div class="row">
                                 <div class="col-md-2">
-                                    <input data-parsley-type="integer" class="pms-settings form-control" type="text" id="pms_port" name="pms_port" value="${config['pms_port']}" size="30" data-parsley-trigger="change" data-parsley-errors-container="#pms_port_error" required>
+                                    <input data-parsley-type="integer" class="form-control pms-settings" type="text" id="pms_port" name="pms_port" value="${config['pms_port']}" size="30" data-parsley-trigger="change" data-parsley-errors-container="#pms_port_error" required>
                                 </div>
                                 <div id="pms_port_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
@@ -650,29 +654,40 @@
                         </div>
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="pms_is_remote_checkbox" class="checkbox-toggle" data-id="pms_is_remote" value="1" ${checked(config['pms_is_remote'])}> Remote Server
+                                <input type="checkbox" id="pms_is_remote_checkbox" class="checkbox-toggle pms-settings" data-id="pms_is_remote" value="1" ${checked(config['pms_is_remote'])}> Remote Server
                                 <input type="hidden" id="pms_is_remote" name="pms_is_remote" value="${config['pms_is_remote']}">
                             </label>
                             <p class="help-block">Check this if your Plex Server is not on the same local network as Tautulli.</p>
                         </div>
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="pms_ssl_checkbox" class="checkbox-toggle" data-id="pms_ssl" value="1" ${checked(config['pms_ssl'])}> Use SSL
+                                <input type="checkbox" id="pms_ssl_checkbox" class="checkbox-toggle pms-settings" data-id="pms_ssl" value="1" ${checked(config['pms_ssl'])}> Use SSL
                                 <input type="hidden" id="pms_ssl" name="pms_ssl" value="${config['pms_ssl']}">
                             </label>
                             <p class="help-block">If you have secure connections enabled on your Plex Server, communicate with it securely.</p>
                         </div>
+                        <div class="form-group">
+                            <label for="pms_url">Plex Server URL</label>
+                            <div class="row">
+                                <div class="col-md-9">
+                                    <input type="text" class="form-control" id="pms_url" name="pms_url" value="${config['pms_url']}" size="30" readonly>
+                                </div>
+                            </div>
+                            <p class="help-block">
+                                The server URL that Tautulli will use to connect to your Plex server. Retrieved automatically.
+                            </p>
+                        </div>
                         <div class="checkbox advanced-setting">
                             <label>
-                                <input type="checkbox" id="pms_url_manual" name="pms_url_manual" value="1" ${config['pms_url_manual']}> Manual Connection
+                                <input type="checkbox" class="pms-settings" id="pms_url_manual" name="pms_url_manual" value="1" ${config['pms_url_manual']}> Manual Connection
                             </label>
                             <span id="cloudManualConnection" style="display: none; color: #eb8600; padding-left: 10px;"> Not available for Plex Cloud servers.</span>
                             <p class="help-block">Use the user defined connection details. Do not retrieve the server connection URL automatically.</p>
                         </div>
                         <div class="form-group advanced-setting">
-                            <label for="pms_logs_folder">Plex Web URL</label>
+                            <label for="pms_web_url">Plex Web URL</label>
                             <div class="row">
-                                <div class="col-md-6">
+                                <div class="col-md-9">
                                     <div class="input-group">
                                         <input type="text" class="form-control" id="pms_web_url" name="pms_web_url" value="${config['pms_web_url']}" size="30" data-parsley-trigger="change" data-parsley-pattern="^https?:\/\/\S+$|^https:\/\/app.plex.tv\/desktop$" data-parsley-errors-container="#pms_web_url_error"  data-parsley-error-message="Invalid Plex Web URL.">
                                         <span class="input-group-btn">
@@ -953,6 +968,9 @@
                         <p class="help-block">
                             Add a new notification agent, or configure an existing notification agent by clicking the settings icon on the right.
                         </p>
+                        <p class="help-block">
+                            Please see the <a target='_blank' href='${anon_url('https://github.com/%s/%s-Wiki/wiki/Notification-Agents-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}'>Notification Agents Guide</a> for instructions on setting up each notification agent.
+                        </p>
                         <br />
                         <div id="plexpy-notifiers-table">
                             <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading notification agents...</div>
@@ -967,7 +985,7 @@
                             <h3>Database Import</h3>
                         </div>
 
-                        <p class="help-block">Click a button below to import an exisiting database from another app.</p>
+                        <p class="help-block">Click a button below to import an existing database from another app.</p>
                         <div class="btn-group">
                             <button class="btn btn-form toggle-app-import-modal" type="button" data-target="#app-import-modal" data-toggle="modal" data-app="plexwatch">PlexWatch</button>
                             <button class="btn btn-form toggle-app-import-modal" type="button" data-target="#app-import-modal" data-toggle="modal" data-app="plexivity">Plexivity</button>
@@ -1062,8 +1080,8 @@
                         </div>
                         <p class="form-group">
                             <label>Registered Devices</label>
-                            <p class="help-block">Register a new device, or configure an existing device by clicking the settings icon on the right.</p>
-                            <p id="app_api_msg" style="color: #eb8600;">The API must be enabled under <a data-tab-destination="tabs-access_control" style="cursor: pointer;">Access Control</a> to use the app.</p>
+                            <p class="help-block">Register a new device using a QR code, or configure an existing device by clicking the settings icon on the right.</p>
+                            <p id="app_api_msg" style="color: #eb8600;">The API must be enabled under <a data-tab-destination="tabs-web_interface" style="cursor: pointer;">Web Interface</a> to use the app.</p>
                             <div class="row">
                                 <div id="plexpy-mobile-devices-table" class="col-md-12">
                                     <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading registered devices...</div>
@@ -1214,7 +1232,7 @@
                     <div class="row">
                         <div class="col-md-12">
                             <ul class="stacked-configs list-unstyled">
-                                % for agent in available_notification_agents:
+                                % for agent in sorted(available_notification_agents, key=lambda k: k['label'].lower()):
                                 <li class="new-notification-agent" data-id="${agent['id']}">
                                     <span>${agent['label']}</span>
                                 </li>
@@ -1573,7 +1591,7 @@ $(document).ready(function() {
     }
 
     function preSaveChecks(_callback) {
-        if ($("#pms_identifier").val() == "") {
+        if (serverChanged) {
             verifyServer();
         }
         verifyPMSWebURL();
@@ -1585,7 +1603,7 @@ $(document).ready(function() {
 
     // Alert the user that their changes require a restart.
     function postSaveChecks() {
-        if (serverChanged || authChanged || httpChanged || directoryChanged) {
+        if (authChanged || httpChanged || directoryChanged) {
           $('#restart-modal').modal('show');
         }
         $("#http_hashed_password").val($("#http_hash_password").is(":checked") ? 1 : 0);
@@ -1769,9 +1787,8 @@ $(document).ready(function() {
 
     $( ".pms-settings" ).change(function() {
         serverChanged = true;
-        $("#pms_identifier").val("");
         $("#server_changed").prop('checked', true);
-        verifyServer();
+        $("#pms_verify").hide();
     });
 
     $('.checkbox-toggle').click(function () {
@@ -1841,7 +1858,11 @@ $(document).ready(function() {
             $('#pms_ssl').val(ssl !== 'undefined' && ssl === 1 ? 1 : 0);
             $('#pms_is_cloud').val(is_cloud !== 'undefined' && is_cloud === true ? 1 : 0);
             $('#pms_url_manual').prop('checked', false);
+            $('#pms_url').val('Please verify your server above to retrieve the URL');
             PMSCloudCheck();
+        },
+        onDropdownOpen: function() {
+            this.clear();
         }
     });
     var select_pms = $select_pms[0].selectize;
@@ -1906,6 +1927,7 @@ $(document).ready(function() {
         var pms_identifier = $("#pms_identifier").val();
         var pms_ssl = $("#pms_ssl").val();
         var pms_is_remote = $("#pms_is_remote").val();
+        var pms_url_manual = $("#pms_url_manual").is(':checked') ? 1 : 0;
 
         if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) {
             $("#pms_verify").html('<i class="fa fa-refresh fa-spin"></i>').fadeIn('fast');
@@ -1914,9 +1936,11 @@ $(document).ready(function() {
                 data: {
                     hostname: pms_ip,
                     port: pms_port,
-                    identifier: pms_identifier,
                     ssl: pms_ssl,
-                    remote: pms_is_remote
+                    remote: pms_is_remote,
+                    manual: pms_url_manual,
+                    get_url: true,
+                    test_websocket: true
                 },
                 cache: true,
                 async: true,
@@ -1925,12 +1949,27 @@ $(document).ready(function() {
                     $("#pms_verify").html('<i class="fa fa-close"></i>').fadeIn('fast');
                     $("#pms_ip_group").addClass("has-error");
                 },
-                success: function (json) {
-                    var machine_identifier = json;
-                    if (machine_identifier) {
-                        $("#pms_identifier").val(machine_identifier);
-                        $("#pms_verify").html('<i class="fa fa-check"></i>').fadeIn('fast');
-                        $("#pms_ip_group").removeClass("has-error");
+                success: function(xhr, status) {
+                    var result = xhr;
+                    var identifier = result.identifier;
+                    var url = result.url;
+                    var ws = result.ws;
+                    if (identifier) {
+                        $("#pms_identifier").val(identifier);
+
+                        if (url) {
+                            $("#pms_url").val(url);
+                        }
+
+                        if (ws === false) {
+                            $("#pms_verify").html('<i class="fa fa-close"></i>').fadeIn('fast');
+                            $("#pms_ip_group").addClass("has-error");
+                            showMsg('<i class="fa fa-exclamation-circle"></i> Server found but unable to connect websocket.<br>Check the <a href="logs">logs</a> for errors.', false, true, 5000, true)
+                        } else {
+                            $("#pms_verify").html('<i class="fa fa-check"></i>').fadeIn('fast');
+                            $("#pms_ip_group").removeClass("has-error");
+                            serverChanged = false;
+                        }
 
                         if (_callback) {
                             _callback();
@@ -1950,7 +1989,6 @@ $(document).ready(function() {
     }
 
     $('#verify_server_button').on('click', function(){
-        $("#pms_identifier").val("");
         verifyServer();
     });
 

data/interfaces/default/stream_data.html

@@ -58,6 +58,10 @@ DOCUMENTATION :: END
             <div class="col-sm-12 text-muted stream-info-current">
                 <i class="fa fa-exclamation-circle"></i> Current session. Updated stream details below may be delayed.
             </div>
+            % elif data['pre_tautulli']:
+            <div class="col-sm-12 text-muted stream-info-current">
+                <i class="fa fa-exclamation-circle"></i> Pre-Tautulli history. Stream details below may be incorrect.
+            </div>
             % endif
             <table class="stream-info" style="margin-top: 0;">
                 <thead>
@@ -84,8 +88,8 @@ DOCUMENTATION :: END
                 <tbody>
                     <tr>
                         <td>Bitrate</td>
-                        <td>${data['stream_bitrate']} kbps</td>
-                        <td>${data['bitrate']} kbps</td>
+                        <td>${data['stream_bitrate']} ${'kbps' if data['stream_bitrate'] else ''}</td>
+                        <td>${data['bitrate']} ${'kbps' if data['bitrate'] else ''}</td>
                     </tr>
                     % if data['media_type'] != 'track':
                     <tr>
@@ -154,8 +158,8 @@ DOCUMENTATION :: END
                     </tr>
                     <tr>
                         <td>Bitrate</td>
-                        <td>${data['stream_video_bitrate']} kbps</td>
-                        <td>${data['video_bitrate']} kbps</td>
+                        <td>${data['stream_video_bitrate']} ${'kbps' if data['stream_video_bitrate'] else ''}</td>
+                        <td>${data['video_bitrate']} ${'kbps' if data['video_bitrate'] else ''}</td>
                     </tr>
                     <tr>
                         <td>Width</td>
@@ -199,8 +203,8 @@ DOCUMENTATION :: END
                     </tr>
                     <tr>
                         <td>Bitrate</td>
-                        <td>${data['stream_audio_bitrate']} kbps</td>
-                        <td>${data['audio_bitrate']} kbps</td>
+                        <td>${data['stream_audio_bitrate']} ${'kbps' if data['stream_audio_bitrate'] else ''}</td>
+                        <td>${data['audio_bitrate']} ${'kbps' if data['audio_bitrate'] else ''}</td>
                     </tr>
                     <tr>
                         <td>Channels</td>

data/interfaces/default/sync.html

@@ -100,7 +100,7 @@
         // Load user ids and names (for the selector)
         $.ajax({
             url: 'get_user_names',
-            type: 'get',
+            type: 'GET',
             dataType: 'json',
             success: function (data) {
                 var select = $('#sync-user');
@@ -116,7 +116,8 @@
 
         function loadSyncTable(selected_user_id) {
             sync_table_options.ajax = {
-                url: 'get_sync?user_id=' + selected_user_id
+                url: 'get_sync?user_id=' + selected_user_id,
+                type: 'POST'
             };
             sync_table = $('#sync_table').DataTable(sync_table_options);
             var colvis = new $.fn.dataTable.ColVis(sync_table, {
@@ -134,7 +135,7 @@
             });
         }
 
-        var selected_user_id = "${_session['user_id']}" == "None" ? null : "${_session['user_id']}";
+        var selected_user_id = "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}";
         loadSyncTable(selected_user_id);
 
         % if _session['user_group'] == 'admin':

data/interfaces/default/user.html

@@ -413,7 +413,7 @@ DOCUMENTATION :: END
         // Build watch history table
         history_table_options.ajax = {
             url: 'get_history',
-            type: 'post',
+            type: 'POST',
             data: function ( d ) {
                 return {
                     json_data: JSON.stringify( d ),
@@ -442,7 +442,8 @@ DOCUMENTATION :: END
     function loadSyncTable() {
         // Build user sync table
         sync_table_options.ajax = {
-             url: 'get_sync?user_id=' + user_id
+             url: 'get_sync?user_id=' + user_id,
+            type: 'POST'
         };
         sync_table = $('#sync_table-UID-${data["user_id"]}').DataTable(sync_table_options);
         sync_table.column(2).visible(false);
@@ -457,7 +458,7 @@ DOCUMENTATION :: END
         // Build user IP table
         user_ip_table_options.ajax = {
             url: 'get_user_ips',
-            type: 'post',
+            type: 'POST',
             data: function ( d ) {
                 return {
                     json_data: JSON.stringify( d ),
@@ -474,6 +475,7 @@ DOCUMENTATION :: END
         // Build user login table
         login_log_table_options.ajax = {
             url: 'get_user_logins',
+            type: 'POST',
             data: function(d) {
                 return {
                     json_data: JSON.stringify(d),

data/interfaces/default/users.html

@@ -94,7 +94,7 @@
                     json_data: JSON.stringify(d)
                 };
             }
-        }
+        };
 
         users_list_table = $('#users_list_table').DataTable(users_list_table_options);
         var colvis = new $.fn.dataTable.ColVis(users_list_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 1] });

data/interfaces/default/welcome.html

@@ -94,7 +94,7 @@
                         <label for="pms_ip">Plex IP or Hostname</label>
                         <div class="row">
                             <div class="col-xs-12">
-                                <select class="form-control selectize-pms-ip" id="pms_ip" name="pms_ip">
+                                <select class="form-control pms-settings selectize-pms-ip" id="pms_ip" name="pms_ip">
                                     <option value="${config['pms_ip']}" selected>${config['pms_ip']}</option>
                                 </select>
                             </div>
@@ -104,12 +104,12 @@
                         <label for="pms_port">Plex Port</label>
                         <div class="row">
                             <div class="col-xs-3">
-                                <input type="text" class="form-control pms_settings" name="pms_port" id="pms_port" placeholder="32400" value="${config['pms_port']}" required>
+                                <input type="text" class="form-control pms-settings" name="pms_port" id="pms_port" placeholder="32400" value="${config['pms_port']}" required>
                             </div>
                             <div class="col-xs-4">
                                 <div class="checkbox">
                                     <label>
-                                        <input type="checkbox" id="pms_ssl_checkbox" class="checkbox-toggle" data-id="pms_ssl" value="1" ${helpers.checked(config['pms_ssl'])}> Use SSL
+                                        <input type="checkbox" id="pms_ssl_checkbox" class="checkbox-toggle pms-settings" data-id="pms_ssl" value="1" ${helpers.checked(config['pms_ssl'])}> Use SSL
                                         <input type="hidden" id="pms_ssl" name="pms_ssl" value="${config['pms_ssl']}">
                                     </label>
                                 </div>
@@ -117,16 +117,16 @@
                             <div class="col-xs-4">
                                 <div class="checkbox">
                                     <label>
-                                        <input type="checkbox" id="pms_is_remote_checkbox" class="checkbox-toggle" data-id="pms_is_remote" value="1" ${helpers.checked(config['pms_is_remote'])}> Remote Server
+                                        <input type="checkbox" id="pms_is_remote_checkbox" class="checkbox-toggle pms-settings" data-id="pms_is_remote" value="1" ${helpers.checked(config['pms_is_remote'])}> Remote Server
                                         <input type="hidden" id="pms_is_remote" name="pms_is_remote" value="${config['pms_is_remote']}">
                                     </label>
                                 </div>
                             </div>
                         </div>
                     </div>
-                    <input type="hidden" class="form-control pms-settings" id="pms_valid" data-validate="validatePMSip" value="">
+                    <input type="hidden" id="pms_valid" data-validate="validatePMSip" value="">
                     <input type="hidden" id="pms_is_cloud" name="pms_is_cloud" value="${config['pms_is_cloud']}">
-                    <input type="hidden" class="form-control pms-settings" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}">
+                    <input type="hidden" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}">
                     <a class="btn btn-dark" id="verify-plex-server" href="#" role="button">Verify</a><span style="margin-left: 10px; display: none;" id="pms-verify-status"></span>
                 </div>
 
@@ -374,6 +374,9 @@ $(document).ready(function() {
                 $('#pms_is_remote_checkbox').prop('disabled', false);
                 $('#pms_ssl_checkbox').prop('disabled', false);
             }
+        },
+        onDropdownOpen: function() {
+            this.clear();
         }
     });
     var select_pms = $select_pms[0].selectize;
@@ -419,7 +422,8 @@ $(document).ready(function() {
                         port: pms_port,
                         identifier: pms_identifier,
                         ssl: pms_ssl,
-                        remote: pms_is_remote },
+                        remote: pms_is_remote
+                    },
                     cache: true,
                     async: true,
                     timeout: 5000,
@@ -427,10 +431,11 @@ $(document).ready(function() {
                         $("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> This is not a Plex Server!');
                         $('#pms-verify-status').fadeIn('fast');
                     },
-                    success: function (json) {
-                        var machine_identifier = json;
-                        if (machine_identifier) {
-                            $("#pms_identifier").val(machine_identifier);
+                    success: function(xhr, status) {
+                        var result = xhr;
+                        var identifier = result.identifier;
+                        if (identifier) {
+                            $("#pms_identifier").val(identifier);
                             $("#pms-verify-status").html('<i class="fa fa-check"></i> Server found!');
                             $('#pms-verify-status').fadeIn('fast');
                             pms_verified = true;

lib/facebook/__init__.py

@@ -45,7 +45,8 @@ __version__ = version.__version__
 
 FACEBOOK_GRAPH_URL = "https://graph.facebook.com/"
 FACEBOOK_OAUTH_DIALOG_URL = "https://www.facebook.com/dialog/oauth?"
-VALID_API_VERSIONS = ["2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9"]
+VALID_API_VERSIONS = [
+    "2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11", "2.12"]
 VALID_SEARCH_TYPES = ["page", "event", "group", "place", "placetopic", "user"]
 
 
@@ -89,7 +90,7 @@ class GraphAPI(object):
         self.session = session or requests.Session()
 
         if version:
-            version_regex = re.compile("^\d\.\d$")
+            version_regex = re.compile("^\d\.\d{1,2}$")
             match = version_regex.search(str(version))
             if match is not None:
                 if str(version) not in VALID_API_VERSIONS:
@@ -229,7 +230,7 @@ class GraphAPI(object):
         try:
             headers = response.headers
             version = headers["facebook-api-version"].replace("v", "")
-            return float(version)
+            return str(version)
         except Exception:
             raise GraphAPIError("API version number not available")
 
@@ -369,24 +370,24 @@ class GraphAPIError(Exception):
         self.code = None
         try:
             self.type = result["error_code"]
-        except:
+        except (KeyError, TypeError):
             self.type = ""
 
         # OAuth 2.0 Draft 10
         try:
             self.message = result["error_description"]
-        except:
+        except (KeyError, TypeError):
             # OAuth 2.0 Draft 00
             try:
                 self.message = result["error"]["message"]
                 self.code = result["error"].get("code")
                 if not self.type:
                     self.type = result["error"].get("type", "")
-            except:
+            except (KeyError, TypeError):
                 # REST server style
                 try:
                     self.message = result["error_msg"]
-                except:
+                except (KeyError, TypeError):
                     self.message = result
 
         Exception.__init__(self, self.message)

plexpy/__init__.py

@@ -46,6 +46,7 @@ import notifiers
 import plextv
 import users
 import versioncheck
+import web_socket
 import plexpy.config
 
 PROG_DIR = None
@@ -95,6 +96,7 @@ HTTP_ROOT = None
 
 DEV = False
 
+WEBSOCKET = None
 WS_CONNECTED = False
 PLEX_SERVER_UP = None
 
@@ -1594,6 +1596,18 @@ def dbcheck():
             'ALTER TABLE poster_urls ADD COLUMN delete_hash TEXT'
         )
 
+    # Rename notifiers in the database
+    result = c_db.execute('SELECT agent_label FROM notifiers '
+                          'WHERE agent_label = "XBMC" OR agent_label = "OSX Notify"').fetchone()
+    if result:
+        logger.debug(u"Altering database. Renaming notifiers.")
+        c_db.execute(
+            'UPDATE notifiers SET agent_label = "Kodi" WHERE agent_label = "XBMC"'
+        )
+        c_db.execute(
+            'UPDATE notifiers SET agent_label = "macOS Notification Center" WHERE agent_label = "OSX Notify"'
+        )
+
     # Add "Local" user to database as default unauthenticated user.
     result = c_db.execute('SELECT id FROM users WHERE username = "Local"')
     if not result.fetchone():
@@ -1622,6 +1636,10 @@ def upgrade():
 def shutdown(restart=False, update=False, checkout=False):
     cherrypy.engine.exit()
 
+    # Shutdown the websocket connection
+    if WEBSOCKET:
+        web_socket.shutdown()
+
     if SCHED.running:
         SCHED.shutdown(wait=False)
     if activity_handler.ACTIVITY_SCHED.running:

plexpy/activity_pinger.py

@@ -293,8 +293,8 @@ def connect_server(log=True, startup=False):
 
         try:
             web_socket.start_thread()
-        except:
-            logger.error(u"Websocket :: Unable to open connection.")
+        except Exception as e:
+            logger.error(u"Websocket :: Unable to open connection: %s." % e)
 
 
 def check_server_access():

plexpy/api2.py

@@ -652,10 +652,9 @@ General optional parameters:
         # {result: error, message: 'Some shit happend'}
         if isinstance(ret, dict):
             if ret.get('message'):
-                self._api_msg = ret.get('message', {})
-                ret = {}
+                self._api_msg = ret.pop('message', None)
 
             if ret.get('result'):
-                self._api_result_type = ret.get('result')
+                self._api_result_type = ret.pop('result', None)
 
         return self._api_out_as(self._api_responds(result_type=self._api_result_type, msg=self._api_msg, data=ret))

plexpy/common.py

@@ -171,6 +171,16 @@ HW_ENCODERS = [
     'nvenc'
 ]
 
+EXTRA_TYPES = {
+    '1': 'Trailer',
+    '2': 'Deleted Scene',
+    '3': 'Interview',
+    '5': 'Behind the Scenes',
+    '6': 'Scene',
+    '10': 'Featurette',
+    '11': 'Short'
+}
+
 SCHEDULER_LIST = [
     'Check GitHub for updates',
     'Check for server response',
@@ -391,6 +401,10 @@ NOTIFICATION_PARAMETERS = [
              {'name': 'Episode Number 00', 'type': 'int', 'value': 'episode_num00', 'description': 'The two digit episode number.', 'example': 'e.g. 06, or 06-10'},
              {'name': 'Track Number', 'type': 'int', 'value': 'track_num', 'description': 'The track number.', 'example': 'e.g. 4, or 4-10'},
              {'name': 'Track Number 00', 'type': 'int', 'value': 'track_num00', 'description': 'The two digit track number.', 'example': 'e.g. 04, or 04-10'},
+             {'name': 'Season Count', 'type': 'int', 'value': 'season_count', 'description': 'The number of seasons.'},
+             {'name': 'Episode Count', 'type': 'int', 'value': 'episode_count', 'description': 'The number of episodes.'},
+             {'name': 'Album Count', 'type': 'int', 'value': 'album_count', 'description': 'The number of albums.'},
+             {'name': 'Track Count', 'type': 'int', 'value': 'track_count', 'description': 'The number of tracks.'},
              {'name': 'Year', 'type': 'int', 'value': 'year', 'description': 'The release year for the item.'},
              {'name': 'Release Date', 'type': 'int', 'value': 'release_date', 'description': 'The release date (in date format) for the item.'},
              {'name': 'Air Date', 'type': 'str', 'value': 'air_date', 'description': 'The air date (in date format) for the item.'},

plexpy/config.py

@@ -209,6 +209,7 @@ _CONFIG_DEFINITIONS = {
     'HOME_STATS_CARDS': (list, 'General', ['top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', \
         'popular_music', 'last_watched', 'top_users', 'top_platforms', 'most_concurrent']),
     'HOME_STATS_RECENTLY_ADDED_COUNT': (int, 'General', 50),
+    'HOME_REFRESH_INTERVAL': (int, 'General', 10),
     'HTTPS_CREATE_CERT': (int, 'General', 1),
     'HTTPS_CERT': (str, 'General', ''),
     'HTTPS_CERT_CHAIN': (str, 'General', ''),

plexpy/datafactory.py

@@ -885,6 +885,9 @@ class DataFactory(object):
                     'stream_audio_decision, stream_audio_codec, stream_audio_bitrate, stream_audio_channels, ' \
                     'subtitles, stream_subtitle_decision, stream_subtitle_codec, ' \
                     'transcode_hw_decoding, transcode_hw_encoding, ' \
+                    'video_decision, audio_decision, transcode_decision, width, height, container, ' \
+                    'transcode_container, transcode_video_codec, transcode_audio_codec, transcode_audio_channels, ' \
+                    'transcode_width, transcode_height, ' \
                     'session_history_metadata.media_type, title, grandparent_title ' \
                     'FROM session_history_media_info ' \
                     'JOIN session_history ON session_history_media_info.id = session_history.id ' \
@@ -903,6 +906,9 @@ class DataFactory(object):
                     'stream_audio_decision, stream_audio_codec, stream_audio_bitrate, stream_audio_channels, ' \
                     'subtitles, stream_subtitle_decision, stream_subtitle_codec, ' \
                     'transcode_hw_decoding, transcode_hw_encoding, ' \
+                    'video_decision, audio_decision, transcode_decision, width, height, container, ' \
+                    'transcode_container, transcode_video_codec, transcode_audio_codec, transcode_audio_channels, ' \
+                    'transcode_width, transcode_height, ' \
                     'media_type, title, grandparent_title ' \
                     'FROM sessions ' \
                     'WHERE session_key = ? %s' % user_cond
@@ -913,6 +919,23 @@ class DataFactory(object):
         stream_output = {}
 
         for item in result:
+            pre_tautulli = 0
+
+            # For backwards compatibility. Pick one new Tautulli key to check and override with old values.
+            if not item['stream_video_resolution']:
+                item['stream_video_resolution'] = item['video_resolution']
+                item['stream_container'] = item['transcode_container'] or item['container']
+                item['stream_video_decision'] = item['video_decision']
+                item['stream_video_codec'] = item['transcode_video_codec'] or item['video_codec']
+                item['stream_video_width'] = item['transcode_width'] or item['width']
+                item['stream_video_height'] = item['transcode_height'] or item['height']
+                item['stream_audio_decision'] = item['audio_decision']
+                item['stream_audio_codec'] = item['transcode_audio_codec'] or item['audio_codec']
+                item['stream_audio_channels'] = item['transcode_audio_channels'] or item['audio_channels']
+                item['video_width'] = item['width']
+                item['video_height'] = item['height']
+                pre_tautulli = 1
+
             stream_output = {'bitrate': item['bitrate'],
                              'video_resolution': item['video_resolution'],
                              'optimized_version': item['optimized_version'],
@@ -951,10 +974,13 @@ class DataFactory(object):
                              'stream_subtitle_codec': item['stream_subtitle_codec'],
                              'transcode_hw_decoding': item['transcode_hw_decoding'],
                              'transcode_hw_encoding': item['transcode_hw_encoding'],
+                             'video_decision': item['video_decision'],
+                             'audio_decision': item['audio_decision'],
                              'media_type': item['media_type'],
                              'title': item['title'],
                              'grandparent_title': item['grandparent_title'],
-                             'current_session': 1 if session_key else 0
+                             'current_session': 1 if session_key else 0,
+                             'pre_tautulli': pre_tautulli
                              }
 
         stream_output = {k: v or '' for k, v in stream_output.iteritems()}

plexpy/helpers.py

@@ -933,3 +933,36 @@ def eval_logic_groups_to_bool(logic_groups, eval_conds):
             result = result or eval_cond
 
     return result
+
+def get_plexpy_url(hostname=None):
+    if plexpy.CONFIG.ENABLE_HTTPS:
+        scheme = 'https'
+    else:
+        scheme = 'http'
+
+    if hostname is None and plexpy.CONFIG.HTTP_HOST == '0.0.0.0':
+        import socket
+        try:
+            s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+            s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+            s.connect(('<broadcast>', 0))
+            hostname = s.getsockname()[0]
+        except socket.error:
+            hostname = socket.gethostbyname(socket.gethostname())
+
+        if not hostname:
+            hostname = 'localhost'
+    else:
+        hostname = hostname or plexpy.CONFIG.HTTP_HOST
+
+    if plexpy.CONFIG.HTTP_PORT not in (80, 443):
+        port = ':' + str(plexpy.CONFIG.HTTP_PORT)
+    else:
+        port = ''
+
+    if plexpy.CONFIG.HTTP_ROOT.strip('/'):
+        root = '/' + plexpy.CONFIG.HTTP_ROOT.strip('/')
+    else:
+        root = ''
+
+    return scheme + '://' + hostname + port + root

plexpy/libraries.py

@@ -125,8 +125,8 @@ def update_section_ids():
             library_children = pms_connect.get_library_children_details(section_id=section_id,
                                                                         section_type=section_type)
             if library_children:
-                children_list = library_children['childern_list']
-                key_mappings.update({child['rating_key']:child['section_id'] for child in children_list})
+                children_list = library_children['children_list']
+                key_mappings.update({child['rating_key']: child['section_id'] for child in children_list})
             else:
                 logger.warn(u"Tautulli Libraries :: Unable to get a list of library items for section_id %s." % section_id)
 
@@ -198,7 +198,7 @@ def update_labels():
                                                                                 label_key=label['label_key'])
 
                     if library_children:
-                        children_list = library_children['childern_list']
+                        children_list = library_children['children_list']
                         # rating_key_list = [child['rating_key'] for child in children_list]
 
                         for rating_key in [child['rating_key'] for child in children_list]:
@@ -456,7 +456,7 @@ class Libraries(object):
                                                                             get_media_info=True)
             if library_children:
                 library_count = library_children['library_count']
-                children_list = library_children['childern_list']
+                children_list = library_children['children_list']
             else:
                 logger.warn(u"Tautulli Libraries :: Unable to get a list of library items.")
                 return default_return

plexpy/notification_handler.py

@@ -208,7 +208,7 @@ def notify_custom_conditions(notifier_id=None, parameters=None):
     notifier_config = notifiers.get_notifier_config(notifier_id=notifier_id)
 
     custom_conditions_logic = notifier_config['custom_conditions_logic']
-    custom_conditions = json.loads(notifier_config['custom_conditions']) or []
+    custom_conditions = notifier_config['custom_conditions']
 
     if custom_conditions_logic or any(c for c in custom_conditions if c['value']):
         logger.debug(u"Tautulli NotificationHandler :: Checking custom notification conditions for notifier_id %s."
@@ -507,9 +507,9 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
     user_stream_count = len(user_sessions)
 
     # Generate a combined transcode decision value
-    if session.get('video_decision','') == 'transcode' or session.get('audio_decision','') == 'transcode':
+    if session.get('stream_video_decision', '') == 'transcode' or session.get('stream_audio_decision', '') == 'transcode':
         transcode_decision = 'Transcode'
-    elif session.get('video_decision','') == 'copy' or session.get('audio_decision','') == 'copy':
+    elif session.get('stream_video_decision', '') == 'copy' or session.get('stream_audio_decision', '') == 'copy':
         transcode_decision = 'Direct Stream'
     else:
         transcode_decision = 'Direct Play'
@@ -640,13 +640,17 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
         album_name = ''
         track_name = ''
 
-        num, num00 = format_group_index([helpers.cast_to_int(d['media_index'])
-                                        for d in child_metadata if d['parent_rating_key'] == rating_key])
+        child_num = [helpers.cast_to_int(
+            d['media_index']) for d in child_metadata if d['parent_rating_key'] == rating_key]
+        num, num00 = format_group_index(child_num)
         season_num, season_num00 = num, num00
 
         episode_num, episode_num00 = '', ''
         track_num, track_num00 = '', ''
 
+        child_count = len(child_num)
+        grandchild_count = ''
+
     elif ((manual_trigger or plexpy.CONFIG.NOTIFY_GROUP_RECENTLY_ADDED_PARENT)
           and notify_params['media_type'] in ('season', 'album')):
         show_name = notify_params['parent_title']
@@ -654,14 +658,19 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
         artist_name = notify_params['parent_title']
         album_name = notify_params['title']
         track_name = ''
+
         season_num = str(notify_params['media_index']).zfill(1)
         season_num00 = str(notify_params['media_index']).zfill(2)
 
-        num, num00 = format_group_index([helpers.cast_to_int(d['media_index'])
-                                        for d in child_metadata if d['parent_rating_key'] == rating_key])
+        grandchild_num = [helpers.cast_to_int(
+            d['media_index']) for d in child_metadata if d['parent_rating_key'] == rating_key]
+        num, num00 = format_group_index(grandchild_num)
         episode_num, episode_num00 = num, num00
         track_num, track_num00 = num, num00
 
+        child_count = 1
+        grandchild_count = len(grandchild_num)
+
     else:
         show_name = notify_params['grandparent_title']
         episode_name = notify_params['title']
@@ -674,6 +683,8 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
         episode_num00 = str(notify_params['media_index']).zfill(2)
         track_num = str(notify_params['media_index']).zfill(1)
         track_num00 = str(notify_params['media_index']).zfill(2)
+        child_count = 1
+        grandchild_count = 1
 
     available_params = {
         # Global paramaters
@@ -783,6 +794,10 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
         'episode_num00': episode_num00,
         'track_num': track_num,
         'track_num00': track_num00,
+        'season_count': child_count,
+        'episode_count': grandchild_count,
+        'album_count': child_count,
+        'track_count': grandchild_count,
         'year': notify_params['year'],
         'release_date': arrow.get(notify_params['originally_available_at']).format(date_format)
             if notify_params['originally_available_at'] else '',

plexpy/notifiers.py

@@ -54,6 +54,7 @@ import twitter
 import pynma
 
 import plexpy
+import common
 import database
 import helpers
 import logger
@@ -94,6 +95,8 @@ AGENT_IDS = {'growl': 0,
              'zapier': 24
              }
 
+DEFAULT_CUSTOM_CONDITIONS = [{'parameter': '', 'operator': '', 'value': ''}]
+
 
 def available_notification_agents():
     agents = [{'label': 'Tautulli Remote Android App',
@@ -140,6 +143,10 @@ def available_notification_agents():
                'name': 'join',
                'id': AGENT_IDS['join']
                },
+              {'label': 'Kodi',
+               'name': 'xbmc',
+               'id': AGENT_IDS['xbmc']
+               },
               {'label': 'Notify My Android',
                'name': 'nma',
                'id': AGENT_IDS['nma']
@@ -156,10 +163,10 @@ def available_notification_agents():
                'name': 'prowl',
                'id': AGENT_IDS['prowl']
                },
-              {'label': 'Pushalot',
-               'name': 'pushalot',
-               'id': AGENT_IDS['pushalot']
-               },
+              # {'label': 'Pushalot',
+              #  'name': 'pushalot',
+              #  'id': AGENT_IDS['pushalot']
+              #  },
               {'label': 'Pushbullet',
                'name': 'pushbullet',
                'id': AGENT_IDS['pushbullet']
@@ -184,10 +191,6 @@ def available_notification_agents():
                'name': 'twitter',
                'id': AGENT_IDS['twitter']
                },
-              {'label': 'XBMC',
-               'name': 'xbmc',
-               'id': AGENT_IDS['xbmc']
-               },
               {'label': 'Zapier',
                'name': 'zapier',
                'id': AGENT_IDS['zapier']
@@ -196,7 +199,7 @@ def available_notification_agents():
 
     # OSX Notifications should only be visible if it can be used
     if OSX().validate():
-        agents.append({'label': 'OSX Notify',
+        agents.append({'label': 'macOS Notification Center',
                        'name': 'osx',
                        'id': AGENT_IDS['osx']
                        })
@@ -446,7 +449,6 @@ def get_notifier_config(notifier_id=None):
     db = database.MonitorDatabase()
     result = db.select_single('SELECT * FROM notifiers WHERE id = ?',
                                       args=[notifier_id])
-
     if not result:
         return None
 
@@ -468,6 +470,14 @@ def get_notifier_config(notifier_id=None):
             notifier_text[k] = {'subject': result.pop(k + '_subject'),
                                 'body': result.pop(k + '_body')}
 
+    try:
+        result['custom_conditions'] = json.loads(result['custom_conditions'])
+    except (ValueError, TypeError):
+        result['custom_conditions'] = DEFAULT_CUSTOM_CONDITIONS
+
+    if not result['custom_conditions_logic']:
+        result['custom_conditions_logic'] = ''
+
     result['config'] = config
     result['config_options'] = notifier_config
     result['actions'] = notifier_actions
@@ -494,7 +504,9 @@ def add_notifier_config(agent_id=None, **kwargs):
               'agent_name': agent['name'],
               'agent_label': agent['label'],
               'friendly_name': '',
-              'notifier_config': json.dumps(get_agent_class(agent_id=agent['id']).config)
+              'notifier_config': json.dumps(get_agent_class(agent_id=agent['id']).config),
+              'custom_conditions': json.dumps(DEFAULT_CUSTOM_CONDITIONS),
+              'custom_conditions_logic': ''
               }
     if agent['name'] == 'scripts':
         for a in available_notification_actions():
@@ -549,7 +561,7 @@ def set_notifier_config(notifier_id=None, agent_id=None, **kwargs):
               'agent_label': agent['label'],
               'friendly_name': kwargs.get('friendly_name', ''),
               'notifier_config': json.dumps(notifier_config),
-              'custom_conditions': kwargs.get('custom_conditions', ''),
+              'custom_conditions': kwargs.get('custom_conditions', json.dumps(DEFAULT_CUSTOM_CONDITIONS)),
               'custom_conditions_logic': kwargs.get('custom_conditions_logic', ''),
               }
     values.update(actions)
@@ -718,6 +730,13 @@ class PrettyMetadata(object):
     def get_plex_url(self):
         return self.parameters['plex_url']
 
+    @staticmethod
+    def get_parameters():
+        parameters = {param['value']: param['name']
+                for category in common.NOTIFICATION_PARAMETERS for param in category['parameters']}
+        parameters[''] = ''
+        return parameters
+
 
 class Notifier(object):
     NAME = ''
@@ -896,11 +915,9 @@ class ANDROIDAPP(Notifier):
                                'The content of your notifications will be sent unencrypted!</strong><br>'
                                'Please install the library to encrypt the notification contents. '
                                'Instructions can be found in the '
-                               '<a href="' + helpers.anon_url(
-                                   'https://github.com/%s/%s-Wiki/wiki/'
-                                   'Frequently-Asked-Questions#notifications-pycryptodome'
-                                   % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO)) +
-                               '" target="_blank">FAQ</a>.',
+                               '<a href="https://github.com/%s/%s-Wiki/wiki/'
+                               'Frequently-Asked-Questions#notifications-pycryptodome'
+                               '" target="_blank">FAQ</a>.' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO),
                 'input_type': 'help'
                 })
         else:
@@ -1290,7 +1307,7 @@ class EMAIL(Notifier):
             mailserver.ehlo()
 
             if self.config['smtp_user']:
-                mailserver.login(self.config['smtp_user'], self.config['smtp_password'])
+                mailserver.login(str(self.config['smtp_user']), str(self.config['smtp_password']))
 
             mailserver.sendmail(self.config['from'], recipients, msg.as_string())
             mailserver.quit()
@@ -1422,7 +1439,7 @@ class FACEBOOK(Notifier):
         plexpy.CONFIG.FACEBOOK_TOKEN = 'temp'
 
         return facebook.auth_url(app_id=app_id,
-                                 canvas_url=redirect_uri + '/facebookStep2',
+                                 canvas_url=redirect_uri,
                                  perms=['user_managed_groups','publish_actions'])
 
     def _get_credentials(self, code=''):
@@ -1434,15 +1451,15 @@ class FACEBOOK(Notifier):
 
         try:
             # Request user access token
-            api = facebook.GraphAPI(version='2.5')
+            api = facebook.GraphAPI(version='2.12')
             response = api.get_access_token_from_code(code=code,
-                                                      redirect_uri=redirect_uri + '/facebookStep2',
+                                                      redirect_uri=redirect_uri,
                                                       app_id=app_id,
                                                       app_secret=app_secret)
             access_token = response['access_token']
 
             # Request extended user access token
-            api = facebook.GraphAPI(access_token=access_token, version='2.5')
+            api = facebook.GraphAPI(access_token=access_token, version='2.12')
             response = api.extend_access_token(app_id=app_id,
                                                app_secret=app_secret)
 
@@ -1460,7 +1477,7 @@ class FACEBOOK(Notifier):
 
     def _post_facebook(self, **data):
         if self.config['group_id']:
-            api = facebook.GraphAPI(access_token=self.config['access_token'], version='2.5')
+            api = facebook.GraphAPI(access_token=self.config['access_token'], version='2.12')
 
             try:
                 api.put_object(parent_object=self.config['group_id'], connection_name='feed', **data)
@@ -1500,25 +1517,11 @@ class FACEBOOK(Notifier):
         return self._post_facebook(**data)
 
     def return_config_options(self):
-        config_option = [{'label': 'Instructions',
-                          'description': 'Step 1: Visit <a href="' + helpers.anon_url('https://developers.facebook.com/apps') + '" target="_blank">'
-                                         'Facebook Developers</a> to add a new app using <strong>basic setup</strong>.<br>'
-                                         'Step 2: Click <strong>Add Product</strong> on the left, then <strong>Get Started</strong>'
-                                         'for <strong>Facebook Login</strong>.<br>'
-                                         'Step 3: Fill in <strong>Valid OAuth redirect URIs</strong> with your Tautulli URL (e.g. http://localhost:8181).<br>'
-                                         'Step 4: Click <strong>App Review</strong> on the left and toggle "make public" to <strong>Yes</strong>.<br>'
-                                         'Step 5: Fill in the <strong>Tautulli URL</strong> below with the exact same URL from Step 3.<br>'
-                                         'Step 6: Fill in the <strong>App ID</strong> and <strong>App Secret</strong> below.<br>'
-                                         'Step 7: Click the <strong>Request Authorization</strong> button below to retrieve your access token.<br>'
-                                         'Step 8: Fill in your <strong>Access Token</strong> below if it is not filled in automatically.<br>'
-                                         'Step 9: Fill in your <strong>Group ID</strong> number below. It can be found in the URL of your group page.',
-                          'input_type': 'help'
-                          },
-                         {'label': 'Tautulli URL',
+        config_option = [{'label': 'OAuth Redirect URI',
                           'value': self.config['redirect_uri'],
                           'name': 'facebook_redirect_uri',
-                          'description': 'Your Tautulli URL. This will tell Facebook where to redirect you after authorization.\
-                                          (e.g. http://localhost:8181)',
+                          'description': 'Fill in this address for the "Valid OAuth redirect URIs" '
+                                         'in your Facebook App.',
                           'input_type': 'text'
                           },
                          {'label': 'Facebook App ID',
@@ -1535,14 +1538,15 @@ class FACEBOOK(Notifier):
                           },
                          {'label': 'Request Authorization',
                           'value': 'Request Authorization',
-                          'name': 'facebook_facebookStep1',
+                          'name': 'facebook_facebook_auth',
                           'description': 'Request Facebook authorization. (Ensure you allow the browser pop-up).',
                           'input_type': 'button'
                           },
                          {'label': 'Facebook Access Token',
                           'value': self.config['access_token'],
                           'name': 'facebook_access_token',
-                          'description': 'Your Facebook access token. Automatically filled in after requesting authorization.',
+                          'description': 'Your Facebook access token. '
+                                         'Automatically filled in after requesting authorization.',
                           'input_type': 'text'
                           },
                          {'label': 'Facebook Group ID',
@@ -1741,7 +1745,7 @@ class GROWL(Notifier):
         config_option = [{'label': 'Growl Host',
                           'value': self.config['host'],
                           'name': 'growl_host',
-                          'description': 'Your Growl hostname.',
+                          'description': 'Your Growl hostname or IP address.',
                           'input_type': 'text'
                           },
                          {'label': 'Growl Password',
@@ -1843,7 +1847,7 @@ class HIPCHAT(Notifier):
         return self.make_request(self.config['hook'], headers=headers, json=data)
 
     def return_config_options(self):
-        config_option = [{'label': 'Hipchat Custom Integrations Full URL',
+        config_option = [{'label': 'Hipchat Custom Integrations URL',
                           'value': self.config['hook'],
                           'name': 'hipchat_hook',
                           'description': 'Your Hipchat BYO integration URL. You can get a key from'
@@ -1932,7 +1936,8 @@ class IFTTT(Notifier):
     """
     NAME = 'IFTTT'
     _DEFAULT_CONFIG = {'key': '',
-                       'event': 'tautulli'
+                       'event': 'tautulli',
+                       'value3': '',
                        }
 
     def agent_notify(self, subject='', body='', action='', **kwargs):
@@ -1941,6 +1946,10 @@ class IFTTT(Notifier):
         data = {'value1': subject.encode("utf-8"),
                 'value2': body.encode("utf-8")}
 
+        if self.config['value3']:
+            pretty_metadata = PrettyMetadata(kwargs['parameters'])
+            data['value3'] = pretty_metadata.parameters.get(self.config['value3'], '')
+
         headers = {'Content-type': 'application/json'}
 
         return self.make_request('https://maker.ifttt.com/trigger/{}/with/key/{}'.format(event, self.config['key']),
@@ -1964,6 +1973,13 @@ class IFTTT(Notifier):
                                          ' as <span class="inline-pre">value1</span>'
                                          ' and <span class="inline-pre">value2</span> respectively.',
                           'input_type': 'text'
+                          },
+                         {'label': 'Value 3',
+                          'value': self.config['value3'],
+                          'name': 'ifttt_value3',
+                          'description': 'Optional: Select a parameter to send as <span class="inline-pre">value3</span>.',
+                          'input_type': 'select',
+                          'select_options': PrettyMetadata().get_parameters()
                           }
                          ]
 
@@ -2286,9 +2302,9 @@ class NMA(Notifier):
 
 class OSX(Notifier):
     """
-    OSX notifications
+    macOS notifications
     """
-    NAME = 'OSX Notify'
+    NAME = 'macOS'
     _DEFAULT_CONFIG = {'notify_app': '/Applications/Tautulli'
                        }
 
@@ -2371,9 +2387,15 @@ class OSX(Notifier):
         config_option = [{'label': 'Register Notify App',
                           'value': self.config['notify_app'],
                           'name': 'osx_notify_app',
-                          'description': 'Enter the path/application name to be registered with the '
-                                         'Notification Center, default is /Applications/Tautulli.',
+                          'description': 'Enter the path/application name to be registered with the Notification Center. '
+                                         'Default is <span class="inline-pre">/Applications/Tautulli</span>.',
                           'input_type': 'text'
+                          },
+                         {'label': 'Register App',
+                          'value': 'Register App',
+                          'name': 'osx_notify_register',
+                          'description': 'Register Tautulli with the Notification Center.',
+                          'input_type': 'button'
                           }
                          ]
 
@@ -2454,7 +2476,7 @@ class PLEX(Notifier):
         return True
 
     def return_config_options(self):
-        config_option = [{'label': 'Plex Home Theater Host:Port',
+        config_option = [{'label': 'Plex Home Theater Host Address',
                           'value': self.config['hosts'],
                           'name': 'plex_hosts',
                           'description': 'Host running Plex Home Theater (eg. http://localhost:3005). Separate multiple hosts with commas (,).',
@@ -2645,10 +2667,10 @@ class PUSHBULLET(Notifier):
             return {'': ''}
 
     def return_config_options(self):
-        config_option = [{'label': 'Pushbullet API Key',
+        config_option = [{'label': 'Pushbullet Access Token',
                           'value': self.config['api_key'],
                           'name': 'pushbullet_api_key',
-                          'description': 'Your Pushbullet API key.',
+                          'description': 'Your Pushbullet access token.',
                           'input_type': 'text',
                           'refresh': True
                           },
@@ -2923,6 +2945,14 @@ class SCRIPTS(Notifier):
             process.kill()
             self.script_killed = True
 
+        # Common environment variables
+        env = {'PLEX_URL': plexpy.CONFIG.PMS_URL,
+               'PLEX_TOKEN': plexpy.CONFIG.PMS_TOKEN,
+               'TAUTULLI_URL': helpers.get_plexpy_url(hostname='localhost'),
+               'TAUTULLI_APIKEY': plexpy.CONFIG.API_KEY
+               }
+        env.update(os.environ)
+
         self.script_killed = False
         output = error = ''
         try:
@@ -2930,7 +2960,8 @@ class SCRIPTS(Notifier):
                                        stdin=subprocess.PIPE,
                                        stdout=subprocess.PIPE,
                                        stderr=subprocess.PIPE,
-                                       cwd=self.config['script_folder'])
+                                       cwd=self.config['script_folder'],
+                                       env=env)
 
             if self.config['timeout'] > 0:
                 timer = threading.Timer(self.config['timeout'], kill_script, (process,))
@@ -2938,11 +2969,13 @@ class SCRIPTS(Notifier):
                 timer = None
 
             try:
-                if timer: timer.start()
+                if timer:
+                    timer.start()
                 output, error = process.communicate()
                 status = process.returncode
             finally:
-                if timer: timer.cancel()
+                if timer:
+                    timer.cancel()
 
         except OSError as e:
             logger.error(u"Tautulli Notifiers :: Failed to run script: %s" % e)
@@ -3274,10 +3307,17 @@ class TELEGRAM(Notifier):
             if poster_content:
                 poster_filename = 'poster_{}.jpg'.format(pretty_metadata.parameters['rating_key'])
                 files = {'photo': (poster_filename, poster_content, 'image/jpeg')}
-                data['caption'] = text
 
-                return self.make_request('https://api.telegram.org/bot{}/sendPhoto'.format(self.config['bot_token']),
-                                         data=data, files=files)
+                if len(text) > 200:
+                    data['disable_notification'] = True
+                else:
+                    data['caption'] = text
+
+                r = self.make_request('https://api.telegram.org/bot{}/sendPhoto'.format(self.config['bot_token']),
+                                      data=data, files=files)
+
+                if not data.pop('disable_notification', None):
+                    return r
 
         data['text'] = text
 
@@ -3384,16 +3424,7 @@ class TWITTER(Notifier):
             return self._send_tweet(body, attachment=poster_url)
 
     def return_config_options(self):
-        config_option = [{'label': 'Instructions',
-                          'description': 'Step 1: Visit <a href="' + helpers.anon_url('https://apps.twitter.com') + '" target="_blank">'
-                                         'Twitter Apps</a> to <strong>Create New App</strong>. A vaild "Website" is not required.<br>'
-                                         'Step 2: Go to <strong>Keys and Access Tokens</strong> and click '
-                                         '<strong>Create my access token</strong>.<br>'
-                                         'Step 3: Fill in the <strong>Consumer Key</strong>, <strong>Consumer Secret</strong>, '
-                                         '<strong>Access Token</strong>, and <strong>Access Token Secret</strong> below.',
-                          'input_type': 'help'
-                          },
-                         {'label': 'Twitter Consumer Key',
+        config_option = [{'label': 'Twitter Consumer Key',
                           'value': self.config['consumer_key'],
                           'name': 'twitter_consumer_key',
                           'description': 'Your Twitter consumer key.',
@@ -3437,9 +3468,9 @@ class TWITTER(Notifier):
 
 class XBMC(Notifier):
     """
-    XBMC notifications
+    Kodi notifications
     """
-    NAME = 'XBMC'
+    NAME = 'Kodi'
     _DEFAULT_CONFIG = {'hosts': '',
                        'username': '',
                        'password': '',
@@ -3509,22 +3540,22 @@ class XBMC(Notifier):
         return True
 
     def return_config_options(self):
-        config_option = [{'label': 'XBMC Host:Port',
+        config_option = [{'label': 'Kodi Host Address',
                           'value': self.config['hosts'],
                           'name': 'xbmc_hosts',
-                          'description': 'Host running XBMC (e.g. http://localhost:8080). Separate multiple hosts with commas (,).',
+                          'description': 'Host running Kodi (e.g. http://localhost:8080). Separate multiple hosts with commas (,).',
                           'input_type': 'text'
                           },
-                         {'label': 'XBMC Username',
+                         {'label': 'Kodi Username',
                           'value': self.config['username'],
                           'name': 'xbmc_username',
-                          'description': 'Username of your XBMC client API (blank for none).',
+                          'description': 'Username of your Kodi client API (blank for none).',
                           'input_type': 'text'
                           },
-                         {'label': 'XBMC Password',
+                         {'label': 'Kodi Password',
                           'value': self.config['password'],
                           'name': 'xbmc_password',
-                          'description': 'Password of your XBMC client API (blank for none).',
+                          'description': 'Password of your Kodi client API (blank for none).',
                           'input_type': 'password'
                           },
                          {'label': 'Notification Duration',

plexpy/plextv.py

@@ -29,7 +29,7 @@ import pmsconnect
 import session
 
 
-def get_server_resources(return_presence=False):
+def get_server_resources(return_presence=False, return_server=False, **kwargs):
     if not return_presence:
         logger.info(u"Tautulli PlexTV :: Requesting resources for server...")
 
@@ -42,9 +42,15 @@ def get_server_resources(return_presence=False):
               'pms_is_remote': plexpy.CONFIG.PMS_IS_REMOTE,
               'pms_is_cloud': plexpy.CONFIG.PMS_IS_CLOUD,
               'pms_url': plexpy.CONFIG.PMS_URL,
-              'pms_url_manual': plexpy.CONFIG.PMS_URL_MANUAL
+              'pms_url_manual': plexpy.CONFIG.PMS_URL_MANUAL,
+              'pms_identifier': plexpy.CONFIG.PMS_IDENTIFIER
               }
 
+    if kwargs:
+        server.update(kwargs)
+        for k in ['pms_ssl', 'pms_is_remote', 'pms_is_cloud', 'pms_url_manual']:
+            server[k] = int(server[k])
+
     if server['pms_url_manual'] and server['pms_ssl'] or server['pms_is_cloud']:
         scheme = 'https'
     else:
@@ -55,7 +61,7 @@ def get_server_resources(return_presence=False):
                                                          port=server['pms_port'])
 
     plex_tv = PlexTV()
-    result = plex_tv.get_server_connections(pms_identifier=plexpy.CONFIG.PMS_IDENTIFIER,
+    result = plex_tv.get_server_connections(pms_identifier=server['pms_identifier'],
                                             pms_ip=server['pms_ip'],
                                             pms_port=server['pms_port'],
                                             include_https=server['pms_ssl'])
@@ -103,6 +109,9 @@ def get_server_resources(return_presence=False):
         server['pms_url'] = fallback_url
         logger.info(u"Tautulli PlexTV :: Using user-defined URL.")
 
+    if return_server:
+        return server
+
     plexpy.CONFIG.process_kwargs(server)
     plexpy.CONFIG.write()
 
@@ -645,6 +654,7 @@ class PlexTV(object):
                                       'label': helpers.get_xml_attr(d, 'name'),
                                       'ip': helpers.get_xml_attr(c, 'address'),
                                       'port': helpers.get_xml_attr(c, 'port'),
+                                      'uri': helpers.get_xml_attr(c, 'uri'),
                                       'local': helpers.get_xml_attr(c, 'local'),
                                       'value': helpers.get_xml_attr(c, 'address'),
                                       'is_cloud': is_cloud

plexpy/pmsconnect.py

@@ -666,6 +666,11 @@ class PmsConnect(object):
                         }
 
         elif metadata_type == 'show':
+            # Workaround for for duration sometimes reported in minutes for a show
+            duration = helpers.get_xml_attr(metadata_main, 'duration')
+            if duration.isdigit() and int(duration) < 1000:
+                duration = unicode(int(duration) * 60 * 1000)
+
             metadata = {'media_type': metadata_type,
                         'section_id': section_id,
                         'library_name': library_name,
@@ -685,7 +690,7 @@ class PmsConnect(object):
                         'rating': helpers.get_xml_attr(metadata_main, 'rating'),
                         'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
                         'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
+                        'duration': duration,
                         'year': helpers.get_xml_attr(metadata_main, 'year'),
                         'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
                         'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
@@ -1091,7 +1096,9 @@ class PmsConnect(object):
                         'genres': genres,
                         'labels': labels,
                         'collections': collections,
-                        'full_title': helpers.get_xml_attr(metadata_main, 'title')
+                        'full_title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'extra_type': helpers.get_xml_attr(metadata_main, 'extraType'),
+                        'sub_type': helpers.get_xml_attr(metadata_main, 'subtype')
                         }
 
         else:
@@ -1465,18 +1472,13 @@ class PmsConnect(object):
         transcode_details['transcode_hw_decoding'] = int(transcode_details['transcode_hw_decode'].lower() in common.HW_DECODERS)
         transcode_details['transcode_hw_encoding'] = int(transcode_details['transcode_hw_encode'].lower() in common.HW_ENCODERS)
 
-        # Generate a combined transcode decision value
-        if transcode_details['video_decision'] == 'transcode' or transcode_details['audio_decision'] == 'transcode':
-            transcode_decision = 'transcode'
-        elif transcode_details['video_decision'] == 'copy' or transcode_details['audio_decision'] == 'copy':
-            transcode_decision = 'copy'
-        else:
-            transcode_decision = 'direct play'
-    
         # Determine if a synced version is being played
         sync_id = None
-        if media_type not in ('photo', 'clip') and not session.getElementsByTagName('Session') \
-            and helpers.get_xml_attr(session, 'ratingKey').isdigit() and transcode_decision == 'direct play':
+        if media_type not in ('photo', 'clip') \
+                and not session.getElementsByTagName('Session') \
+                and not session.getElementsByTagName('TranscodeSession') \
+                and helpers.get_xml_attr(session, 'ratingKey').isdigit() \
+                and plexpy.CONFIG.PMS_PLEXPASS:
             plex_tv = plextv.PlexTV()
             parent_rating_key = helpers.get_xml_attr(session, 'parentRatingKey')
             grandparent_rating_key = helpers.get_xml_attr(session, 'grandparentRatingKey')
@@ -1582,6 +1584,14 @@ class PmsConnect(object):
                                 'stream_subtitle_decision': ''
                                 }
 
+        # Generate a combined transcode decision value
+        if video_details['stream_video_decision'] == 'transcode' or audio_details['stream_audio_decision'] == 'transcode':
+            transcode_decision = 'transcode'
+        elif video_details['stream_video_decision'] == 'copy' or audio_details['stream_audio_decision'] == 'copy':
+            transcode_decision = 'copy'
+        else:
+            transcode_decision = 'direct play'
+
         # Get the bif thumbnail
         indexes = helpers.get_xml_attr(stream_media_parts_info, 'indexes')
         view_offset = helpers.get_xml_attr(session, 'viewOffset')
@@ -1679,7 +1689,9 @@ class PmsConnect(object):
                                 'audio_channel_layout': common.AUDIO_CHANNELS.get(audio_channels, audio_channels),
                                 'channel_icon': helpers.get_xml_attr(session, 'sourceIcon'),
                                 'channel_title': helpers.get_xml_attr(session, 'sourceTitle'),
-                                'live': int(helpers.get_xml_attr(session, 'live') == '1')
+                                'live': int(helpers.get_xml_attr(session, 'live') == '1'),
+                                'extra_type': helpers.get_xml_attr(session, 'extraType'),
+                                'sub_type': helpers.get_xml_attr(session, 'subtype')
                                 }
         else:
             channel_stream = 0
@@ -2161,16 +2173,16 @@ class PmsConnect(object):
             logger.warn(u"Tautulli Pmsconnect :: Unable to parse XML for get_library_children_details: %s." % e)
             return []
 
-        childern_list = []
+        children_list = []
 
         for a in xml_head:
             if a.getAttribute('size'):
                 if a.getAttribute('size') == '0':
                     logger.debug(u"Tautulli Pmsconnect :: No library data.")
-                    childern_list = {'library_count': '0',
-                                     'childern_list': []
+                    children_list = {'library_count': '0',
+                                     'children_list': []
                                      }
-                    return childern_list
+                    return children_list
 
             if rating_key:
                 library_count = helpers.get_xml_attr(xml_head[0], 'size')
@@ -2228,10 +2240,10 @@ class PmsConnect(object):
                                       }
                         item_info.update(media_info)
 
-                childern_list.append(item_info)
+                children_list.append(item_info)
 
         output = {'library_count': library_count,
-                  'childern_list': childern_list
+                  'children_list': children_list
                   }
 
         return output

plexpy/session.py

@@ -38,14 +38,14 @@ def get_session_user():
     Returns the user_id for the current logged in session
     """
     _session = get_session_info()
-    return _session['user'] if _session and _session['user'] else None
+    return _session['user'] if _session['user_group'] == 'guest' and _session['user'] else None
 
 def get_session_user_id():
     """
     Returns the user_id for the current logged in session
     """
     _session = get_session_info()
-    return str(_session['user_id']) if _session and _session['user_id'] else None
+    return str(_session['user_id']) if _session['user_group'] == 'guest' and _session['user_id'] else None
 
 def get_session_shared_libraries():
     """

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_BRANCH = "beta"
-PLEXPY_RELEASE_VERSION = "v2.0.22-beta"
+PLEXPY_RELEASE_VERSION = "v2.0.26-beta"

plexpy/versioncheck.py

@@ -190,9 +190,9 @@ def checkGithub(auto_update=False):
         if plexpy.CONFIG.GIT_BRANCH == 'master':
             release = next((r for r in releases if not r['prerelease']), releases[0])
         elif plexpy.CONFIG.GIT_BRANCH == 'beta':
-            release = next((r for r in releases if r['prerelease'] and '-beta' in r['tag_name']), releases[0])
+            release = next((r for r in releases if not r['tag_name'].endswith('-nightly')), releases[0])
         elif plexpy.CONFIG.GIT_BRANCH == 'nightly':
-            release = next((r for r in releases if r['prerelease'] and '-nightly' in r['tag_name']), releases[0])
+            release = next((r for r in releases), releases[0])
         else:
             release = releases[0]
 
@@ -292,8 +292,8 @@ def update():
 
 def checkout_git_branch():
     if plexpy.INSTALL_TYPE == 'git':
-        output, err = runGit('fetch ' + plexpy.CONFIG.GIT_REMOTE)
-        output, err = runGit('checkout ' + plexpy.CONFIG.GIT_BRANCH)
+        output, err = runGit('fetch %s' % plexpy.CONFIG.GIT_REMOTE)
+        output, err = runGit('checkout %s' % plexpy.CONFIG.GIT_BRANCH)
 
         if not output:
             logger.error('Unable to change git branch.')
@@ -304,6 +304,8 @@ def checkout_git_branch():
                 logger.error('Unable to checkout from git: ' + line)
                 logger.info('Output: ' + str(output))
 
+        output, err = runGit('pull %s %s' % (plexpy.CONFIG.GIT_REMOTE, plexpy.CONFIG.GIT_BRANCH))
+
 
 def read_changelog(latest_only=False, since_prev_release=False):
     changelog_file = os.path.join(plexpy.PROG_DIR, 'CHANGELOG.md')

plexpy/web_socket.py

@@ -25,18 +25,27 @@ import plexpy
 import activity_handler
 import activity_pinger
 import activity_processor
+import database
 import logger
 
 name = 'websocket'
 opcode_data = (websocket.ABNF.OPCODE_TEXT, websocket.ABNF.OPCODE_BINARY)
-ws_reconnect = False
+ws_shutdown = False
 
 
 def start_thread():
-    # Check for any existing sessions on start up
-    activity_pinger.check_active_sessions(ws_request=True)
+    try:
+        # Check for any existing sessions on start up
+        activity_pinger.check_active_sessions(ws_request=True)
+    except Exception as e:
+        logger.error(u"Tautulli WebSocket :: Failed to check for active sessions: %s." % e)
+        logger.warn(u"Tautulli WebSocket :: Attempt to fix by flushing temporary sessions...")
+        database.delete_sessions()
+
     # Start the websocket listener on it's own thread
-    threading.Thread(target=run).start()
+    thread = threading.Thread(target=run)
+    thread.daemon = True
+    thread.start()
 
 
 def on_connect():
@@ -65,8 +74,21 @@ def on_disconnect():
 
 
 def reconnect():
-    global ws_reconnect
-    ws_reconnect = True
+    close()
+    logger.info(u"Tautulli WebSocket :: Reconnecting websocket...")
+    start_thread()
+
+
+def shutdown():
+    global ws_shutdown
+    ws_shutdown = True
+    close()
+
+
+def close():
+    logger.info(u"Tautulli WebSocket :: Disconnecting websocket...")
+    plexpy.WEBSOCKET.close()
+    plexpy.WS_CONNECTED = False
 
 
 def run():
@@ -88,8 +110,8 @@ def run():
     else:
         header = []
 
-    global ws_reconnect
-    ws_reconnect = False
+    global ws_shutdown
+    ws_shutdown = False
     reconnects = 0
 
     # Try an open the websocket connection
@@ -106,23 +128,26 @@ def run():
         logger.info(u"Tautulli WebSocket :: Connection attempt %s." % str(reconnects))
 
         try:
-            ws = create_connection(uri, header=header)
+            plexpy.WEBSOCKET = create_connection(uri, header=header)
             logger.info(u"Tautulli WebSocket :: Ready")
             plexpy.WS_CONNECTED = True
         except (websocket.WebSocketException, IOError, Exception) as e:
-            logger.error(u"Tautulli WebSocket :: %s." % e)
+            logger.error("Tautulli WebSocket :: %s." % e)
 
     if plexpy.WS_CONNECTED:
         on_connect()
 
     while plexpy.WS_CONNECTED:
         try:
-            process(*receive(ws))
+            process(*receive(plexpy.WEBSOCKET))
 
             # successfully received data, reset reconnects counter
             reconnects = 0
 
         except websocket.WebSocketConnectionClosedException:
+            if ws_shutdown:
+                break
+
             if reconnects == 0:
                 logger.warn(u"Tautulli WebSocket :: Connection has closed.")
 
@@ -136,31 +161,25 @@ def run():
                 logger.warn(u"Tautulli WebSocket :: Reconnection attempt %s." % str(reconnects))
 
                 try:
-                    ws = create_connection(uri, header=header)
+                    plexpy.WEBSOCKET = create_connection(uri, header=header)
                     logger.info(u"Tautulli WebSocket :: Ready")
                     plexpy.WS_CONNECTED = True
                 except (websocket.WebSocketException, IOError, Exception) as e:
-                    logger.error(u"Tautulli WebSocket :: %s." % e)
+                    logger.error("Tautulli WebSocket :: %s." % e)
 
             else:
-                ws.shutdown()
-                plexpy.WS_CONNECTED = False
+                close()
                 break
 
         except (websocket.WebSocketException, Exception) as e:
-            logger.error(u"Tautulli WebSocket :: %s." % e)
-            ws.shutdown()
-            plexpy.WS_CONNECTED = False
+            if ws_shutdown:
+                break
+
+            logger.error("Tautulli WebSocket :: %s." % e)
+            close()
             break
 
-        # Check if we recieved a restart notification and close websocket connection cleanly
-        if ws_reconnect:
-            logger.info(u"Tautulli WebSocket :: Reconnecting websocket...")
-            ws.shutdown()
-            plexpy.WS_CONNECTED = False
-            start_thread()
-    
-    if not plexpy.WS_CONNECTED and not ws_reconnect:
+    if not plexpy.WS_CONNECTED and not ws_shutdown:
         on_disconnect()
 
     logger.debug(u"Tautulli WebSocket :: Leaving thread.")

plexpy/webauth.py

@@ -106,10 +106,10 @@ def check_credentials(username, password, admin_login='0'):
     if plexpy.CONFIG.HTTP_PASSWORD:
         if plexpy.CONFIG.HTTP_HASHED_PASSWORD and \
                 username == plexpy.CONFIG.HTTP_USERNAME and check_hash(password, plexpy.CONFIG.HTTP_PASSWORD):
-            return True, 'admin'
+            return True, 'tautulli admin'
         elif not plexpy.CONFIG.HTTP_HASHED_PASSWORD and \
                 username == plexpy.CONFIG.HTTP_USERNAME and password == plexpy.CONFIG.HTTP_PASSWORD:
-            return True, 'admin'
+            return True, 'tautulli admin'
 
     if plexpy.CONFIG.HTTP_PLEX_ADMIN or (not admin_login == '1' and plexpy.CONFIG.ALLOW_GUEST_ACCESS):
         plex_login = user_login(username, password)
@@ -215,12 +215,12 @@ class AuthController(object):
             return
         raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
 
-    def on_login(self, user_id, username, user_group):
+    def on_login(self, username, user_id=None, user_group=None, success=0):
         """Called on successful login"""
 
         # Save login to the database
-        ip_address = cherrypy.request.headers.get('X-Forwarded-For', cherrypy.request.headers.get('Remote-Addr'))
-        host = cherrypy.request.headers.get('Host', cherrypy.request.headers.get('Origin'))
+        ip_address = cherrypy.request.remote.ip
+        host = cherrypy.request.base
         user_agent = cherrypy.request.headers.get('User-Agent')
 
         Users().set_user_login(user_id=user_id,
@@ -229,28 +229,15 @@ class AuthController(object):
                                ip_address=ip_address,
                                host=host,
                                user_agent=user_agent,
-                               success=1)
+                               success=success)
 
-        logger.debug(u"Tautulli WebAuth :: %s user '%s' logged into Tautulli." % (user_group.capitalize(), username))
+        if success == 1:
+            logger.debug(u"Tautulli WebAuth :: %s user '%s' logged into Tautulli." % (user_group.capitalize(), username))
     
     def on_logout(self, username, user_group):
         """Called on logout"""
         logger.debug(u"Tautulli WebAuth :: %s user '%s' logged out of Tautulli." % (user_group.capitalize(), username))
     
-    def on_login_failed(self, username):
-        """Called on failed login"""
-
-        # Save login attempt to the database
-        ip_address = cherrypy.request.headers.get('X-Forwarded-For', cherrypy.request.headers.get('Remote-Addr'))
-        host = cherrypy.request.headers.get('Origin')
-        user_agent = cherrypy.request.headers.get('User-Agent')
-
-        Users().set_user_login(user=username,
-                               ip_address=ip_address,
-                               host=host,
-                               user_agent=user_agent,
-                               success=0)
-
     def get_loginform(self):
         from plexpy.webserve import serve_template
         return serve_template(templatename="login.html", title="Login")
@@ -293,15 +280,16 @@ class AuthController(object):
         valid_login, user_group = check_credentials(username, password, admin_login)
 
         if valid_login:
-            if user_group == 'guest':
+            if user_group == 'tautulli admin':
+                user_group = 'admin'
+                user_id = None
+            else:
                 if re.match(r"[^@]+@[^@]+\.[^@]+", username):
                     user_details = Users().get_details(email=username)
                 else:
                     user_details = Users().get_details(user=username)
 
                 user_id = user_details['user_id']
-            else:
-                user_id = None
 
             time_delta = timedelta(days=30) if remember_me == '1' else timedelta(minutes=60)
             expiry = datetime.utcnow() + time_delta
@@ -315,7 +303,10 @@ class AuthController(object):
 
             jwt_token = jwt.encode(payload, plexpy.CONFIG.JWT_SECRET, algorithm=JWT_ALGORITHM)
 
-            self.on_login(user_id, username, user_group)
+            self.on_login(username=username,
+                          user_id=user_id,
+                          user_group=user_group,
+                          success=1)
 
             jwt_cookie = JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID
             cherrypy.response.cookie[jwt_cookie] = jwt_token
@@ -327,13 +318,13 @@ class AuthController(object):
             return {'status': 'success', 'token': jwt_token.decode('utf-8'), 'uuid': plexpy.CONFIG.PMS_UUID}
 
         elif admin_login == '1':
-            self.on_login_failed(username)
+            self.on_login(username=username)
             logger.debug(u"Tautulli WebAuth :: Invalid admin login attempt from '%s'." % username)
             cherrypy.response.status = 401
             return error_message
 
         else:
-            self.on_login_failed(username)
+            self.on_login(username=username)
             logger.debug(u"Tautulli WebAuth :: Invalid login attempt from '%s'." % username)
             cherrypy.response.status = 401
             return error_message

plexpy/webserve.py

@@ -27,6 +27,8 @@ from hashing_passwords import make_hash
 from mako.lookup import TemplateLookup
 from mako import exceptions
 
+import websocket
+
 import plexpy
 import activity_pinger
 import common
@@ -171,6 +173,7 @@ class WebInterface(object):
             "home_stats_type": plexpy.CONFIG.HOME_STATS_TYPE,
             "home_stats_count": plexpy.CONFIG.HOME_STATS_COUNT,
             "home_stats_recently_added_count": plexpy.CONFIG.HOME_STATS_RECENTLY_ADDED_COUNT,
+            "home_refresh_interval": plexpy.CONFIG.HOME_REFRESH_INTERVAL,
             "pms_name": plexpy.CONFIG.PMS_NAME,
             "pms_is_cloud": plexpy.CONFIG.PMS_IS_CLOUD,
             "update_show_changelog": plexpy.CONFIG.UPDATE_SHOW_CHANGELOG
@@ -283,7 +286,11 @@ class WebInterface(object):
 
     @cherrypy.expose
     @requireAuth(member_of("admin"))
-    def set_home_stats_config(self, time_range=None, stats_type=None, stats_count=None, recently_added_count=None, **kwargs):
+    def set_home_stats_config(self, refresh_interval=None, time_range=None, stats_type=None, stats_count=None,
+                              recently_added_count=None, **kwargs):
+        if refresh_interval:
+            plexpy.CONFIG.__setattr__('HOME_REFRESH_INTERVAL', refresh_interval)
+            plexpy.CONFIG.write()
         if time_range:
             plexpy.CONFIG.__setattr__('HOME_STATS_LENGTH', time_range)
             plexpy.CONFIG.write()
@@ -2611,6 +2618,7 @@ class WebInterface(object):
             "pms_ssl": plexpy.CONFIG.PMS_SSL,
             "pms_is_remote": plexpy.CONFIG.PMS_IS_REMOTE,
             "pms_is_cloud": plexpy.CONFIG.PMS_IS_CLOUD,
+            "pms_url": plexpy.CONFIG.PMS_URL,
             "pms_url_manual": checked(plexpy.CONFIG.PMS_URL_MANUAL),
             "pms_uuid": plexpy.CONFIG.PMS_UUID,
             "pms_web_url": plexpy.CONFIG.PMS_WEB_URL,
@@ -2812,6 +2820,12 @@ class WebInterface(object):
 
         return {'result': 'success', 'message': 'Settings saved.'}
 
+    @cherrypy.expose
+    @cherrypy.tools.json_out()
+    @requireAuth(member_of("admin"))
+    def get_server_resources(self, **kwargs):
+        return plextv.get_server_resources(return_server=True, **kwargs)
+
     @cherrypy.expose
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
@@ -3004,18 +3018,12 @@ class WebInterface(object):
     def get_notifier_config_modal(self, notifier_id=None, **kwargs):
         result = notifiers.get_notifier_config(notifier_id=notifier_id)
 
-        if not result['custom_conditions']:
-            result['custom_conditions'] = json.dumps([{'parameter': '', 'operator': '', 'value': ''}])
-
-        if not result['custom_conditions_logic']:
-            result['custom_conditions_logic'] = ''
-
         parameters = [
                 {'name': param['name'], 'type': param['type'], 'value': param['value']}
                 for category in common.NOTIFICATION_PARAMETERS for param in category['parameters']
             ]
 
-        return serve_template(templatename="notifier_config.html", notifier=result, parameters=json.dumps(parameters))
+        return serve_template(templatename="notifier_config.html", notifier=result, parameters=parameters)
 
     @cherrypy.expose
     @cherrypy.tools.json_out()
@@ -3190,7 +3198,7 @@ class WebInterface(object):
     @cherrypy.expose
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
-    def facebookStep1(self, app_id='', app_secret='', redirect_uri='', **kwargs):
+    def facebook_auth(self, app_id='', app_secret='', redirect_uri='', **kwargs):
         cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
 
         facebook_notifier = notifiers.FACEBOOK()
@@ -3205,7 +3213,7 @@ class WebInterface(object):
 
     @cherrypy.expose
     @requireAuth(member_of("admin"))
-    def facebookStep2(self, code='', **kwargs):
+    def facebook_redirect(self, code='', **kwargs):
         cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
 
         facebook = notifiers.FACEBOOK()
@@ -3461,7 +3469,8 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
     @addtoapi()
-    def get_server_id(self, hostname=None, port=None, identifier=None, ssl=0, remote=0, **kwargs):
+    def get_server_id(self, hostname=None, port=None, identifier=None, ssl=0, remote=0, manual=0,
+                      get_url=False, test_websocket=False, **kwargs):
         """ Get the PMS server identifier.
 
             ```
@@ -3474,7 +3483,8 @@ class WebInterface(object):
                 remote (int):       0 or 1
 
             Returns:
-                string:             The unique PMS identifier
+                json:
+                    {'identifier': '08u2phnlkdshf890bhdlksghnljsahgleikjfg9t'}
             ```
         """
         # Attempt to get the pms_identifier from plex.tv if the server is published
@@ -3505,11 +3515,38 @@ class WebInterface(object):
                     xml_head = request.getElementsByTagName('MediaContainer')[0]
                     identifier = xml_head.getAttribute('machineIdentifier')
 
+        result = {'identifier': identifier}
+
         if identifier:
-            return identifier
+            if get_url == 'true':
+                server = self.get_server_resources(pms_ip=hostname,
+                                                   pms_port=port,
+                                                   pms_ssl=ssl,
+                                                   pms_is_remote=remote,
+                                                   pms_url_manual=manual,
+                                                   pms_identifier=identifier)
+                result['url'] = server['pms_url']
+                result['ws'] = None
+
+                if test_websocket == 'true':
+                    # Quick test websocket connection
+                    ws_url = result['url'].replace('http', 'ws', 1) + '/:/websockets/notifications'
+                    header = ['X-Plex-Token: %s' % plexpy.CONFIG.PMS_TOKEN]
+
+                    logger.debug("Testing websocket connection...")
+                    try:
+                        test_ws = websocket.create_connection(ws_url, header=header)
+                        test_ws.close()
+                        logger.debug("Websocket connection test successful.")
+                        result['ws'] = True
+                    except (websocket.WebSocketException, IOError, Exception) as e:
+                        logger.error("Websocket connection test failed: %s" % e)
+                        result['ws'] = False
+
+            return result
         else:
             logger.warn('Unable to retrieve the PMS identifier.')
-            return None
+            return result
 
     @cherrypy.expose
     @requireAuth(member_of("admin"))
@@ -3684,6 +3721,9 @@ class WebInterface(object):
     @cherrypy.expose
     @requireAuth()
     def info(self, rating_key=None, source=None, query=None, **kwargs):
+        if rating_key and not str(rating_key).isdigit():
+            raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
+
         metadata = None
 
         config = {
@@ -5113,10 +5153,10 @@ class WebInterface(object):
         quote_list = ['To crush your enemies, see them driven before you, and to hear the lamentation of their women!',
                       'Your clothes, give them to me, now!',
                       'Do it!',
-                      'If it bleeds, we can kill it',
+                      'If it bleeds, we can kill it.',
                       'See you at the party Richter!',
-                      'Let off some steam, Bennett',
-                      'I\'ll be back',
+                      'Let off some steam, Bennett.',
+                      'I\'ll be back.',
                       'Get to the chopper!',
                       'Hasta La Vista, Baby!',
                       'It\'s not a tumor!',
@@ -5137,7 +5177,7 @@ class WebInterface(object):
                       'What killed the dinosaurs? The Ice Age!',
                       'That\'s for sleeping with my wife!',
                       'Remember when I said I\'d kill you last... I lied!',
-                      'You want to be a farmer? Here\'s a couple of acres',
+                      'You want to be a farmer? Here\'s a couple of acres.',
                       'Now, this is the plan. Get your ass to Mars.',
                       'I just had a terrible thought... What if this is a dream?',
                       'Well, listen to this one: Rubber baby buggy bumpers!',
@@ -5271,34 +5311,4 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     def get_plexpy_url(self, **kwargs):
-        if plexpy.CONFIG.ENABLE_HTTPS:
-           scheme = 'https' 
-        else:
-           scheme = 'http'
-
-        # Have to return some hostname if socket fails even if 127.0.0.1 won't work
-        hostname = '127.0.0.1'
-
-        if plexpy.CONFIG.HTTP_HOST == '0.0.0.0':
-            import socket
-            try:
-                s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-                s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
-                s.connect(('<broadcast>', 0))
-                hostname = s.getsockname()[0]
-            except socket.error:
-                hostname = socket.gethostbyname(socket.gethostname())
-        else:
-            hostname = plexpy.CONFIG.HTTP_HOST
-
-        if plexpy.CONFIG.HTTP_PORT not in (80, 443):
-            port = ':' + str(plexpy.CONFIG.HTTP_PORT)
-        else:
-            port = ''
-
-        if plexpy.CONFIG.HTTP_ROOT.strip('/'):
-            root = '/' + plexpy.CONFIG.HTTP_ROOT.strip('/')
-        else:
-            root = ''
-
-        return scheme + '://' + hostname + port + root
+        return helpers.get_plexpy_url()