v2.1.29

Update init.systemd

API.md

@@ -733,7 +733,7 @@ Required parameters:
 Optional parameters:
     grouping (int):         0 or 1
     time_range (str):       The time range to calculate statistics, '30'
-    stats_type (int):       0 for plays, 1 for duration
+    stats_type (str):       plays or duration
     stats_count (str):      The number of top items to list, '5'
 
 Returns:
@@ -893,6 +893,7 @@ Returns:
     json:
         {"child_count": null,
          "count": 887,
+         "deleted_section": 0,
          "do_notify": 1,
          "do_notify_created": 1,
          "keep_history": 1,
@@ -1775,7 +1776,7 @@ Returns:
 
 
 ### get_recently_added
-Get all items that where recelty added to plex.
+Get all items that where recently added to plex.
 
 ```
 Required parameters:
@@ -1783,7 +1784,7 @@ Required parameters:
 
 Optional parameters:
     start (str):        The item number to start at
-    type (str):         The media type: movie, show, artist
+    media_type (str):   The media type: movie, show, artist
     section_id (str):   The id of the Plex library section
 
 Returns:

CHANGELOG.md

@@ -1,5 +1,153 @@
 # Changelog
 
+## v2.1.29 (2019-05-11)
+* No additional changes from v2.1.29-beta.
+
+
+## v2.1.29-beta (2019-04-14)
+
+* Monitoring:
+  * Change: "Required Bandwidth" changed to "Reserved Bandwidth" in order to match the Plex dashboard.
+* Notifications:
+  * New: Added prefix and suffix notification text modifiers. See the "Notification Text Modifiers" help modal for details.
+* UI:
+  * New: Added "Undelete" button to the edit library and edit user modals.
+  * Fix: User IP address history table showing incorrect "Last Seen" values.
+* API:
+  * Fix: Search API only returning 3 results.
+  * Fix: Terminate stream API failing when both session_key and session_id were provided.
+  * Change: Improved API response HTTP status codes and error messages.
+
+
+## v2.1.28 (2019-03-10)
+
+* Monitoring:
+  * New: Added secure/insecure connection icon on the activity cards. Requires Plex Media Server v1.15+.
+* Other:
+  * Change: Improved mass deleting of all images from Cloudinary. Requires all previous images on Cloudinary to be manually tagged with "tautulli". New uploads are automatically tagged.
+
+
+## v2.1.27-beta (2019-03-03)
+
+* Monitoring:
+  * Fix: Error when playing synced optimized versions.
+  * Change: Show message to complete the setup wizard instead of error communicating with server message.
+  * Change: URL changed on Plex.tv for Plex Media Server beta updates.
+* Notifications:
+  * New: Show the media type exclusion tags in the text preview modal.
+  * Fix: Unicode error in the Email notification failed response message.
+  * Fix: Error when a notification agent response is missing the "Content-Type" header.
+* UI:
+  * Fix: Usernames were not being sanitized in dropdown selectors.
+  * Change: Different display of "All" recently added items on the homepage due to change in the Plex Media Server v1.15+ API.
+* API:
+  * New: Added current Tautulli version to update_check API response.
+  * Change: API no longer returns sanitized HTML response data.
+* Other:
+  * New: Added auto-restart to systemd init script.
+  * Fix: Patreon donation URL.
+  * Remove: Crypto donation options.
+
+
+## v2.1.26 (2018-12-01)
+
+* Monitoring:
+  * Fix: Resume event not being triggered after buffering.
+* Notifications:
+  * New: Added user email as a notification parameter.
+* Graphs:
+  * Fix: History model showing no results for stream info graph.
+* API:
+  * Fix: API returning error when missing a cmd.
+
+
+## v2.1.25 (2018-11-03)
+
+* Monitoring:
+  * Fix: Audio and video codec showing up as * on the activity cards.
+  * New: Poster and background image on the activity cards for live TV.
+* UI:
+  * Fix: Alert message for invalid Tautulli Public Domain setting.
+
+
+## v2.1.24-beta (2018-10-29)
+
+* Monitoring:
+  * Fix: Transcode change events creating invalid sessions in the database.
+* Notifications:
+  * Change: Update Telegram character limit to 1024.
+* History:
+  * Fix: Save history table states separately for multiple Tautulli instances.
+* Graphs:
+  * Fix: Save graphs states separately for multiple Tautulli instances.
+  * Change: Version graphs to bypass browser cache.
+* UI:
+  * New: Added queued tasks modals to the scheduled tasks table for debugging.
+* Other:
+  * Change: Updated timezone info and display in configuration table.
+
+
+## v2.1.23-beta (2018-10-14)
+
+* Monitoring:
+  * Fix: Buffer events not being triggered properly.
+  * Fix: Watched progress sometimes not saved correctly. (Thanks @Sheigutn)
+* Notifications:
+  * New: Added notification trigger for transcode decision change.
+  * Fix: Multiple buffer notifications being triggered within the same second.
+  * Change: Default buffer notification threshold changed to 10 for buffer thresholds less than 10.
+* Newsletter:
+  * New: Added Other Video libraries to the newsletter.
+* Homepage:
+  * New: Added Other Video type to recently added on the homepage.
+  * Change: Save homepage recently added media type toggle state.
+  * Change: Save homepage stats config to local storage instead of the server.
+* History:
+  * Change: Save history table media type toggle state.
+* Graphs:
+  * Change: Save series visibility state when toggling the legend.
+  * Change: Save graph config to local storage instead of the server.
+* UI:
+  * New: Show the remote app device token and id in the edit device modal.
+  * Change: Lock certain settings if using the Tautulli docker container.
+* API:
+  * Fix: download_config, download_database, download_log, and download_plex_log API commands not working.
+  * Change: get_recently_added command 'type' parameter renamed to 'media_type'. Backwards compatibility is maintained.
+  * Change: get_home_stats command 'stats_type' parameter change to string 'plays' or 'duration'. Backwards compatibility is maintained.
+
+
+## v2.1.22 (2018-10-05)
+
+* Notifications:
+  * Fix: Notification agent settings not loading when failed to retrieve some data.
+* UI:
+  * Fix: Incorrectly showing localhost server in the setup wizard.
+* Other:
+  * Fix: Incorrect redirect to HTTP when HTTPS proxy header is present.
+  * Fix: Websocket not connecting automatically after the setup wizard.
+
+
+## v2.1.21 (2018-09-21)
+
+* Notifications:
+  * Fix: Content Rating notification condition always evaluating to True. (Thanks @Arcanemagus)
+  * Fix: Script arguments not showing substituted values in the notification logs.
+* UI:
+  * New: Unsupported browser warning when using IE or Edge.
+  * Fix: Misaligned refresh image icon in album search results. (Thanks @Sheigutn)
+  * Fix: Music history showing as pre-Tautulli in stream info modal.
+* Other:
+  * Fix: Typo in Systemd init script group value. (Thanks @ldumont)
+  * Fix: Execute permissions in Fedora/CentOS and Systemd init scripts. (Thanks @wilmardo)
+  * Fix: Systemd init script instructions per Linux distro. (Thanks @samwiseg00)
+  * Change: Fallback to Tautulli data directory if logs/backup/cache/newsletter directories are not writable.
+  * Change: Check for alternative reverse proxy headers if X-Forwarded-Host is missing.
+
+
+## v2.1.20 (2018-09-05)
+* No additional changes from v2.1.20-beta.
+
+
 ## v2.1.20-beta (2018-09-02)
 
 * Monitoring:

Tautulli.py

@@ -28,9 +28,12 @@ import sys
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib'))
 
 import argparse
+import datetime
 import locale
+import pytz
 import signal
 import time
+import tzlocal
 
 import plexpy
 from plexpy import config, database, logger, webstart
@@ -106,6 +109,17 @@ def main():
     logger.initLogger(console=not plexpy.QUIET, log_dir=False,
                       verbose=plexpy.VERBOSE)
 
+    try:
+        plexpy.SYS_TIMEZONE = str(tzlocal.get_localzone())
+        plexpy.SYS_UTC_OFFSET = datetime.datetime.now(pytz.timezone(plexpy.SYS_TIMEZONE)).strftime('%z')
+    except (pytz.UnknownTimeZoneError, LookupError, ValueError) as e:
+        logger.error("Could not determine system timezone: %s" % e)
+        plexpy.SYS_TIMEZONE = 'Unknown'
+        plexpy.SYS_UTC_OFFSET = '+0000'
+
+    if os.getenv('TAUTULLI_DOCKER', False) == 'True':
+        plexpy.DOCKER = True
+
     if args.dev:
         plexpy.DEV = True
         logger.debug(u"Tautulli is running in the dev environment.")

data/interfaces/default/base.html

@@ -209,7 +209,7 @@ ${next.modalIncludes()}
     </div>
 </div>
 % else:
-<div id="donate-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="crypto-donate-modal">
+<div id="donate-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="donate-modal">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -230,17 +230,13 @@ ${next.modalIncludes()}
                 <ul id="donation_type" class="nav nav-pills" role="tablist" style="display: flex; justify-content: center; margin: 10px 0;">
                     <li class="active"><a href="#patreon-donation" role="tab" data-toggle="tab">Patreon</a></li>
                     <li><a href="#paypal-donation" role="tab" data-toggle="tab">PayPal</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="bitcoin" data-name="Bitcoin" data-address="3FdfJAyNWU15Sf11U9FTgPHuP1hPz32eEN">Bitcoin</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="bitcoincash" data-name="Bitcoin Cash" data-address="1H2atabxAQGaFAWYQEiLkXKSnK9CZZvt2n">Bitcoin Cash</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="ethereum" data-name="Ethereum" data-address="0x77ae4c2b8de1a1ccfa93553db39971da58c873d3">Ethereum</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="litecoin" data-name="Litecoin" data-address="LWpPmUqQYHBhMV83XSCsHzPmKLhJt6r57J">Litecoin</a></li>
                 </ul>
                 <div class="tab-content">
                     <div role="tabpanel" class="tab-pane active" id="patreon-donation" style="text-align: center">
                         <p>
                             Click the button below to continue to Patreon.
                         </p>
-                        <a href="${anon_url('https://www.patreon.com/bePatron?u=10078609')}" target="_blank">
+                        <a href="${anon_url('https://www.patreon.com/join/tautulli')}" target="_blank">
                             <img src="images/become_a_patron_button.png" alt="Become a Patron" height="40">
                         </a>
                     </div>
@@ -252,12 +248,6 @@ ${next.modalIncludes()}
                             <img src="images/gold-rect-paypal-34px.png" alt="PayPal">
                         </a>
                     </div>
-                    <div role="tabpanel" class="tab-pane" id="crypto-donation">
-                        <label>QR Code</label>
-                        <pre id="crypto_qr_code" style="text-align: center"></pre>
-                        <label><span id="crypto_type_label"></span> Address</label>
-                        <pre id="crypto_address" style="text-align: center"></pre>
-                    </div>
                 </div>
             </div>
             <div class="modal-footer">
@@ -293,7 +283,6 @@ ${next.modalIncludes()}
 <script src="${http_root}js/pnotify.custom.min.js"></script>
 <script src="${http_root}js/platform.min.js"></script>
 <script src="${http_root}js/script.js${cache_param}"></script>
-<script src="${http_root}js/jquery.qrcode.min.js"></script>
 <script src="${http_root}js/jquery.tripleclick.min.js"></script>
 % if _session['user_group'] == 'admin' and BROWSER_NOTIFIERS:
 <script src="${http_root}js/ajaxNotifications.js"></script>
@@ -365,16 +354,6 @@ ${next.modalIncludes()}
         checkUpdate(function () { $('#nav-update').html('<i class="fa fa-fw fa-arrow-alt-circle-up"></i> Check for Updates'); });
     });
 
-    $('#donation_type a.crypto-donation').on('shown.bs.tab', function () {
-        var crypto_coin = $(this).data('coin');
-        var crypto_name = $(this).data('name');
-        var crypto_address = $(this).data('address')
-        $('#crypto_qr_code').empty().qrcode({
-            text: crypto_coin + ":" + crypto_address
-        });
-        $('#crypto_type_label').html(crypto_name);
-        $('#crypto_address').html(crypto_address);
-    });
     % endif
 
     $('.dropdown-toggle').click(function (e) {

data/interfaces/default/configuration_table.html

@@ -71,6 +71,10 @@ DOCUMENTATION :: END
             <td>Platform:</td>
             <td>${common.PLATFORM} ${common.PLATFORM_RELEASE} (${common.PLATFORM_VERSION + (' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else '')})</td>
         </tr>
+        <tr>
+            <td>System Timezone:</td>
+            <td>${plexpy.SYS_TIMEZONE} (${'UTC{}'.format(plexpy.SYS_UTC_OFFSET)})
+        </tr>
         <tr>
             <td>Python Version:</td>
             <td>${sys.version}</td>

data/interfaces/default/css/tautulli.css

@@ -676,7 +676,9 @@ textarea.form-control:focus {
     color: #F9AA03;
     margin: 5px 40px 5px 0;
 }
-.form-control[readonly] {
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
     background-color: #555;
 }
 .form-control[readonly]:focus {
@@ -2151,6 +2153,10 @@ div.advanced-setting {
 li.advanced-setting {
     border-left: 1px solid #cc7b19;
 }
+.docker-setting {
+    color: #cc7b19;
+    margin-left: 10px;
+}
 .user-info-wrapper {
 }
 .user-info-poster-face {
@@ -3361,6 +3367,34 @@ pre::-webkit-scrollbar-thumb {
 .notification-params tr:nth-child(even) td {
     background-color: rgba(255,255,255,0.010);
 }
+.activity-queue {
+    width: 100%;
+    margin-top: 10px;
+    background-color: #282828;
+}
+.activity-queue th {
+    padding-left: 10px;
+    height: 30px;
+}
+.activity-queue th:first-child {
+    width: 268px;
+}
+.activity-queue th:nth-child(2) {
+    width: 125px;
+}
+.activity-queue th:nth-child(3) {
+    width: 175px;
+}
+.activity-queue td {
+    height: 25px;
+    padding: 5px 10px;
+}
+.activity-queue tr:nth-child(odd) td {
+    background-color: rgba(255,255,255,0.035);
+}
+.activity-queue tr:nth-child(even) td {
+    background-color: rgba(255,255,255,0.010);
+}
 #days-selection label,
 #months-selection label {
     margin-bottom: 0;
@@ -4162,4 +4196,21 @@ a[data-tab-destination] {
 }
 .fa-blank {
     visibility: hidden;
+}
+
+#browser-warning {
+    height: 25px;
+    width: 100%;
+    background: #cc7b19;
+    text-align: center;
+    font-weight: bold;
+    padding: 2px 10px;
+    position: absolute;
+    top: 0;
+    z-index: 9999;
+}
+
+.help-block li {
+    margin-top: 0;
+    color: #737373;
 }

data/interfaces/default/current_activity_instance.html

@@ -80,7 +80,9 @@ DOCUMENTATION :: END
      data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}">
     <div class="dashboard-activity-container">
         <%
-            if data['channel_stream'] == 0:
+            if data['live'] == 1:
+                background_url = 'images/art-live.png'
+            elif data['channel_stream'] == 0:
                 background_url = 'pms_image_proxy?img=' + data['art'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art&refresh=true'
             else:
                 if (data['art'] and data['art'].startswith('http')) or (data['thumb'] and data['thumb'].startswith('http')):
@@ -93,7 +95,9 @@ DOCUMENTATION :: END
                 % if data['media_type'] == 'track':
                 <div id="poster-${sk}-bg" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['parent_thumb']}&width=300&height=300&opacity=60&background=282828&blur=3&fallback=cover&refresh=true);"></div>
                 % endif
-                % if data['channel_stream'] == 0:
+                % if data['live'] == 1:
+                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(images/poster-live.png);"></div>
+                % elif data['channel_stream'] == 0:
                     % if data['media_type'] == 'movie':
                     <a id="poster-url-${sk}" href="${href}" title="${data['title']}">
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
@@ -113,7 +117,7 @@ DOCUMENTATION :: END
                         <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>
+                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(images/poster.png);"></div>
                     % endif
                 % else:
                     % if data['channel_icon'].startswith('http'):
@@ -279,10 +283,17 @@ DOCUMENTATION :: END
                             <li class="dashboard-activity-info-item">
                                 <div class="sub-heading">Location</div>
                                 <div class="sub-value time-right">
+                                    % if data['secure'] is not None:
+                                    % if data['secure']:
+                                    <span data-toggle="tooltip" title="Secure Connection"><i class="fa fa-lock"></i></span>
+                                    % else:
+                                    <span data-toggle="tooltip" title="Insecure Connection"><i class="fa fa-unlock"></i></span>
+                                    % endif
+                                    % endif
                                     <span id="location-${sk}">${data['location'].upper()}</span>:
                                     % if data['ip_address'] != 'N/A':
                                     <span class="ip-container"><span class="ip-address">${data['ip_address']}</span></span>
-                                        % if data['relay']:
+                                        % if data['relayed']:
                                         <span data-toggle="tooltip" title="Plex Relay"><i class="fa fa-exclamation-circle"></i></span>
                                         % else:
                                         <a href="#" class="external_ip-modal" data-toggle="modal" data-target="#ip-info-modal" data-ip="${data['ip_address']}">
@@ -313,7 +324,7 @@ DOCUMENTATION :: END
                                             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>
+                                    <span id="streaming-brain-${sk}" data-toggle="tooltip" title="Streaming Brain Estimate (Reserved Bandwidth)"><i class="fa fa-info-circle"></i></span>
                                     % elif data['synced_version'] == 1 or data['channel_stream'] == 1:
                                     <span id="stream-bandwidth-${sk}">None</span>
                                     % else:

data/interfaces/default/edit_library.html

@@ -21,6 +21,7 @@ parent_count        Returns the parent item count for the library.
 child_count         Returns the child item count for the library.
 do_notify           Returns bool value for whether to send notifications for the library.
 keep_history        Returns bool value for whether to keep history for the library.
+deleted_section     Returns bool value for whether the library is marked as deleted.
 
 DOCUMENTATION :: END
 </%doc>
@@ -59,6 +60,12 @@ DOCUMENTATION :: END
                     <p class="help-block">DANGER ZONE! Click the purge button to remove all history logged for this library. This is permanent!</p>
                 </div>
                 % endif
+                % if data['deleted_section']:
+                <div class="form-group">
+                    <button class="btn btn-bright" id="undelete-library">Undelete</button>
+                    <p class="help-block">Click to re-add the library to the Tautulli libraries list.</p>
+                </div>
+                % endif
             </fieldset>
         </div>
         <div class="modal-footer">
@@ -100,6 +107,12 @@ DOCUMENTATION :: END
         confirmAjaxCall(url, msg, { section_id: '${data["section_id"]}' }, null, function () { location.reload(); });
     });
 
+    $('#undelete-library').click(function () {
+        var msg = 'Are you sure you want to undelete this user?';
+        var url = 'undelete_library';
+        confirmAjaxCall(url, msg, { section_id: '${data["section_id"]}' }, null, function () { location.reload(); });
+    });
+
     $(document).ready(function() {
         // Move #confirm-modal to parent container
         if (!($('#edit-library-modal').next().is('#confirm-modal-purge'))) {

data/interfaces/default/edit_user.html

@@ -21,6 +21,7 @@ is_restricted       Returns bool value for whether the user account is restricte
 do_notify           Returns bool value for whether to send notifications for the user.
 keep_history        Returns bool value for whether to keep history for the user.
 allow_guest         Returns bool value for whether to allow guest access for the user.
+deleted_user        Returns bool value for whether the user is marked as deleted.
 
 DOCUMENTATION :: END
 </%doc>
@@ -74,6 +75,12 @@ DOCUMENTATION :: END
                     <p class="help-block">DANGER ZONE! Click the purge button to remove all history logged for this user. This is permanent!</p>
                 </div>
                 % endif
+                % if data['deleted_user']:
+                <div class="form-group">
+                    <button class="btn btn-bright" id="undelete-user">Undelete</button>
+                    <p class="help-block">Click to re-add the user to the Tautulli users list.</p>
+                </div>
+                % endif
             </fieldset>
         </div>
         <div class="modal-footer">
@@ -122,6 +129,12 @@ DOCUMENTATION :: END
         confirmAjaxCall(url, msg, { user_id: '${data["user_id"]}' }, null, function () { location.reload(); });
     });
 
+    $('#undelete-user').click(function () {
+        var msg = 'Are you sure you want to undelete this user?';
+        var url = 'undelete_user';
+        confirmAjaxCall(url, msg, { user_id: '${data["user_id"]}' }, null, function () { location.reload(); });
+    });
+
     $(document).ready(function() {
         // Move #confirm-modal-purge to parent container
         if (!($('#edit-user-modal').next().is('#confirm-modal-purge'))) {

data/interfaces/default/graphs.html

@@ -21,137 +21,109 @@
                 </label>
             </div>
             <div class="btn-group" style="margin-right: 2px;" data-toggle="buttons" id="yaxis-selection">
-                % if config['graph_type'] == 'duration':
                 <label class="btn btn-dark">
-                    <input type="radio" name="yaxis-options" id="yaxis-count" value="plays" autocomplete="off"> Play Count
-                </label>
-                <label class="btn btn-dark active">
-                    <input type="radio" name="yaxis-options" id="yaxis-duration" value="duration" autocomplete="off" checked> Play Duration
-                </label>
-                % else:
-                <label class="btn btn-dark active">
-                    <input type="radio" name="yaxis-options" id="yaxis-count" value="plays" autocomplete="off" checked> Play Count
+                    <input type="radio" name="yaxis-options" id="yaxis-plays" value="plays" autocomplete="off"> Play Count
                 </label>
                 <label class="btn btn-dark">
                     <input type="radio" name="yaxis-options" id="yaxis-duration" value="duration" autocomplete="off"> Play Duration
                 </label>
-                % endif
             </div>
             <div class="input-group pull-right" style="width: 1px;" id="days-selection">
                 <span class="input-group-addon btn-dark inactive">Last</span>
-                <input type="number" class="form-control number-input" name="graph-days" id="graph-days" value="${config['graph_days']}" min="1" data-default="7" data-toggle="tooltip" title="Min: 1 day" />
+                <input type="number" class="form-control number-input" name="graph-days" id="graph-days" value="30" min="1" data-default="7" data-toggle="tooltip" title="Min: 1 day" />
                 <span class="input-group-addon btn-dark inactive">days</span>
             </div>
             <div class="input-group pull-right" style="width: 1px;" id="months-selection">
                 <span class="input-group-addon btn-dark inactive">Last</span>
-                <input type="number" class="form-control number-input" name="graph-months" id="graph-months" value="${config['graph_months']}" min="1" data-default="12" data-toggle="tooltip" title="Min: 1 month" />
+                <input type="number" class="form-control number-input" name="graph-months" id="graph-months" value="12" min="1" data-default="12" data-toggle="tooltip" title="Min: 1 month" />
                 <span class="input-group-addon btn-dark inactive">months</span>
 			</div>
         </div>
     </div>
     <div class='table-card-back'>
         <ul class="nav nav-pills" role="tablist" id="graph-tabs">
-            % if config['graph_tab'] == 'tabs-3':
-            <li role="presentation"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by period</a></li>
-            <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" data-toggle="tab" role="tab">Stream Info</a></li>
-            <li role="presentation" class="active"><a href="#tabs-3" aria-controls="tabs-3" data-toggle="tab" role="tab">Play Totals</a></li>
-            % elif config['graph_tab'] == 'tabs-2':
-            <li role="presentation"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by period</a></li>
-            <li role="presentation" class="active"><a href="#tabs-2" aria-controls="tabs-2" data-toggle="tab" role="tab">Stream Info</a></li>
-            <li role="presentation"><a href="#tabs-3" aria-controls="tabs-3" data-toggle="tab" role="tab">Play Totals</a></li>
-            % else:
-            <li role="presentation" class="active"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by period</a></li>
+            <li role="presentation"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by Period</a></li>
             <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" data-toggle="tab" role="tab">Stream Info</a></li>
             <li role="presentation"><a href="#tabs-3" aria-controls="tabs-3" data-toggle="tab" role="tab">Play Totals</a></li>
-            % endif
         </ul>
         <div class="tab-content">
-            % if config['graph_tab'] != 'tabs-2' and config['graph_tab'] != 'tabs-3':
-            <div role="tabpanel" class="tab-pane active" id="tabs-1">
-            % else:
             <div role="tabpanel" class="tab-pane" id="tabs-1">
-            % endif
-                    <div class="row">
-                        <div class="col-md-12">
-                            <h4><i class="fa fa-history"></i> Daily <span class="yaxis-text">Play count</span> <small>Last <span class="days">30</span> days</small></h4>
-                            <p class="help-block">
-                                The total play count or duration of tv, movies, and music played per day. Click a graph point to open up a list of items played for that specific date.
-                            </p>
-                            <div class="graphs-instance">
-                                <div class="watch-chart" id="chart_div_plays_by_day">
-                                    <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...</div>
-                                    <br>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            <h4><i class="fa fa-calendar"></i> <span class="yaxis-text">Play count</span> by day of week <small>Last <span class="days">30</span> days</small></h4>
-                            <p class="help-block">
-                                The combined total of tv, movies, and music played per day of the week.
-                            </p>
-                            <div class="graphs-instance">
-                                <div class="watch-chart" id="chart_div_plays_by_dayofweek" style="float: left;">
-                                    <div class="graphs-load">
-                                        <i class="fa fa-refresh fa-spin"></i> Loading chart...
-                                    </div>
-                                    <br>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <h4><i class="fa fa-clock-o"></i> <span class="yaxis-text">Play count</span> by hour of day <small>Last <span class="days">30</span> days</small></h4>
-                            <p class="help-block">
-                                The combined total of tv, movies, and music played per hour of the day.
-                            </p>
-                            <div class="graphs-instance">
-                                <div class="watch-chart" id="chart_div_plays_by_hourofday">
-                                    <div class="graphs-load">
-                                        <i class="fa fa-refresh fa-spin"></i> Loading chart...
-                                    </div>
-                                    <br>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            <h4><i class="fa fa-television"></i> <span class="yaxis-text">Play count</span> by top 10 platforms <small>Last <span class="days">30</span> days</small></h4>
-                            <p class="help-block">
-                                The combined total of tv, movies, and music played by top 10 most active platforms.
-                            </p>
-                            <div class="graphs-instance">
-                                <div class="watch-chart" id="chart_div_plays_by_platform" style="float: left;">
-                                    <div class="graphs-load">
-                                        <i class="fa fa-refresh fa-spin"></i> Loading chart...
-                                    </div>
-                                    <br>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <h4><i class="fa fa-user"></i> <span class="yaxis-text">Play count</span> by top 10 users <small>Last <span class="days">30</span> days</small></h4>
-                            <p class="help-block">
-                                The combined total of tv, movies, and music played by top 10 most active users.
-                            </p>
-                            <div class="graphs-instance">
-                                <div class="watch-chart" id="chart_div_plays_by_user">
-                                    <div class="graphs-load">
-                                        <i class="fa fa-refresh fa-spin"></i> Loading chart...
-                                    </div>
-                                    <br>
-                                </div>
+                <div class="row">
+                    <div class="col-md-12">
+                        <h4><i class="fa fa-history"></i> Daily <span class="yaxis-text">Play count</span> <small>Last <span class="days">30</span> days</small></h4>
+                        <p class="help-block">
+                            The total play count or duration of tv, movies, and music played per day. Click a graph point to open up a list of items played for that specific date.
+                        </p>
+                        <div class="graphs-instance">
+                            <div class="watch-chart" id="graph_plays_by_day">
+                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...</div>
+                                <br>
                             </div>
                         </div>
                     </div>
                 </div>
-
-            % if config['graph_tab'] == 'tabs-2':
-            <div role="tabpanel" class="tab-pane active" id="tabs-2">
-            % else:
+                <div class="row">
+                    <div class="col-md-6">
+                        <h4><i class="fa fa-calendar"></i> <span class="yaxis-text">Play count</span> by day of week <small>Last <span class="days">30</span> days</small></h4>
+                        <p class="help-block">
+                            The combined total of tv, movies, and music played per day of the week.
+                        </p>
+                        <div class="graphs-instance">
+                            <div class="watch-chart" id="graph_plays_by_dayofweek" style="float: left;">
+                                <div class="graphs-load">
+                                    <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                                </div>
+                                <br>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <h4><i class="fa fa-clock-o"></i> <span class="yaxis-text">Play count</span> by hour of day <small>Last <span class="days">30</span> days</small></h4>
+                        <p class="help-block">
+                            The combined total of tv, movies, and music played per hour of the day.
+                        </p>
+                        <div class="graphs-instance">
+                            <div class="watch-chart" id="graph_plays_by_hourofday">
+                                <div class="graphs-load">
+                                    <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                                </div>
+                                <br>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-6">
+                        <h4><i class="fa fa-television"></i> <span class="yaxis-text">Play count</span> by top 10 platforms <small>Last <span class="days">30</span> days</small></h4>
+                        <p class="help-block">
+                            The combined total of tv, movies, and music played by top 10 most active platforms.
+                        </p>
+                        <div class="graphs-instance">
+                            <div class="watch-chart" id="graph_plays_by_platform" style="float: left;">
+                                <div class="graphs-load">
+                                    <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                                </div>
+                                <br>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <h4><i class="fa fa-user"></i> <span class="yaxis-text">Play count</span> by top 10 users <small>Last <span class="days">30</span> days</small></h4>
+                        <p class="help-block">
+                            The combined total of tv, movies, and music played by top 10 most active users.
+                        </p>
+                        <div class="graphs-instance">
+                            <div class="watch-chart" id="graph_plays_by_user">
+                                <div class="graphs-load">
+                                    <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                                </div>
+                                <br>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div role="tabpanel" class="tab-pane" id="tabs-2">
-            % endif
                 <div class="row">
                     <div class="col-md-12">
                         <h4><i class="fa fa-video-camera"></i> Daily Stream type breakdown <small>Last <span class="days">30</span> days</small></h4>
@@ -159,7 +131,7 @@
                             The total play count or duration of tv, movies, and music by the transcode decision. Click a graph point to open up a list of items played for that specific date.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_stream_type">
+                            <div class="watch-chart" id="graph_plays_by_stream_type">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...</div>
                                 <br>
                             </div>
@@ -173,7 +145,7 @@
                             The combined total of tv and movies by their original resolution (pre-transcoding).
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_source_resolution" style="float: left;">
+                            <div class="watch-chart" id="graph_plays_by_source_resolution" style="float: left;">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
@@ -186,7 +158,7 @@
                             The combined total of tv and movies by their streamed resolution (post-transcoding).
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_stream_resolution">
+                            <div class="watch-chart" id="graph_plays_by_stream_resolution">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
@@ -201,7 +173,7 @@
                             The combined total of tv, movies, and music by platform and stream type.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_platform_by_stream_type" style="float: left;">
+                            <div class="watch-chart" id="graph_plays_by_platform_by_stream_type" style="float: left;">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
@@ -214,7 +186,7 @@
                             The combined total of tv, movies, and music by user and stream type.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_user_by_stream_type" style="float: left;">
+                            <div class="watch-chart" id="graph_plays_by_user_by_stream_type" style="float: left;">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
@@ -223,12 +195,7 @@
                     </div>
                 </div>
             </div>
-
-            % if config['graph_tab'] == 'tabs-3':
-            <div role="tabpanel" class="tab-pane active" id="tabs-3">
-            % else:
             <div role="tabpanel" class="tab-pane" id="tabs-3">
-            % endif
                 <div class="row">
                     <div class="col-md-12">
                         <h4><i class="fa fa-calendar"></i> Plays by month <small>Last <span class="months">12</span> months</small></h4>
@@ -236,7 +203,7 @@
                             The combined total of tv, movies, and music by month.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_month">
+                            <div class="watch-chart" id="graph_plays_by_month">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
@@ -266,7 +233,7 @@
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
 
 <script>
-    var selected_user_id = null
+    var selected_user_id = null;
 
     // Modal popup dialog
     function selectHandler(selectedDate, selectedSeries) {
@@ -311,27 +278,61 @@
           console.log("Failed to retrieve history modal data.");
         }
     }
+
+    function getGraphVisibility(chart_name, data_series) {
+        var chart_key = 'HighCharts_' + chart_name;
+        var chart_visibility = JSON.parse(getLocalStorage(chart_key, null)) || [];
+
+        chart_visibility = chart_visibility.reduce(function(obj, s) {
+            obj[s.name] = s.visible;
+            return obj;
+        }, {});
+
+        return data_series.map(function(s) {
+            var obj = Object.assign({}, s);
+            obj.visible = (chart_visibility[s.name] !== false);
+            return obj
+        });
+    }
+
+    function setGraphVisibility(chart_name, data_series, series_name) {
+        var chart_key = 'HighCharts_' + chart_name;
+
+        var chart_visibility = data_series.map(function(s) {
+            return {name: s.name, visible: (s.name === series_name) ? !s.visible : s.visible}
+        });
+
+        setLocalStorage(chart_key, JSON.stringify(chart_visibility));
+    }
 </script>
-<script src="${http_root}js/graphs/plays_by_day.js"></script>
-<script src="${http_root}js/graphs/plays_by_dayofweek.js"></script>
-<script src="${http_root}js/graphs/plays_by_hourofday.js"></script>
-<script src="${http_root}js/graphs/plays_by_platform.js"></script>
-<script src="${http_root}js/graphs/plays_by_user.js"></script>
-<script src="${http_root}js/graphs/plays_by_stream_type.js"></script>
-<script src="${http_root}js/graphs/plays_by_source_resolution.js"></script>
-<script src="${http_root}js/graphs/plays_by_stream_resolution.js"></script>
-<script src="${http_root}js/graphs/plays_by_platform_by_stream_type.js"></script>
-<script src="${http_root}js/graphs/plays_by_user_by_stream_type.js"></script>
-<script src="${http_root}js/graphs/plays_by_month.js"></script>
+<script src="${http_root}js/graphs/plays_by_day.js${cache_param}"></script>
+<script src="${http_root}js/graphs/plays_by_dayofweek.js${cache_param}"></script>
+<script src="${http_root}js/graphs/plays_by_hourofday.js${cache_param}"></script>
+<script src="${http_root}js/graphs/plays_by_platform.js${cache_param}"></script>
+<script src="${http_root}js/graphs/plays_by_user.js${cache_param}"></script>
+<script src="${http_root}js/graphs/plays_by_stream_type.js${cache_param}"></script>
+<script src="${http_root}js/graphs/plays_by_source_resolution.js${cache_param}"></script>
+<script src="${http_root}js/graphs/plays_by_stream_resolution.js${cache_param}"></script>
+<script src="${http_root}js/graphs/plays_by_platform_by_stream_type.js${cache_param}"></script>
+<script src="${http_root}js/graphs/plays_by_user_by_stream_type.js${cache_param}"></script>
+<script src="${http_root}js/graphs/plays_by_month.js${cache_param}"></script>
 <script>
     $(document).ready(function () {
 
-        // Initial values for graph from config
-        var yaxis = "${config['graph_type']}";
-        var current_day_range = ${config['graph_days']};
-        var current_month_range = ${config['graph_months']};
-        var current_tab = "${'#' + config['graph_tab']}";
-        
+        // Initial values for graph from local storage
+        var yaxis = getLocalStorage('graph_type', 'plays');
+        var current_day_range = getLocalStorage('graph_days', 30);
+        var current_month_range = getLocalStorage('graph_months', 12);
+        var current_tab = '#' + getLocalStorage('graph_tab', 'tabs-1');
+
+        $('#yaxis-' + yaxis).prop('checked', true);
+        $('#yaxis-' + yaxis).closest('label').addClass('active');
+        $('#graph-days').val(current_day_range);
+        $('#graph-months').val(current_month_range);
+        $('#graph-tabs a[href="' + current_tab + '"]').closest('li').addClass('active');
+        $(current_tab).addClass('active');
+
+
         $('.days').html(current_day_range);
         $('.months').html(current_month_range);
         
@@ -352,9 +353,6 @@
             }
         });
 
-
-        var music_visible = (${config['music_logging_enable']} == 1 ? true : false);
-        
         function dataSecondsToHours(data) {
             $.each(data.series, function (i, series) {
                 series.data = $.map(series.data, function (value) {
@@ -379,8 +377,8 @@
                     $.each(data.categories, function (i, day) {
                         dateArray.push(moment(day, 'YYYY-MM-DD').valueOf());
                         // Highlight the weekend
-                        if ((moment(day, 'YYYY-MM-DD').format('ddd') == 'Sat') ||
-                            (moment(day, 'YYYY-MM-DD').format('ddd') == 'Sun')) {
+                        if ((moment(day, 'YYYY-MM-DD').format('ddd') === 'Sat') ||
+                            (moment(day, 'YYYY-MM-DD').format('ddd') === 'Sun')) {
                             hc_plays_by_day_options.xAxis.plotBands.push({
                                 from: i-0.5,
                                 to: i+0.5,
@@ -391,8 +389,7 @@
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_day_options.yAxis.min = 0;
                     hc_plays_by_day_options.xAxis.categories = dateArray;
-                    hc_plays_by_day_options.series = data.series;
-                    hc_plays_by_day_options.series[2].visible = music_visible;
+                    hc_plays_by_day_options.series = getGraphVisibility(hc_plays_by_day_options.chart.renderTo, data.series);
                     var hc_plays_by_day = new Highcharts.Chart(hc_plays_by_day_options);
                 }
             });
@@ -405,8 +402,7 @@
                 success: function(data) {
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_dayofweek_options.xAxis.categories = data.categories;
-                    hc_plays_by_dayofweek_options.series = data.series;
-                    hc_plays_by_dayofweek_options.series[2].visible = music_visible;
+                    hc_plays_by_dayofweek_options.series = getGraphVisibility(hc_plays_by_dayofweek_options.chart.renderTo, data.series);
                     var hc_plays_by_dayofweek = new Highcharts.Chart(hc_plays_by_dayofweek_options);
                 }
             });
@@ -419,8 +415,7 @@
                 success: function(data) {
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_hourofday_options.xAxis.categories = data.categories;
-                    hc_plays_by_hourofday_options.series = data.series;
-                    hc_plays_by_hourofday_options.series[2].visible = music_visible;
+                    hc_plays_by_hourofday_options.series = getGraphVisibility(hc_plays_by_hourofday_options.chart.renderTo, data.series);
                     var hc_plays_by_hourofday = new Highcharts.Chart(hc_plays_by_hourofday_options);
                 }
             });
@@ -433,8 +428,7 @@
                 success: function(data) {
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_platform_options.xAxis.categories = data.categories;
-                    hc_plays_by_platform_options.series = data.series;
-                    hc_plays_by_platform_options.series[2].visible = music_visible;
+                    hc_plays_by_platform_options.series = getGraphVisibility(hc_plays_by_platform_options.chart.renderTo, data.series);
                     var hc_plays_by_platform = new Highcharts.Chart(hc_plays_by_platform_options);
                 }
             });
@@ -447,11 +441,12 @@
                 success: function(data) {
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_user_options.xAxis.categories = data.categories;
-                    hc_plays_by_user_options.series = data.series;
-                    hc_plays_by_user_options.series[2].visible = music_visible;
+                    hc_plays_by_user_options.series = getGraphVisibility(hc_plays_by_user_options.chart.renderTo, data.series);
                     var hc_plays_by_user = new Highcharts.Chart(hc_plays_by_user_options);
                 }
             });
+
+            $('#graph-tabs a[href="#tabs-1"]').tab('show')
         }
 
         function loadGraphsTab2(time_range, yaxis) {
@@ -482,7 +477,7 @@
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_stream_type_options.yAxis.min = 0;
                     hc_plays_by_stream_type_options.xAxis.categories = dateArray;
-                    hc_plays_by_stream_type_options.series = data.series;
+                    hc_plays_by_stream_type_options.series = getGraphVisibility(hc_plays_by_stream_type_options.chart.renderTo, data.series);
                     var hc_plays_by_stream_type = new Highcharts.Chart(hc_plays_by_stream_type_options);
                 }
             });
@@ -495,7 +490,7 @@
                 success: function(data) {
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_source_resolution_options.xAxis.categories = data.categories;
-                    hc_plays_by_source_resolution_options.series = data.series;
+                    hc_plays_by_source_resolution_options.series = getGraphVisibility(hc_plays_by_source_resolution_options.chart.renderTo, data.series);
                     var hc_plays_by_source_resolution = new Highcharts.Chart(hc_plays_by_source_resolution_options);
                 }
             });
@@ -508,7 +503,7 @@
                 success: function(data) {
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_stream_resolution_options.xAxis.categories = data.categories;
-                    hc_plays_by_stream_resolution_options.series = data.series;
+                    hc_plays_by_stream_resolution_options.series = getGraphVisibility(hc_plays_by_stream_resolution_options.chart.renderTo, data.series);
                     var hc_plays_by_stream_resolution = new Highcharts.Chart(hc_plays_by_stream_resolution_options);
                 }
             });
@@ -521,7 +516,7 @@
                 success: function(data) {
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_platform_by_stream_type_options.xAxis.categories = data.categories;
-                    hc_plays_by_platform_by_stream_type_options.series = data.series;
+                    hc_plays_by_platform_by_stream_type_options.series = getGraphVisibility(hc_plays_by_platform_by_stream_type_options.chart.renderTo, data.series);
                     var hc_plays_by_platform_by_stream_type = new Highcharts.Chart(hc_plays_by_platform_by_stream_type_options);
                 }
             });
@@ -534,10 +529,12 @@
                 success: function(data) {
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_user_by_stream_type_options.xAxis.categories = data.categories;
-                    hc_plays_by_user_by_stream_type_options.series = data.series;
+                    hc_plays_by_user_by_stream_type_options.series = getGraphVisibility(hc_plays_by_user_by_stream_type_options.chart.renderTo, data.series);
                     var hc_plays_by_user_by_stream_type = new Highcharts.Chart(hc_plays_by_user_by_stream_type_options);
                 }
             });
+
+            $('#graph-tabs a[href="#tabs-2"]').tab('show')
         }
 
         function loadGraphsTab3(time_range, yaxis) {
@@ -555,51 +552,52 @@
                     if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_month_options.yAxis.min = 0;
                     hc_plays_by_month_options.xAxis.categories = data.categories;
-                    hc_plays_by_month_options.series = data.series;
-                    hc_plays_by_month_options.series[2].visible = music_visible;
+                    hc_plays_by_month_options.series = getGraphVisibility(hc_plays_by_month_options.chart.renderTo, data.series);
                     var hc_plays_by_month = new Highcharts.Chart(hc_plays_by_month_options);
                 }
             });
+
+            $('#graph-tabs a[href="#tabs-3"]').tab('show')
         }
 
         // Set initial state
-        if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-        if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
-        if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+        if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+        if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+        if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
 
         // Tab1 opened
         $('#graph-tabs a[href="#tabs-1"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
+            setLocalStorage('graph_tab', current_tab.replace('#',''));
             loadGraphsTab1(current_day_range, yaxis);
-            $.post('set_graph_config', { graph_tab: current_tab.replace('#','') });
-        })
+        });
 
         // Tab2 opened
         $('#graph-tabs a[href="#tabs-2"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
+            setLocalStorage('graph_tab', current_tab.replace('#',''));
             loadGraphsTab2(current_day_range, yaxis);
-            $.post('set_graph_config', { graph_tab: current_tab.replace('#','') });
-        })
+        });
 
         // Tab3 opened
         $('#graph-tabs a[href="#tabs-3"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
+            setLocalStorage('graph_tab', current_tab.replace('#',''));
             loadGraphsTab3(current_month_range, yaxis);
-            $.post('set_graph_config', { graph_tab: current_tab.replace('#','') });
-        })
+        });
 
         // Date range changed
         $('#graph-days').tooltip({ container: 'body', placement: 'top', html: true });
         $('#graph-days').on('change', function() {
             forceMinMax($(this));
             current_day_range = $(this).val();
-            if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+            setLocalStorage('graph_days', current_day_range);
+            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
             $('.days').html(current_day_range);
-            $.post('set_graph_config', { graph_days: current_day_range });
         });
         
         // Month range changed
@@ -607,26 +605,26 @@
         $('#graph-months').on('change', function() {
             forceMinMax($(this));
             current_month_range = $(this).val();
-            if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+            setLocalStorage('graph_months', current_month_range);
+            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
             $('.months').html(current_month_range);
-            $.post('set_graph_config', { graph_months: current_month_range });
         });
 
         // User changed
         $('#graph-user').on('change', function() {
             selected_user_id = $(this).val() || null;
-            if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
-            if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
         });
         
         // Y-axis changed
         $('#yaxis-selection').on('change', function() {
             yaxis = $('input[name=yaxis-options]:checked', '#yaxis-selection').val();
-            if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
-            if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
-            $.post('set_graph_config', { graph_type: yaxis });
+            setLocalStorage('graph_type', yaxis);
+            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
         });
 
         function setGraphFormat(type) {

data/interfaces/default/history.html

@@ -32,17 +32,17 @@
             </div>
             % endif
             <div class="btn-group" data-toggle="buttons" id="media_type-selection">
-                <label class="btn btn-dark active">
-                    <input type="radio" name="media_type-filter" id="history-all" value="" autocomplete="off"> All
+                <label class="btn btn-dark">
+                    <input type="radio" name="media_type-filter" id="history-all" value="all" autocomplete="off"> All
                 </label>
                 <label class="btn btn-dark">
-                    <input type="radio" name="media_type-filter" id="history-movies" value="movie" autocomplete="off"> Movies
+                    <input type="radio" name="media_type-filter" id="history-movie" value="movie" autocomplete="off"> Movies
                 </label>
                 <label class="btn btn-dark">
-                    <input type="radio" name="media_type-filter" id="history-tv_shows" value="episode" autocomplete="off"> TV Shows
+                    <input type="radio" name="media_type-filter" id="history-episode" value="episode" autocomplete="off"> TV Shows
                 </label>
                 <label class="btn btn-dark">
-                    <input type="radio" name="media_type-filter" id="history-music" value="track" autocomplete="off"> Music
+                    <input type="radio" name="media_type-filter" id="history-track" value="track" autocomplete="off"> Music
                 </label>
             </div>
             <div class="btn-group">
@@ -154,6 +154,7 @@
                 selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
                 $(selected_filter).closest('label').addClass('active');
                 media_type = $(selected_filter).val();
+                setLocalStorage('history_media_type', media_type);
                 history_table.draw();
             });
 
@@ -163,8 +164,12 @@
             });
         }
 
-        var media_type = null;
+        var media_type = getLocalStorage('history_media_type', 'all');
         var selected_user_id = "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}";
+
+        $('#history-' + media_type).prop('checked', true);
+        $('#history-' + media_type).closest('label').addClass('active');
+
         loadHistoryTable(media_type, selected_user_id);
 
         % if _session['user_group'] == 'admin':

data/interfaces/default/history_table_modal.html

@@ -54,7 +54,7 @@
                     json_data: JSON.stringify(d),
                     user_id: "${data['user_id']}",
                     start_date: "${data['start_date']}",
-                    media_type: "${data.get('media_type')}",
+                    media_type: "${data.get('media_type') or 'all'}",
                     transcode_decision: "${data.get('transcode_decision')}"
                 };
             }

data/interfaces/default/index.html

@@ -15,9 +15,9 @@
                 <h3><span id="sessions-xml">Activity</span> &nbsp;&nbsp;
                     <small>
                         <span id="currentActivityHeader" style="display: none;">
-                            Streams: <span id="currentActivityHeader-streams"></span> |
+                            Sessions: <span id="currentActivityHeader-streams"></span> |
                             Bandwidth: <span id="currentActivityHeader-bandwidth"></span>
-                            <span id="currentActivityHeader-bandwidth-tooltip" data-toggle="tooltip" title="Streaming Brain Estimate (Required Bandwidth)"><i class="fa fa-info-circle"></i></span>
+                            <span id="currentActivityHeader-bandwidth-tooltip" data-toggle="tooltip" title="Streaming Brain Estimate (Reserved Bandwidth)"><i class="fa fa-info-circle"></i></span>
                         </span>
                     </small>
                 </h3>
@@ -27,6 +27,8 @@
                 <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i> Checking for activity...</div>
                 % elif config['pms_is_cloud']:
                 <div id="dashboard-no-activity" class="text-muted">Plex Cloud server is sleeping.</div>
+                % elif not config['first_run_complete']:
+                <div id="dashboard-no-activity" class="text-muted">The Tautulli setup wizard has not been completed. Please click <a href="welcome">here</a> to go to the setup wizard.</div>
                 % else:
                 <div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.
                     % if _session['user_group'] == 'admin':
@@ -44,25 +46,16 @@
                 <h3 class="pull-left">Watch Statistics</h3>
                 <div class="button-bar">
                     <div class="btn-group pull-left" data-toggle="buttons" id="watch-stats-toggles" style="margin-right: 3px">
-                        % if config['home_stats_type'] == 0:
-                        <label class="btn btn-dark active">
-                            <input type="radio" class="watched-stats-toggle" name="watched-stats-type" id="watched-stats-plays" value="0" autocomplete="off" checked> Play Count
+                        <label class="btn btn-dark">
+                            <input type="radio" class="watched-stats-toggle" name="watched-stats-type" id="watched-stats-plays" value="plays" autocomplete="off"> Play Count
                         </label>
                         <label class="btn btn-dark">
-                            <input type="radio" class="watched-stats-toggle" name="watched-stats-type" id="watched-stats-duration" value="1" autocomplete="off"> Play Duration
+                            <input type="radio" class="watched-stats-toggle" name="watched-stats-type" id="watched-stats-duration" value="duration" autocomplete="off"> Play Duration
                         </label>
-                        % else:
-                        <label class="btn btn-dark">
-                            <input type="radio" class="watched-stats-toggle" name="watched-stats-type" id="watched-stats-plays" value="0" autocomplete="off"> Play Count
-                        </label>
-                        <label class="btn btn-dark active">
-                            <input type="radio" class="watched-stats-toggle" name="watched-stats-type" id="watched-stats-duration" value="1" autocomplete="off" checked> Play Duration
-                        </label>
-                        % endif
                     </div>
                     <div class="input-group pull-left" style="width: 1px; margin-right: 3px" id="watched-stats-days-selection">
                         <span class="input-group-addon btn-dark inactive">Last</span>
-                        <input type="number" class="form-control number-input" name="watched-stats-days" id="watched-stats-days" value="${config['home_stats_length']}" min="1" data-default="30" data-toggle="tooltip" title="Min: 1 day" />
+                        <input type="number" class="form-control number-input" name="watched-stats-days" id="watched-stats-days" value="30" min="1" data-default="30" data-toggle="tooltip" title="Min: 1 day" />
                         <span class="input-group-addon btn-dark inactive">days</span>
                     </div>
                 </div>
@@ -111,8 +104,8 @@
                 </ul>
                 <div class="button-bar">
                     <div class="btn-group pull-left" data-toggle="buttons" id="recently-added-toggles" style="margin-right: 3px">
-                        <label class="btn btn-dark active" id="recently-added-label-all">
-                            <input type="radio" name="recently-added-toggle" id="recently-added-toggle-all" value="" autocomplete="off"> All
+                        <label class="btn btn-dark" id="recently-added-label-all">
+                            <input type="radio" name="recently-added-toggle" id="recently-added-toggle-all" value="all" autocomplete="off"> All
                         </label>
                         <label class="btn btn-dark" id="recently-added-label-movies">
                             <input type="radio" name="recently-added-toggle" id="recently-added-toggle-movie" value="movie" autocomplete="off"> Movies
@@ -121,11 +114,14 @@
                             <input type="radio" name="recently-added-toggle" id="recently-added-toggle-show" value="show" autocomplete="off"> TV Shows
                         </label>
                         <label class="btn btn-dark" id="recently-added-label-music">
-                            <input type="radio" name="recently-added-toggle" id="recently-added-toggle-music" value="artist" autocomplete="off"> Music
+                            <input type="radio" name="recently-added-toggle" id="recently-added-toggle-artist" value="artist" autocomplete="off"> Music
+                        </label>
+                        <label class="btn btn-dark" id="recently-added-label-other_video">
+                            <input type="radio" name="recently-added-toggle" id="recently-added-toggle-other_video" value="other_video" autocomplete="off"> Videos
                         </label>
                     </div>
                     <div class="input-group pull-left" style="width: 1px;" id="recently-added-count-selection">
-                        <input type="number" class="form-control number-input" name="recently-added-count" id="recently-added-count" value="${config['home_stats_recently_added_count']}" min="1" max="50" data-default="50" data-toggle="tooltip" title="Min: 1 item<br>Max: 50 items" />
+                        <input type="number" class="form-control number-input" name="recently-added-count" id="recently-added-count" value="50" min="1" max="50" data-default="50" data-toggle="tooltip" title="Min: 1 item<br>Max: 50 items" />
                         <span class="input-group-addon btn-dark inactive">items</span>
                     </div>
                 </div>
@@ -724,20 +720,25 @@
         });
     }
 
-    var time_range = $('#watched-stats-days').val();
-    var stats_type = $('input[name=watched-stats-type]:checked', '#watch-stats-toggles').val();
+    var stats_type = getLocalStorage('home_stats_type', 'plays');
+    var time_range = getLocalStorage('home_stats_days', 30);
+
+    $('#watched-stats-' + stats_type).prop('checked', true);
+    $('#watched-stats-' + stats_type).closest('label').addClass('active');
+    $('#watched-stats-days').val(time_range);
+
     getHomeStats(time_range, stats_type);
 
     $('input[name=watched-stats-type]').change(function () {
         stats_type = $(this).filter(':checked').val();
+        setLocalStorage('home_stats_type', stats_type);
         getHomeStats(time_range, stats_type);
-        $.post('set_home_stats_config', { stats_type: stats_type });
     });
     $('#watched-stats-days').change(function () {
         forceMinMax($(this));
         time_range = $(this).val();
+        setLocalStorage('home_stats_days', time_range);
         getHomeStats(time_range, stats_type);
-        $.post('set_home_stats_config', { time_range: time_range });
     });
 
     $('#watched-stats-days').tooltip({ container: 'body', placement: 'top', html: true });
@@ -771,7 +772,7 @@
             async: true,
             data: {
                 count: recently_added_count,
-                type: recently_added_type 
+                media_type: recently_added_type
             },
             complete: function (xhr, status) {
                 $("#recentlyAdded").html(xhr.responseText);
@@ -780,8 +781,14 @@
             }
         });
     }
-    var recently_added_count = $('#recently-added-count').val();
-    var recently_added_type = '';
+
+    var recently_added_count = getLocalStorage('home_stats_recently_added_count', 50);
+    var recently_added_type = getLocalStorage('home_stats_recently_added_type', 'all');;
+
+    $('#recently-added-toggle-' + recently_added_type).prop('checked', true);
+    $('#recently-added-toggle-' + recently_added_type).closest('label').addClass('active');
+    $('#recently-added-count').val(recently_added_count);
+
     recentlyAdded(recently_added_count, recently_added_type);
 
     function highlightAddedScrollerButton() {
@@ -835,6 +842,7 @@
         $(selected_filter).closest('label').addClass('active');
         recently_added_type = $(selected_filter).val();
         resetScroller();
+        setLocalStorage('home_stats_recently_added_type', recently_added_type);
         recentlyAdded(recently_added_count, recently_added_type);
     });
 
@@ -842,8 +850,8 @@
         forceMinMax($(this));
         recently_added_count = $(this).val();
         resetScroller();
+        setLocalStorage('home_stats_recently_added_count', recently_added_count);
         recentlyAdded(recently_added_count, recently_added_type);
-        $.post('set_home_stats_config', { recently_added_count: recently_added_count });
     });
 
     $('#recently-added-count').tooltip({ container: 'body', placement: 'top', html: true });

data/interfaces/default/info_search_results_list.html

@@ -190,12 +190,12 @@ DOCUMENTATION :: END
         <li>
             <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face cover-item style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300&fallback=cover);"></div>
+                    <div class="item-children-poster-face cover-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300&fallback=cover);"></div>
                     % if _session['user_group'] == 'admin':
                     <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                     % endif
                 </div>
-                <div class="item-children-instance-text-wrapper album-item">
+                <div class="item-children-instance-text-wrapper cover-item">
                     <h3 title="${child['title']}">${child['title']}</h3>
                 </div>
             </a>
@@ -219,7 +219,7 @@ DOCUMENTATION :: END
                     <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                     % endif
                 </div>
-                <div class="item-children-instance-text-wrapper album-item">
+                <div class="item-children-instance-text-wrapper cover-item">
                     <h3 title="${child['parent_title']}">${child['parent_title']}</h3>
                     <h3 title="${child['title']}">${child['title']}</h3>
                 </div>
@@ -246,11 +246,11 @@ DOCUMENTATION :: END
                             </div>
                         </div>
                     </div>
+                    % if _session['user_group'] == 'admin':
+                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
+                    % endif
                 </div>
-                % if _session['user_group'] == 'admin':
-                <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                % endif
-                <div class="item-children-instance-text-wrapper album-item">
+                <div class="item-children-instance-text-wrapper cover-item">
                     <h3 title="${child['original_title'] or child['grandparent_title']}">${child['original_title'] or child['grandparent_title']}</h3>
                     <h3 title="${child['title']}">${child['title']}</h3>
                     <h3 title="${child['parent_title']}" class="text-muted">${child['parent_title']}</h3>

data/interfaces/default/js/graphs/plays_by_day.js

@@ -2,7 +2,7 @@ var hc_plays_by_day_options = {
     chart: {
         type: 'line',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_day'
+        renderTo: 'graph_plays_by_day'
     },
     title: {
         text: ''
@@ -32,6 +32,11 @@ var hc_plays_by_day_options = {
                         selectHandler(this.category, this.series.name);
                     }
                 }
+            },
+            events: {
+                legendItemClick: function() {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
             }
         }
     },

data/interfaces/default/js/graphs/plays_by_dayofweek.js

@@ -2,17 +2,11 @@ var hc_plays_by_dayofweek_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_dayofweek'
+        renderTo: 'graph_plays_by_dayofweek'
     },
     title: {
         text: ''
     },
-    plotOptions: {
-            column: {
-                pointPadding: 0.2,
-                borderWidth: 0
-            }
-        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -56,14 +50,21 @@ var hc_plays_by_dayofweek_options = {
     },
     plotOptions: {
         column: {
+            borderWidth: 0,
             stacking: 'normal',
-            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
+        },
+        series: {
+            events: {
+                legendItemClick: function () {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
+            }
         }
     },
     tooltip: {

data/interfaces/default/js/graphs/plays_by_hourofday.js

@@ -2,17 +2,11 @@ var hc_plays_by_hourofday_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_hourofday'
+        renderTo: 'graph_plays_by_hourofday'
     },
     title: {
         text: ''
     },
-    plotOptions: {
-            column: {
-                pointPadding: 0.2,
-                borderWidth: 0
-            }
-        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -56,14 +50,21 @@ var hc_plays_by_hourofday_options = {
     },
     plotOptions: {
         column: {
+            borderWidth: 0,
             stacking: 'normal',
-            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
+        },
+        series: {
+            events: {
+                legendItemClick: function () {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
+            }
         }
     },
     tooltip: {

data/interfaces/default/js/graphs/plays_by_month.js

@@ -2,7 +2,7 @@ var hc_plays_by_month_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_month'
+        renderTo: 'graph_plays_by_month'
     },
     title: {
         text: ''
@@ -50,14 +50,21 @@ var hc_plays_by_month_options = {
     },
     plotOptions: {
         column: {
+            borderWidth: 0,
             stacking: 'normal',
-            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
+        },
+        series: {
+            events: {
+                legendItemClick: function () {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
+            }
         }
     },
     tooltip: {

data/interfaces/default/js/graphs/plays_by_platform.js

@@ -2,17 +2,11 @@ var hc_plays_by_platform_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_platform'
+        renderTo: 'graph_plays_by_platform'
     },
     title: {
         text: ''
     },
-    plotOptions: {
-            column: {
-                pointPadding: 0.2,
-                borderWidth: 0
-            }
-        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -56,14 +50,21 @@ var hc_plays_by_platform_options = {
     },
     plotOptions: {
         column: {
+            borderWidth: 0,
             stacking: 'normal',
-            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
+        },
+        series: {
+            events: {
+                legendItemClick: function () {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
+            }
         }
     },
     tooltip: {

data/interfaces/default/js/graphs/plays_by_platform_by_stream_type.js

@@ -2,17 +2,11 @@ var hc_plays_by_platform_by_stream_type_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_platform_by_stream_type'
+        renderTo: 'graph_plays_by_platform_by_stream_type'
     },
     title: {
         text: ''
     },
-    plotOptions: {
-            column: {
-                pointPadding: 0.2,
-                borderWidth: 0
-            }
-        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -56,14 +50,21 @@ var hc_plays_by_platform_by_stream_type_options = {
     },
     plotOptions: {
         column: {
+            borderWidth: 0,
             stacking: 'normal',
-            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
+        },
+        series: {
+            events: {
+                legendItemClick: function () {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
+            }
         }
     },
     tooltip: {

data/interfaces/default/js/graphs/plays_by_source_resolution.js

@@ -2,17 +2,11 @@ var hc_plays_by_source_resolution_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_source_resolution'
+        renderTo: 'graph_plays_by_source_resolution'
     },
     title: {
         text: ''
     },
-    plotOptions: {
-            column: {
-                pointPadding: 0.2,
-                borderWidth: 0
-            }
-        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -56,14 +50,21 @@ var hc_plays_by_source_resolution_options = {
     },
     plotOptions: {
         column: {
+            borderWidth: 0,
             stacking: 'normal',
-            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
+        },
+        series: {
+            events: {
+                legendItemClick: function () {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
+            }
         }
     },
     tooltip: {

data/interfaces/default/js/graphs/plays_by_stream_resolution.js

@@ -2,17 +2,11 @@ var hc_plays_by_stream_resolution_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_stream_resolution'
+        renderTo: 'graph_plays_by_stream_resolution'
     },
     title: {
         text: ''
     },
-    plotOptions: {
-            column: {
-                pointPadding: 0.2,
-                borderWidth: 0
-            }
-        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -56,14 +50,21 @@ var hc_plays_by_stream_resolution_options = {
     },
     plotOptions: {
         column: {
+            borderWidth: 0,
             stacking: 'normal',
-            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
+        },
+        series: {
+            events: {
+                legendItemClick: function () {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
+            }
         }
     },
     tooltip: {

data/interfaces/default/js/graphs/plays_by_stream_type.js

@@ -2,7 +2,7 @@ var hc_plays_by_stream_type_options = {
     chart: {
         type: 'line',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_stream_type'
+        renderTo: 'graph_plays_by_stream_type'
     },
     title: {
         text: ''
@@ -32,6 +32,11 @@ var hc_plays_by_stream_type_options = {
                         selectHandler(this.category, this.series.name);
                     }
                 }
+            },
+            events: {
+                legendItemClick: function() {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
             }
         }
     },

data/interfaces/default/js/graphs/plays_by_user.js

@@ -2,17 +2,11 @@ var hc_plays_by_user_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_user'
+        renderTo: 'graph_plays_by_user'
     },
     title: {
         text: ''
     },
-    plotOptions: {
-            column: {
-                pointPadding: 0.2,
-                borderWidth: 0
-            }
-        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -56,14 +50,21 @@ var hc_plays_by_user_options = {
     },
     plotOptions: {
         column: {
+            borderWidth: 0,
             stacking: 'normal',
-            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
+        },
+        series: {
+            events: {
+                legendItemClick: function () {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
+            }
         }
     },
     tooltip: {

data/interfaces/default/js/graphs/plays_by_user_by_stream_type.js

@@ -2,17 +2,11 @@ var hc_plays_by_user_by_stream_type_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'chart_div_plays_by_user_by_stream_type'
+        renderTo: 'graph_plays_by_user_by_stream_type'
     },
     title: {
         text: ''
     },
-    plotOptions: {
-            column: {
-                pointPadding: 0.2,
-                borderWidth: 0
-            }
-        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -56,14 +50,21 @@ var hc_plays_by_user_by_stream_type_options = {
     },
     plotOptions: {
         column: {
+            borderWidth: 0,
             stacking: 'normal',
-            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
+        },
+        series: {
+            events: {
+                legendItemClick: function () {
+                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
+                }
+            }
         }
     },
     tooltip: {

data/interfaces/default/js/script.js

@@ -1,3 +1,45 @@
+var p = {
+    name: 'Unknown',
+    version: 'Unknown',
+    os: 'Unknown'
+};
+if (typeof platform !== 'undefined') {
+    p.name = platform.name;
+    p.version = platform.version;
+    p.os = platform.os.toString();
+}
+
+if (['IE', 'Microsoft Edge', 'IE Mobile'].indexOf(p.name) > -1) {
+    if (!getCookie('browserDismiss')) {
+        var $browser_warning = $('<div id="browser-warning">' +
+            '<i class="fa fa-exclamation-circle"></i>&nbsp;' +
+            'Tautulli does not support Internet Explorer or Microsoft Edge! ' +
+            'Please use a different browser such as Chrome or Firefox.' +
+            '<button type="button" class="close"><i class="fa fa-remove"></i></button>' +
+            '</div>');
+        $('body').prepend($browser_warning);
+        var offset = $browser_warning.height();
+        warningOffset(offset);
+
+        $browser_warning.one('click', 'button.close', function () {
+            $browser_warning.remove();
+            warningOffset(-offset);
+            setCookie('browserDismiss', 'true', 7);
+        });
+
+        function warningOffset(offset) {
+            var navbar = $('.navbar-fixed-top');
+            if (navbar.length) {
+                navbar.offset({top: navbar.offset().top + offset});
+            }
+            var container = $('.body-container');
+            if (container.length) {
+                container.offset({top: container.offset().top + offset});
+            }
+        }
+    }
+}
+
 function initConfigCheckbox(elem, toggleElem, reverse) {
     toggleElem = (toggleElem === undefined) ? null : toggleElem;
     reverse = (reverse === undefined) ? false : reverse;
@@ -491,26 +533,45 @@ function PopupCenter(url, title, w, h) {
     return newWindow;
 }
 
-if (!localStorage.getItem('Tautulli_ClientId')) {
-    localStorage.setItem('Tautulli_ClientId', uuidv4());
+
+function setLocalStorage(key, value, path) {
+    if (path !== false) {
+        key = key + '_' + window.location.pathname;
+    }
+    localStorage.setItem(key, value);
+}
+function getLocalStorage(key, default_value, path) {
+    if (path !== false) {
+        key = key + '_' + window.location.pathname;
+    }
+    var value = localStorage.getItem(key);
+    if (value !== null) {
+        return value
+    } else if (default_value !== undefined) {
+        setLocalStorage(key, default_value, path);
+        return default_value
+    }
 }
 
 function uuidv4() {
-    return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c =>
-        (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
-    )
+    return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, function(c) {
+        var cryptoObj = window.crypto || window.msCrypto; // for IE 11
+        return (c ^ cryptoObj.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+    });
 }
 
-var x_plex_headers = {
-    'Accept': 'application/json',
-    'X-Plex-Product': 'Tautulli',
-    'X-Plex-Version': 'Plex OAuth',
-    'X-Plex-Client-Identifier': localStorage.getItem('Tautulli_ClientId'),
-    'X-Plex-Platform': platform.name,
-    'X-Plex-Platform-Version': platform.version,
-    'X-Plex-Device': platform.os.toString(),
-    'X-Plex-Device-Name': platform.name
-};
+function getPlexHeaders() {
+    return {
+        'Accept': 'application/json',
+        'X-Plex-Product': 'Tautulli',
+        'X-Plex-Version': 'Plex OAuth',
+        'X-Plex-Client-Identifier': getLocalStorage('Tautulli_ClientID', uuidv4(), false),
+        'X-Plex-Platform': p.name,
+        'X-Plex-Platform-Version': p.version,
+        'X-Plex-Device': p.os,
+        'X-Plex-Device-Name': p.name
+    };
+}
 
 var plex_oauth_window = null;
 const plex_oauth_loader = '<style>' +
@@ -561,6 +622,7 @@ function closePlexOAuthWindow() {
 }
 
 getPlexOAuthPin = function () {
+    var x_plex_headers = getPlexHeaders();
     var deferred = $.Deferred();
 
     $.ajax({
@@ -568,7 +630,6 @@ getPlexOAuthPin = function () {
         type: 'POST',
         headers: x_plex_headers,
         success: function(data) {
-            plex_oauth_window.location = 'https://app.plex.tv/auth/#!?clientID=' + x_plex_headers['X-Plex-Client-Identifier'] + '&code=' + data.code;
             deferred.resolve({pin: data.id, code: data.code});
         },
         error: function() {
@@ -585,48 +646,46 @@ function PlexOAuth(success, error, pre) {
     if (typeof pre === "function") {
         pre()
     }
-    clearTimeout(polling);
     closePlexOAuthWindow();
     plex_oauth_window = PopupCenter('', 'Plex-OAuth', 600, 700);
     $(plex_oauth_window.document.body).html(plex_oauth_loader);
 
     getPlexOAuthPin().then(function (data) {
+        var x_plex_headers = getPlexHeaders();
         const pin = data.pin;
         const code = data.code;
-        var keep_polling = true;
+
+        plex_oauth_window.location = 'https://app.plex.tv/auth/#!?clientID=' + x_plex_headers['X-Plex-Client-Identifier'] + '&code=' + code;
+        polling = pin;
 
         (function poll() {
-            polling = setTimeout(function () {
-                $.ajax({
-                    url: 'https://plex.tv/api/v2/pins/' + pin,
-                    type: 'GET',
-                    headers: x_plex_headers,
-                    success: function (data) {
-                        if (data.authToken){
-                            keep_polling = false;
-                            closePlexOAuthWindow();
-                            if (typeof success === "function") {
-                                success(data.authToken)
-                            }
+            $.ajax({
+                url: 'https://plex.tv/api/v2/pins/' + pin,
+                type: 'GET',
+                headers: x_plex_headers,
+                success: function (data) {
+                    if (data.authToken){
+                        closePlexOAuthWindow();
+                        if (typeof success === "function") {
+                            success(data.authToken)
                         }
-                    },
-                    error: function () {
-                        keep_polling = false;
+                    }
+                },
+                error: function (jqXHR, textStatus, errorThrown) {
+                    if (textStatus !== "timeout") {
                         closePlexOAuthWindow();
                         if (typeof error === "function") {
                             error()
                         }
-                    },
-                    complete: function () {
-                        if (keep_polling){
-                            poll();
-                        } else {
-                            clearTimeout(polling);
-                        }
-                    },
-                    timeout: 1000
-                });
-            }, 1000);
+                    }
+                },
+                complete: function () {
+                    if (!plex_oauth_window.closed && polling === pin){
+                        setTimeout(function() {poll()}, 1000);
+                    }
+                },
+                timeout: 10000
+            });
         })();
     }, function () {
         closePlexOAuthWindow();

data/interfaces/default/login.html

@@ -150,6 +150,7 @@
             token: token,
             remember_me: remember_me
         };
+        var x_plex_headers = getPlexHeaders();
         data = $.extend(data, x_plex_headers);
 
         $.ajax({

data/interfaces/default/mobile_device_config.html

@@ -20,6 +20,24 @@
                                 </div>
                                 <p class="help-block">Optional: Enter a friendly name for this device. Leave blank for default.</p>
                             </div>
+                            <div class="form-group">
+                                <label for="friendly_name">Device Token</label>
+                                <div class="row">
+                                    <div class="col-md-8">
+                                        <input type="text" class="form-control" id="device_token" value="${device['device_token']}" size="30" readonly>
+                                    </div>
+                                </div>
+                                <p class="help-block">Your app device token.</p>
+                            </div>
+                            <div class="form-group">
+                                <label for="friendly_name">OneSignal Device ID</label>
+                                <div class="row">
+                                    <div class="col-md-8">
+                                        <input type="text" class="form-control" id="device_id" value="${device['device_id']}" size="30" readonly>
+                                    </div>
+                                </div>
+                                <p class="help-block">Your OneSignal device ID for notifications.</p>
+                            </div>
                         </div>
                     </div>
                 </form>

data/interfaces/default/notifier_config.html

@@ -148,7 +148,7 @@
                                 <div class="col-md-12">
                                     <label>Notification Triggers</label>
                                     <p class="help-block">
-                                        Select items that will trigger a notification for this ${notifier['agent_label']} notifiation agent.
+                                        Select items that will trigger a notification for this ${notifier['agent_label']} notification agent.
                                     </p>
                                     % for action in available_notification_actions:
                                     <div class="checkbox">

data/interfaces/default/notifier_text_preview.html

@@ -8,7 +8,12 @@
             % if text:
             % for item in text:
             <div style="padding-bottom: 10px;">
-                <h4>${item['media_type'].capitalize()}</h4>
+                <h4>
+                    ${item['media_type'].capitalize()}
+                    % if item['media_type'] != 'server':
+                    <span class="inline-pre">&lt;${item['media_type']}&gt;&lt;/${item['media_type']}&gt;</span> tags
+                    % endif
+                </h4>
                 % if agent != 'webhook':
                 <pre>${item['subject']}</pre>
                 % endif

data/interfaces/default/queue_modal.html

@@ -0,0 +1,66 @@
+<%
+    import arrow
+    from plexpy.activity_handler import ACTIVITY_SCHED, schedule_callback
+
+    if queue == 'active sessions':
+        filter_key = 'session_key-'
+        title_format = '{2} / {1} ({0})'
+        title_key = title_format.format('Session Key', 'Title', 'User')
+        description = 'Queue to flush stuck active sessions to the database.'
+    else:
+        filter_key = 'rating_key-'
+        title_format = '{1} ({0})'
+        title_key = title_format.format('Rating Key', 'Title')
+        description  = 'Queue to flush recently added items to the database and send notifications if enabled.'
+
+    scheduled_jobs = [j.id for j in ACTIVITY_SCHED.get_jobs() if j.id.startswith(filter_key)]
+%>
+<div class="modal-dialog" role="document">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+            <h4 class="modal-title">${queue.title()} Queue</h4>
+        </div>
+        <div class="modal-body">
+            <p class="help-block">
+                ${description}
+            </p>
+            <table class="activity-queue">
+                <thead>
+                    <tr>
+                        <th>
+                            ${title_key}
+                        </th>
+                        <th>
+                            Next Flush In
+                        </th>
+                        <th>
+                            Next Flush Time
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    % if scheduled_jobs:
+                    % for job in scheduled_jobs:
+                    <%
+                        sched_job = ACTIVITY_SCHED.get_job(job)
+                        next_run_in = arrow.get(sched_job.next_run_time).timestamp - arrow.now().timestamp
+                    %>
+                    <tr>
+                        <td><strong>${title_format.format(*sched_job.args)}</strong></td>
+                        <td>${arrow.get(next_run_in).format('HH:mm:ss')}</td>
+                        <td>${arrow.get(sched_job.next_run_time).format('YYYY-MM-DD HH:mm:ss')}</td>
+                    </tr>
+                    % endfor
+                    % else:
+                    <tr>
+                        <td colspan="3" style="text-align: center;"><i class="fa fa-check"></i>&nbsp; Nothing in the ${queue} queue</td>
+                    </tr>
+                    % endif
+                </tbody>
+            </table>
+        </div>
+        <div class="modal-footer">
+        </div>
+    </div>
+</div>

data/interfaces/default/scheduler_table.html

@@ -44,7 +44,13 @@ DOCUMENTATION :: END
         </tr>
         % elif job in ('Check for server response', 'Check for active sessions', 'Check for recently added items') and plexpy.WS_CONNECTED:
         <tr>
+            % if job == 'Check for active sessions':
+            <td><a class="queue-modal-link" href="#" data-queue="active sessions">${job}</a></td>
+            % elif job == 'Check for recently added items':
+            <td><a class="queue-modal-link" href="#" data-queue="recently added">${job}</a></td>
+            % else:
             <td>${job}</td>
+            % endif
             <td><i class="fa fa-sm fa-fw fa-check"></i> Websocket</td>
             <td>N/A</td>
             <td>N/A</td>
@@ -61,4 +67,21 @@ DOCUMENTATION :: END
         % endif
         % endfor
     </tbody>
-</table>
+</table>
+<script>
+    $('.queue-modal-link').on('click', function (e) {
+        e.preventDefault();
+        $.ajax({
+            url: 'get_queue_modal',
+            data: {
+                queue: $(this).data('queue')
+            },
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#queue-modal").html(xhr.responseText);
+                $('#queue-modal').modal();
+            }
+        });
+    });
+</script>

data/interfaces/default/settings.html

@@ -7,6 +7,9 @@
     from plexpy import common, notifiers, newsletters
     from plexpy.helpers import anon_url, checked
 
+    docker_setting = 'disabled' if plexpy.DOCKER else ''
+    docker_msg = '<span class="docker-setting small">(Controlled by Docker Container)</span>' if plexpy.DOCKER else ''
+
     available_notification_agents = sorted(notifiers.available_notification_agents(), key=lambda k: k['label'].lower())
     available_newsletter_agents = sorted(newsletters.available_newsletter_agents(), key=lambda k: k['label'].lower())
 %>
@@ -230,12 +233,12 @@
 
                         % if plexpy.INSTALL_TYPE == 'git':
                         <div class="form-group advanced-setting">
-                            <label for="git_branch">Git Remote / Branch</label>
+                            <label for="git_branch">Git Remote / Branch</label> ${docker_msg | n}
                             <div class="row">
                                 <div class="col-md-6">
                                     <div class="input-group git-group">
-                                        <input type="text" class="form-control" id="git_remote" name="git_remote" value="${config['git_remote']}" data-parsley-trigger="change">
-                                        <select class="form-control" id="git_branch" name="git_branch">
+                                        <input type="text" class="form-control" id="git_remote" name="git_remote" value="${config['git_remote']}" data-parsley-trigger="change" ${docker_setting}>
+                                        <select class="form-control" id="git_branch" name="git_branch" ${docker_setting}>
                                             <% branches = ('master', 'beta', 'nightly') %>
                                             % for branch in branches:
                                             <option value="${branch}" ${'selected' if config['git_branch'] == branch else ''}>${branch}</option>
@@ -245,7 +248,7 @@
                                             % endif
                                         </select>
                                         <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="switch_git_branch">Checkout Branch</button>
+                                            <button class="btn btn-form" type="button" id="switch_git_branch" ${docker_setting}>Checkout Branch</button>
                                         </span>
                                     </div>
                                 </div>
@@ -253,10 +256,10 @@
                             <p class="help-block">The git tracking remote and branch (default "origin/master"). Select to switch the git branch (requires restart).</p>
                         </div>
                         <div class="form-group advanced-setting">
-                            <label for="git_path">Git Path</label>
+                            <label for="git_path">Git Path</label> ${docker_msg | n}
                             <div class="row">
                                 <div class="col-md-4">
-                                    <input type="text" class="form-control" id="git_path" name="git_path" value="${config['git_path']}" size="30">
+                                    <input type="text" class="form-control" id="git_path" name="git_path" value="${config['git_path']}" size="30" ${docker_setting}>
                                 </div>
                             </div>
                             <p class="help-block">Optional: The path to your git environment variable. Leave blank for default.</p>
@@ -445,19 +448,19 @@
                             <p class="help-block">Launch browser pointed to Tautulli on startup.</p>
                         </div>
                         <div class="form-group advanced-setting">
-                            <label for="http_host">HTTP Host</label>
+                            <label for="http_host">HTTP Host</label> ${docker_msg | n}
                             <div class="row">
                                 <div class="col-md-6">
-                                    <input type="text" class="form-control http-settings" id="http_host" name="http_host" value="${config['http_host']}" data-parsley-trigger="change" required>
+                                    <input type="text" class="form-control http-settings" id="http_host" name="http_host" value="${config['http_host']}" data-parsley-trigger="change" required ${docker_setting}>
                                 </div>
                             </div>
                             <p class="help-block">localhost or an IP address to bind the web server to. Default 0.0.0.0 to bind to all interfaces.</p>
                         </div>
                         <div class="form-group">
-                            <label for="http_port">HTTP Port</label>
+                            <label for="http_port">HTTP Port</label> ${docker_msg | n}
                             <div class="row">
                                 <div class="col-md-2">
-                                    <input type="text" class="form-control http-settings" data-parsley-type="integer" id="http_port" name="http_port" value="${config['http_port']}" data-parsley-trigger="change" data-parsley-errors-container="#http_port_error" required>
+                                    <input type="text" class="form-control http-settings" data-parsley-type="integer" id="http_port" name="http_port" value="${config['http_port']}" data-parsley-trigger="change" data-parsley-errors-container="#http_port_error" required ${docker_setting}>
                                 </div>
                                 <div id="http_port_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
@@ -469,7 +472,7 @@
                                 <div class="col-md-8">
                                     <input type="text" class="form-control" id="http_base_url" name="http_base_url" value="${config['http_base_url']}" placeholder="http://mydomain.com" data-parsley-trigger="change" data-parsley-pattern="^https?:\/\/\S+$" data-parsley-errors-container="#http_base_url_error"  data-parsley-error-message="Invalid URL">
                                 </div>
-                                <div id=http_base_url_error" class="alert alert-danger settings-alert" role="alert"></div>
+                                <div id="http_base_url_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
                             <p class="help-block">
                                 Set your public Tautulli domain for self-hosted notification images and newsletters. (e.g. http://mydomain.com)
@@ -887,7 +890,6 @@
                             <h3>Current Activity Notifications</h3>
                         </div>
 
-                        <p class="help-block">Note: Buffer warnings only work on certain Plex clients. Android and Plex Web do not report buffer events accurately or at all.</p>
                         <div class="form-group">
                             <label for="buffer_threshold">Buffer Threshold</label>
                             <div class="row">
@@ -896,7 +898,13 @@
                                 </div>
                                 <div id="buffer_threshold_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
-                            <p class="help-block">How many buffer events should we wait before triggering the first warning. Buffer events increment on each monitor ping if play state is buffering. 0 to disable buffer warnings.</p>
+                            <p class="help-block">
+                                The number of buffer events required before triggering the first notification.
+                                Buffer events increment on each incoming websocket message if the play state is buffering.
+                                <br>
+                                Note: Buffer warnings only work on certain Plex clients. Some clients can send excessive buffer messages or no messages at all.
+                                This notification may be unreliable and not indicative of a real problem.
+                            </p>
                         </div>
                         <div class="form-group advanced-setting">
                             <label for="buffer_wait">Buffer Wait</label>
@@ -1034,10 +1042,10 @@
                             <p class="help-block">Optional: Enter the full path to your custom newsletter templates folder. Leave blank for default.</p>
                         </div>
                         <div class="form-group advanced-setting">
-                            <label for="newsletter_dir">Newsletter Output Directory</label>
+                            <label for="newsletter_dir">Newsletter Output Directory</label> ${docker_msg | n}
                             <div class="row">
                                 <div class="col-md-6">
-                                    <input type="text" class="form-control" id="newsletter_dir" name="newsletter_dir" value="${config['newsletter_dir']}">
+                                    <input type="text" class="form-control" id="newsletter_dir" name="newsletter_dir" value="${config['newsletter_dir']}" ${docker_setting}>
                                 </div>
                             </div>
                             <p class="help-block">Enter the full path to where newsletter files will be saved.</p>
@@ -1233,10 +1241,10 @@
                         </div>
 
                         <div class="form-group">
-                            <label for="log_dir">Log Directory</label>
+                            <label for="log_dir">Log Directory</label> ${docker_msg | n}
                             <div class="row">
                                 <div class="col-md-6">
-                                    <input type="text" class="form-control directory-settings" id="log_dir" name="log_dir" value="${config['log_dir']}">
+                                    <input type="text" class="form-control directory-settings" id="log_dir" name="log_dir" value="${config['log_dir']}" ${docker_setting}>
                                     <div class="btn-group">
                                         <button class="btn btn-form" type="button" id="clear_logs">Clear Logs</button>
                                     </div>
@@ -1244,10 +1252,10 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="backup_dir">Backup Directory</label>
+                            <label for="backup_dir">Backup Directory</label> ${docker_msg | n}
                             <div class="row">
                                 <div class="col-md-6">
-                                    <input type="text" class="form-control directory-settings" id="backup_dir" name="backup_dir" value="${config['backup_dir']}">
+                                    <input type="text" class="form-control directory-settings" id="backup_dir" name="backup_dir" value="${config['backup_dir']}" ${docker_setting}>
                                     <div class="btn-group">
                                         <button class="btn btn-form" type="button" id="backup_config">Backup Config</button>
                                         <button class="btn btn-form" type="button" id="backup_database">Backup Database</button>
@@ -1256,10 +1264,10 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="cache_dir">Cache Directory</label>
+                            <label for="cache_dir">Cache Directory</label> ${docker_msg | n}
                             <div class="row">
                                 <div class="col-md-6">
-                                    <input type="text" class="form-control directory-settings" id="cache_dir" name="cache_dir" value="${config['cache_dir']}">
+                                    <input type="text" class="form-control directory-settings" id="cache_dir" name="cache_dir" value="${config['cache_dir']}" ${docker_setting}>
                                     <div class="btn-group">
                                         <button class="btn btn-form" type="button" id="clear_cache">Clear All Cache</button>
                                         <button class="btn btn-form" type="button" id="clear_image_cache">Clear Image Cache</button>
@@ -1308,6 +1316,7 @@
 </%def>
 
 <%def name="modalIncludes()">
+<div id="queue-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="queue-modal"></div>
 <div id="guidelines-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="guidelines-modal">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
@@ -1523,7 +1532,7 @@
                     <div style="padding-bottom: 10px;">
                         <p class="help-block">
                             All text inside <span class="inline-pre">&lt;show&gt;&lt;/show&gt;</span>/<span class="inline-pre">&lt;season&gt;&lt;/season&gt;</span>/<span class="inline-pre">&lt;episode&gt;&lt;/episode&gt;</span>
-                            tags will only be sent when the media type is show/season/episode.
+                            tags will only be sent when the media type is show, season, or episode, respectively.
                         </p>
                         <p><strong style="color: #fff;">Example:</strong></p>
                         <pre>{show_name}&lt;season&gt; - Season {season_num}&lt;/season&gt;&lt;episode&gt; - S{season_num}E{episode_num} - {episode_name}&lt;/episode&gt; was recently added to Plex.</pre>
@@ -1534,7 +1543,7 @@
                     <div>
                         <p class="help-block">
                             All text inside <span class="inline-pre">&lt;artist&gt;&lt;/artist&gt;</span>/<span class="inline-pre">&lt;album&gt;&lt;/album&gt;</span>/<span class="inline-pre">&lt;track&gt;&lt;/track&gt;</span>
-                            tags will only be sent when the media type is artist/album/track.
+                            tags will only be sent when the media type is artist, album, or track, respectively.
                         </p>
                         <p><strong style="color: #fff;">Example:</strong></p>
                         <pre>{artist_name}&lt;album&gt; - {album_name}&lt;/album&gt;&lt;track&gt; - {album_name} - {track_name}&lt;/track&gt; was recently added to Plex.</pre>
@@ -1579,7 +1588,7 @@
                     <div>
                         <h4>List Slicing</h4>
                     </div>
-                    <div>
+                    <div style="padding-bottom: 10px;">
                         <p class="help-block">
                             Notification parameters which have a list of items can be sliced with a slice formatter <span class="inline-pre">:[X:Y]</span> to limit the number of items.
                             Note: the first item in the list is numbered <span class="inline-pre">0</span>.
@@ -1590,6 +1599,41 @@
 {actors:[2:]}  --> Only the 3rd to last actors (Actors: 2, 3, 4, ...)
 {actors:[1:5]} --> Only the 2nd to 5th actors (Actors: 1, 2, 3, 4)</pre>
                     </div>
+                    <div>
+                        <h4>Prefix and Suffix</h4>
+                    </div>
+                    <div style="padding-bottom: 10px;">
+                        <p class="help-block">
+                            A prefix or a suffix can be added to the notification parameters using <span class="inline-pre">Prefix&lt;</span> and <span class="inline-pre">&gt;Suffix</span>.
+                            If the notification parameter is unavailable, the prefix or suffix will not be displayed.
+                        </p>
+                        <p><strong style="color: #fff;">Example:</strong></p>
+                        <pre>{rating}              --> 8.9
+{Rating: &lt;rating}     --> Rating: 8.9
+{rating&gt;/10}          --> 8.9/10
+{Rating: &lt;rating&gt;/10} --> Rating: 8.9/10</pre>
+                        <p><strong style="color: #fff;">Example with unavailable parameter:</strong></p>
+                        <pre>{rating}              -->
+Rating: {rating}/10   --> Rating: /10
+{Rating: &lt;rating&gt;/10} --> </pre>
+                    </div>
+                    <div>
+                        <h4>Combined</h4>
+                    </div>
+                    <div>
+                        <p class="help-block">
+                            If combining multiple notification text modifiers, the order of the modifiers must be:
+                        </p>
+                        <ol class="help-block">
+                            <li>Prefix</li>
+                            <li>Parameter</li>
+                            <li>Case Modifier</li>
+                            <li>List Slicing</li>
+                            <li>Suffix</li>
+                        </ol>
+                        <p><strong style="color: #fff;">Example:</strong></p>
+                        <pre>{Starring &lt;actors!c:[0]&gt; as the main character.} --> Starring Arnold Schwarzenegger as the main character.</pre>
+                    </div>
                 </div>
             </div>
             <div class="modal-footer">
@@ -1611,7 +1655,7 @@
             <div class="modal-body">
                 <div>
                     <p class="help-block">
-                        If the value for a selected parameter cannot be provided, it will display as blank.
+                        If the value for a selected parameter is unavailable, it will display as blank.
                     </p>
                     % for category in common.NEWSLETTER_PARAMETERS:
                     <table class="notification-params">
@@ -2084,7 +2128,7 @@ $(document).ready(function() {
                 if (!item.label) {
                     $.extend(item,
                         $(this.revertSettings.$children)
-                             .filter('[value=' + item.value + ']').data()
+                             .filter('[value="' + item.value + '"]').data()
                     );
                 }
                 var label = item.label || item.value;
@@ -2292,6 +2336,7 @@ $(document).ready(function() {
         $("#token_verify").html('<i class="fa fa-refresh fa-spin"></i>').fadeIn('fast');
     }
     function OAuthSuccessCallback(authToken) {
+        var x_plex_headers = getPlexHeaders();
         $("#pms_token").val(authToken);
         $("#pms_uuid").val(x_plex_headers['X-Plex-Client-Identifier']);
         $("#token_verify").html('<i class="fa fa-check"></i>').fadeIn('fast');
@@ -2521,8 +2566,10 @@ $(document).ready(function() {
                     .prop('selected', selected));
             }
 
+            var download_url = 'https://plex.tv/api/downloads/' + (plex_update_channel === 'plexpass' ? '5' : '1') + '.json?channel=' + plex_update_channel;
+
             $.ajax({
-                url: 'https://plex.tv/api/downloads/1.json?channel=' + plex_update_channel,
+                url: download_url,
                 type: 'GET',
                 dataType: 'json',
                 beforeSend: function (xhr) {

data/interfaces/default/stream_data.html

@@ -230,7 +230,7 @@ DOCUMENTATION :: END
                 <tbody>
                     <tr>
                         <td>Codec</td>
-                        <td>${data['stream_subtitle_codec'].upper()}</td>
+                        <td>${data['stream_subtitle_codec'].upper() or '-'}</td>
                         <td>${data['subtitle_codec'].upper()}</td>
                     </tr>
                 </tbody>

data/interfaces/default/update_metadata.html

@@ -183,6 +183,7 @@ DOCUMENTATION :: END
             async: true,
             data: {
                 query: query_string,
+                limit: 30,
                 media_type: '${query["media_type"]}',
                 season_index: '${query["parent_media_index"]}'
             },

data/interfaces/default/user.html

@@ -156,17 +156,17 @@ DOCUMENTATION :: END
                                             </div>
                                             % endif
                                             <div class="btn-group" data-toggle="buttons" id="media_type-selection">
-                                                <label class="btn btn-dark active">
-                                                    <input type="radio" name="media_type-filter" id="history-all" value="" autocomplete="off"> All
+                                                <label class="btn btn-dark">
+                                                    <input type="radio" name="media_type-filter" id="history-all" value="all" autocomplete="off"> All
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="media_type-filter" id="history-movies" value="movie" autocomplete="off"> Movies
+                                                    <input type="radio" name="media_type-filter" id="history-movie" value="movie" autocomplete="off"> Movies
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="media_type-filter" id="history-tv_shows" value="episode" autocomplete="off"> TV Shows
+                                                    <input type="radio" name="media_type-filter" id="history-episode" value="episode" autocomplete="off"> TV Shows
                                                 </label>
                                                 <label class="btn btn-dark">
-                                                    <input type="radio" name="media_type-filter" id="history-music" value="track" autocomplete="off"> Music
+                                                    <input type="radio" name="media_type-filter" id="history-track" value="track" autocomplete="off"> Music
                                                 </label>
                                             </div>
                                             <div class="btn-group">
@@ -274,12 +274,12 @@ DOCUMENTATION :: END
                                         <table class="display user_ip_table" id="user_ip_table-UID-${data['user_id']}" width="100%">
                                             <thead>
                                                 <tr>
-                                                    <th align="left">Last Seen</th>
-                                                    <th align="left">IP Address</th>
-                                                    <th align="left">Last Platform</th>
-                                                    <th align="left">Last Player</th>
-                                                    <th align="left">Last Played</th>
-                                                    <th align="left">Play Count</th>
+                                                    <th align="left" id="last_seen">Last Seen</th>
+                                                    <th align="left" id="ip_address">IP Address</th>
+                                                    <th align="left" id="platform">Last Platform</th>
+                                                    <th align="left" id="player">Last Player</th>
+                                                    <th align="left" id="last_played">Last Played</th>
+                                                    <th align="left" id="play_count">Play Count</th>
                                                 </tr>
                                             </thead>
                                         </table>
@@ -435,6 +435,7 @@ DOCUMENTATION :: END
             selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
             $(selected_filter).closest('label').addClass('active');
             media_type = $(selected_filter).val();
+            setLocalStorage('user_' + user_id + '-history_media_type', media_type);
             history_table.draw();
         });
     }
@@ -494,7 +495,9 @@ DOCUMENTATION :: END
 
     $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
         if (typeof(history_table) === 'undefined') {
-            var media_type = null;
+            var media_type = getLocalStorage('user_' + user_id + '-history_media_type', 'all');
+            $('#history-' + media_type).prop('checked', true);
+            $('#history-' + media_type).closest('label').addClass('active');
             loadHistoryTable(media_type);
         }
     });

data/interfaces/default/welcome.html

@@ -90,6 +90,7 @@
                         <div class="row">
                             <div class="col-xs-12">
                                 <select class="form-control pms-settings selectize-pms-ip" id="pms_ip_selectize">
+                                    % if config['pms_identifier']:
                                     <option value="${config['pms_ip']}:${config['pms_port']}"
                                             data-identifier="${config['pms_identifier']}"
                                             data-ip="${config['pms_ip']}"
@@ -99,6 +100,7 @@
                                             data-is_cloud="${config['pms_is_cloud']}"
                                             data-label="${config['pms_name'] or 'Local'}"
                                             selected>${config['pms_ip']}</option>
+                                    % endif
                                 </select>
                             </div>
                         </div>
@@ -336,7 +338,7 @@ $(document).ready(function() {
                 if (!item.label) {
                     $.extend(item,
                         $(this.revertSettings.$children)
-                             .filter('[value=' + item.value + ']').data()
+                             .filter('[value="' + item.value + '"]').data()
                     );
                 }
                 var label = item.label || item.value;

data/interfaces/newsletters/recently_added.html

@@ -368,6 +368,7 @@
             line-height: 1.2rem;
             font-size: 0.9rem;
             padding: 5px;
+            max-width: 320px;
         }
         .card-info-title a {
             text-decoration: none;
@@ -952,6 +953,124 @@
                         </td>
                     </tr>
                     % endif
+                    % if recently_added.get('other_video'):
+                    <tr>
+                        <td class="wrapper" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;box-sizing: border-box;padding: 5px;overflow: auto;">
+                            <div class="sub-header-bar" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;width: 200px;border-top: 1px solid #E5A00D;margin-top: 15px;margin-bottom: 25px;"></div>
+                            <div class="sub-header-title" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;font-weight: lighter;">
+                                <img src="${(base_url_image + 'images/libraries/video.png') if base_url_image else 'https://tautulli.com/images/libraries/video.png'}" class="sub-header-icon" width="30" height="30" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;height: 30px;width: 30px;vertical-align: middle;margin-right: 5px;margin-bottom: 5px;"> Recently Added Videos
+                            </div>
+                            <div class="sub-header-count" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;">
+                                <span class="count" style="color: #E5A00D;">${len(recently_added['other_video'])}</span> <span class="count-units" style="color: #aaaaaa;font-size: 20px;text-transform: uppercase;">video${'s' if len(recently_added['other_video']) > 1 else ''}</span>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
+                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                % for video_a, video_b in grouper(recently_added['other_video'], 2):
+                                <tr>
+                                    <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                            <tr>
+                                                % for video in (video_a, video_b):
+                                                % if video:
+                                                % if not video_b:
+                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
+                                                % endif
+                                                <td align="center" valign="top" class="card-instance movie" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 233px;">
+                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + video['art_hash']) if base_url_image else video['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
+                                                        <tr>
+                                                            <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 227px;">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + video['thumb_hash']) if base_url_image else video['thumb_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
+                                                                    <tr>
+                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" style="text-decoration: underline;">
+                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
+                                                                            </a>
+                                                                        </td>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                            <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 227px;">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
+                                                                    <tr>
+                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${video['title']}</a>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 100%;">
+                                                                            % if video['tagline']:
+                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
+                                                                                <em>${video['tagline']}</em>
+                                                                            </p>
+                                                                            % endif
+                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
+                                                                                ${video['summary'][:450] + (video['summary'][450:] and '...')}
+                                                                            </p>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
+                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                <tr>
+                                                                                    <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 260px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                            <tr>
+                                                                                                % if video['year']:
+                                                                                                <td class="badge" title="${video['year']}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${video['year']}</td>
+                                                                                                % endif
+                                                                                                % if video['duration']:
+                                                                                                <% duration = int(int(video['duration'])/60000) %>
+                                                                                                <td class="badge" title="${duration} mins" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${duration} mins</td>
+                                                                                                % endif
+                                                                                                % if video['genres']:
+                                                                                                % for genre in video['genres'][:]:
+                                                                                                <td class="badge" title="${genre}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</td>
+                                                                                                % endfor
+                                                                                                % endif
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % if video['rating']:
+                                                                                    <% rating = int(round(float(video['rating']) / 2)) %>
+                                                                                    <td class="star-rating-container" title="${int(float(video['rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 65px;">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                            <tr>
+                                                                                                % for _ in range(rating):
+                                                                                                <td class="star-rating full" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</td>
+                                                                                                % endfor
+                                                                                                % for _ in range(5-rating):
+                                                                                                <td class="star-rating empty" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</td>
+                                                                                                % endfor
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % endif
+                                                                                </tr>
+                                                                            </table>
+                                                                        </td>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                                % if not video_b:
+                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
+                                                % endif
+                                                % endif
+                                                % endfor
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                % endfor
+                            </table>
+                        </td>
+                    </tr>
+                    % endif
                     <tr>
                         <td class="footer" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;clear: both;margin-top: 10px;text-align: center;width: 100%;">
                             <div class="footer-bar" style="margin-left: auto;margin-right: auto;width: 200px;border-top: 1px solid #E5A00D;margin-top: 25px;"></div>

data/interfaces/newsletters/recently_added.internal.html

@@ -953,6 +953,124 @@
                         </td>
                     </tr>
                     % endif
+                    % if recently_added.get('other_video'):
+                    <tr>
+                        <td class="wrapper">
+                            <div class="sub-header-bar"></div>
+                            <div class="sub-header-title">
+                                <img src="${(base_url_image + 'images/libraries/video.png') if base_url_image else 'https://tautulli.com/images/libraries/video.png'}" class="sub-header-icon" width="30" height="30"/> Recently Added Videos
+                            </div>
+                            <div class="sub-header-count">
+                                <span class="count">${len(recently_added['other_video'])}</span> <span class="count-units">video${'s' if len(recently_added['other_video']) > 1 else ''}</span>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <table border="0" cellpadding="0" cellspacing="0">
+                                % for video_a, video_b in grouper(recently_added['other_video'], 2):
+                                <tr>
+                                    <td>
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                            <tr>
+                                                % for video in (video_a, video_b):
+                                                % if video:
+                                                % if not video_b:
+                                                <td align="center" valign="top" class="card-instance pad"></td>
+                                                % endif
+                                                <td align="center" valign="top" class="card-instance movie">
+                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + video['art_hash']) if base_url_image else video['art_url']});">
+                                                        <tr>
+                                                            <td class="card-poster-container">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + video['thumb_hash']) if base_url_image else video['thumb_url']})">
+                                                                    <tr>
+                                                                        <td>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank">
+                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
+                                                                            </a>
+                                                                        </td>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                            <td class="card-info-container">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
+                                                                    <tr>
+                                                                        <td class="card-info-title nowrap">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank">${video['title']}</a>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-body">
+                                                                            % if video['tagline']:
+                                                                            <p class="nowrap mb5">
+                                                                                <em>${video['tagline']}</em>
+                                                                            </p>
+                                                                            % endif
+                                                                            <p>
+                                                                                ${video['summary'][:450] + (video['summary'][450:] and '...')}
+                                                                            </p>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-footer nowrap">
+                                                                            <table border="0" cellpadding="0" cellspacing="0">
+                                                                                <tr>
+                                                                                    <td class="badge-container">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0">
+                                                                                            <tr>
+                                                                                                % if video['year']:
+                                                                                                <td class="badge" title="${video['year']}">${video['year']}</td>
+                                                                                                % endif
+                                                                                                % if video['duration']:
+                                                                                                <% duration = int(int(video['duration'])/60000) %>
+                                                                                                <td class="badge" title="${duration} mins">${duration} mins</td>
+                                                                                                % endif
+                                                                                                % if video['genres']:
+                                                                                                % for genre in video['genres'][:]:
+                                                                                                <td class="badge" title="${genre}">${genre}</td>
+                                                                                                % endfor
+                                                                                                % endif
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % if video['rating']:
+                                                                                    <% rating = int(round(float(video['rating']) / 2)) %>
+                                                                                    <td class="star-rating-container" title="${int(float(video['rating'])/0.1)}%" align="right">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0">
+                                                                                            <tr>
+                                                                                                % for _ in range(rating):
+                                                                                                <td class="star-rating full">&#9733;</td>
+                                                                                                % endfor
+                                                                                                % for _ in range(5-rating):
+                                                                                                <td class="star-rating empty">&#9734;</td>
+                                                                                                % endfor
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % endif
+                                                                                </tr>
+                                                                            </table>
+                                                                        </td>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                                % if not video_b:
+                                                <td align="center" valign="top" class="card-instance pad"></td>
+                                                % endif
+                                                % endif
+                                                % endfor
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                % endfor
+                            </table>
+                        </td>
+                    </tr>
+                    % endif
                     <tr>
                         <td class="footer">
                             <div class="footer-bar"></div>

init-scripts/init.systemd

@@ -24,8 +24,11 @@
 #    - The example settings in this file assume that Tautulli is installed to: /opt/Tautulli
 #
 #    - To create this user and give it ownership of the Tautulli directory:
-#       sudo adduser --system --no-create-home tautulli
-#       sudo chown tautulli:tautulli -R /opt/Tautulli
+#       1. Create the user:
+#           Ubuntu/Debian: sudo addgroup tautulli && sudo adduser --system --no-create-home tautulli --ingroup tautulli
+#           CentOS/Fedora: sudo adduser --system --no-create-home tautulli
+#       2. Give the user ownership of the Tautulli directory:
+#           sudo chown tautulli:tautulli -R /opt/Tautulli
 #
 #    - Adjust ExecStart= to point to:
 #       1. Your Tautulli executable
@@ -51,7 +54,11 @@ ExecStart=/opt/Tautulli/Tautulli.py --config /opt/Tautulli/config.ini --datadir
 GuessMainPID=no
 Type=forking
 User=tautulli
-Group=tautlli
+Group=tautulli
+Restart=on-abnormal
+RestartSec=5
+StartLimitInterval=90
+StartLimitBurst=3
 
 [Install]
 WantedBy=multi-user.target

lib/pytz/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2003-2009 Stuart Bishop <stuart@stuartbishop.net>
+Copyright (c) 2003-2018 Stuart Bishop <stuart@stuartbishop.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

lib/pytz/README.txt

@@ -87,13 +87,13 @@ localized time using the standard ``astimezone()`` method:
 Unfortunately using the tzinfo argument of the standard datetime
 constructors ''does not work'' with pytz for many timezones.
 
->>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=amsterdam).strftime(fmt)
+>>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=amsterdam).strftime(fmt)  # /!\ Does not work this way!
 '2002-10-27 12:00:00 LMT+0020'
 
 It is safe for timezones without daylight saving transitions though, such
 as UTC:
 
->>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=pytz.utc).strftime(fmt)
+>>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=pytz.utc).strftime(fmt)  # /!\ Not recommended except for UTC
 '2002-10-27 12:00:00 UTC+0000'
 
 The preferred way of dealing with times is to always work in UTC,
@@ -134,19 +134,21 @@ section for more details)
 >>> dt2.strftime(fmt)
 '2002-10-27 01:30:00 EST-0500'
 
-Converting between timezones also needs special attention. We also need
-to use the ``normalize()`` method to ensure the conversion is correct.
+Converting between timezones is more easily done, using the
+standard astimezone method.
 
 >>> utc_dt = utc.localize(datetime.utcfromtimestamp(1143408899))
 >>> utc_dt.strftime(fmt)
 '2006-03-26 21:34:59 UTC+0000'
 >>> au_tz = timezone('Australia/Sydney')
->>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz))
+>>> au_dt = utc_dt.astimezone(au_tz)
 >>> au_dt.strftime(fmt)
 '2006-03-27 08:34:59 AEDT+1100'
->>> utc_dt2 = utc.normalize(au_dt.astimezone(utc))
+>>> utc_dt2 = au_dt.astimezone(utc)
 >>> utc_dt2.strftime(fmt)
 '2006-03-26 21:34:59 UTC+0000'
+>>> utc_dt == utc_dt2
+True
 
 You can take shortcuts when dealing with the UTC side of timezone
 conversions. ``normalize()`` and ``localize()`` are not really
@@ -178,7 +180,7 @@ parameter to the ``utcoffset()``, ``dst()`` && ``tzname()`` methods.
 >>> ambiguous = datetime(2009, 10, 31, 23, 30)
 
 The ``is_dst`` parameter is ignored for most timestamps. It is only used
-during DST transition ambiguous periods to resulve that ambiguity.
+during DST transition ambiguous periods to resolve that ambiguity.
 
 >>> tz.utcoffset(normal, is_dst=True)
 datetime.timedelta(-1, 77400)
@@ -261,7 +263,7 @@ pytz custom syntax, the best you can do is make an educated guess:
 As you can see, the system has chosen one for you and there is a 50%
 chance of it being out by one hour. For some applications, this does
 not matter. However, if you are trying to schedule meetings with people
-in different timezones or analyze log files it is not acceptable. 
+in different timezones or analyze log files it is not acceptable.
 
 The best and simplest solution is to stick with using UTC.  The pytz
 package encourages using UTC for internal timezone representation by
@@ -472,9 +474,9 @@ True
 True
 >>> 'Canada/Eastern' in common_timezones
 True
->>> 'US/Pacific-New' in all_timezones
+>>> 'Australia/Yancowinna' in all_timezones
 True
->>> 'US/Pacific-New' in common_timezones
+>>> 'Australia/Yancowinna' in common_timezones
 False
 
 Both ``common_timezones`` and ``all_timezones`` are alphabetically
@@ -510,6 +512,15 @@ Europe/Zurich
 Europe/Zurich
 
 
+Internationalization - i18n/l10n
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Pytz is an interface to the IANA database, which uses ASCII names. The `Unicode  Consortium's Unicode Locales (CLDR) <http://cldr.unicode.org>`_
+project provides translations. Thomas Khyn's
+`l18n <https://pypi.org/project/l18n/>`_ package can be used to access
+these translations from Python.
+
+
 License
 ~~~~~~~
 
@@ -527,12 +538,13 @@ Latest Versions
 
 This package will be updated after releases of the Olson timezone
 database.  The latest version can be downloaded from the `Python Package
-Index <http://pypi.python.org/pypi/pytz/>`_.  The code that is used
+Index <https://pypi.org/project/pytz/>`_.  The code that is used
 to generate this distribution is hosted on launchpad.net and available
-using the `Bazaar version control system <http://bazaar-vcs.org>`_
-using::
+using git::
 
-    bzr branch lp:pytz
+    git clone https://git.launchpad.net/pytz
+
+A mirror on github is also available at https://github.com/stub42/pytz
 
 Announcements of new releases are made on
 `Launchpad <https://launchpad.net/pytz>`_, and the
@@ -543,7 +555,7 @@ hosted there.
 Bugs, Feature Requests & Patches
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Bugs can be reported using `Launchpad <https://bugs.launchpad.net/pytz>`_.
+Bugs can be reported using `Launchpad <https://bugs.launchpad.net/pytz>`__.
 
 
 Issues & Limitations

lib/pytz/__init__.py

@@ -8,12 +8,25 @@ See the datetime section of the Python Library Reference for information
 on how to use these modules.
 '''
 
+import sys
+import datetime
+import os.path
+
+from pytz.exceptions import AmbiguousTimeError
+from pytz.exceptions import InvalidTimeError
+from pytz.exceptions import NonExistentTimeError
+from pytz.exceptions import UnknownTimeZoneError
+from pytz.lazy import LazyDict, LazyList, LazySet
+from pytz.tzinfo import unpickler, BaseTzInfo
+from pytz.tzfile import build_tzinfo
+
+
 # The IANA (nee Olson) database is updated several times a year.
-OLSON_VERSION = '2016f'
-VERSION = '2016.6.1'  # Switching to pip compatible version numbering.
+OLSON_VERSION = '2018f'
+VERSION = '2018.6'  # pip compatible version number.
 __version__ = VERSION
 
-OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
+OLSEN_VERSION = OLSON_VERSION  # Old releases had this misspelling
 
 __all__ = [
     'timezone', 'utc', 'country_timezones', 'country_names',
@@ -21,23 +34,11 @@ __all__ = [
     'NonExistentTimeError', 'UnknownTimeZoneError',
     'all_timezones', 'all_timezones_set',
     'common_timezones', 'common_timezones_set',
-    ]
-
-import sys, datetime, os.path, gettext
-
-from pytz.exceptions import AmbiguousTimeError
-from pytz.exceptions import InvalidTimeError
-from pytz.exceptions import NonExistentTimeError
-from pytz.exceptions import UnknownTimeZoneError
-from pytz.lazy import LazyDict, LazyList, LazySet
-from pytz.tzinfo import unpickler
-from pytz.tzfile import build_tzinfo, _byte_string
+    'BaseTzInfo',
+]
 
 
-try:
-    unicode
-
-except NameError: # Python 3.x
+if sys.version_info[0] > 2:  # Python 3.x
 
     # Python 3.x doesn't have unicode(), making writing code
     # for Python 2.3 and Python 3.x a pain.
@@ -52,10 +53,13 @@ except NameError: # Python 3.x
             ...
         UnicodeEncodeError: ...
         """
-        s.encode('ASCII') # Raise an exception if not ASCII
-        return s # But return the original string - not a byte string.
+        if type(s) == bytes:
+            s = s.decode('ASCII')
+        else:
+            s.encode('ASCII')  # Raise an exception if not ASCII
+        return s  # But the string - not a byte string.
 
-else: # Python 2.x
+else:  # Python 2.x
 
     def ascii(s):
         r"""
@@ -76,24 +80,31 @@ def open_resource(name):
 
     Uses the pkg_resources module if available and no standard file
     found at the calculated location.
+
+    It is possible to specify different location for zoneinfo
+    subdir by using the PYTZ_TZDATADIR environment variable.
     """
     name_parts = name.lstrip('/').split('/')
     for part in name_parts:
         if part == os.path.pardir or os.path.sep in part:
             raise ValueError('Bad path segment: %r' % part)
-    filename = os.path.join(os.path.dirname(__file__),
-                            'zoneinfo', *name_parts)
-    if not os.path.exists(filename):
-        # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-        # unless absolutely necessary to help when a broken version of
-        # pkg_resources is installed.
-        try:
-            from pkg_resources import resource_stream
-        except ImportError:
-            resource_stream = None
+    zoneinfo_dir = os.environ.get('PYTZ_TZDATADIR', None)
+    if zoneinfo_dir is not None:
+        filename = os.path.join(zoneinfo_dir, *name_parts)
+    else:
+        filename = os.path.join(os.path.dirname(__file__),
+                                'zoneinfo', *name_parts)
+        if not os.path.exists(filename):
+            # http://bugs.launchpad.net/bugs/383171 - we avoid using this
+            # unless absolutely necessary to help when a broken version of
+            # pkg_resources is installed.
+            try:
+                from pkg_resources import resource_stream
+            except ImportError:
+                resource_stream = None
 
-        if resource_stream is not None:
-            return resource_stream(__name__, 'zoneinfo/' + name)
+            if resource_stream is not None:
+                return resource_stream(__name__, 'zoneinfo/' + name)
     return open(filename, 'rb')
 
 
@@ -106,23 +117,9 @@ def resource_exists(name):
         return False
 
 
-# Enable this when we get some translations?
-# We want an i18n API that is useful to programs using Python's gettext
-# module, as well as the Zope3 i18n package. Perhaps we should just provide
-# the POT file and translations, and leave it up to callers to make use
-# of them.
-#
-# t = gettext.translation(
-#         'pytz', os.path.join(os.path.dirname(__file__), 'locales'),
-#         fallback=True
-#         )
-# def _(timezone_name):
-#     """Translate a timezone name using the current locale, returning Unicode"""
-#     return t.ugettext(timezone_name)
-
-
 _tzinfo_cache = {}
 
+
 def timezone(zone):
     r''' Return a datetime.tzinfo implementation for the given timezone
 
@@ -192,7 +189,7 @@ ZERO = datetime.timedelta(0)
 HOUR = datetime.timedelta(hours=1)
 
 
-class UTC(datetime.tzinfo):
+class UTC(BaseTzInfo):
     """UTC
 
     Optimized UTC implementation. It unpickles using the single module global
@@ -288,7 +285,6 @@ def _p(*args):
 _p.__safe_for_unpickling__ = True
 
 
-
 class _CountryTimezoneDict(LazyDict):
     """Map ISO 3166 country code to a list of timezone names commonly used
     in that country.
@@ -374,7 +370,7 @@ country_names = _CountryNameDict()
 
 class _FixedOffset(datetime.tzinfo):
 
-    zone = None # to match the standard pytz API
+    zone = None  # to match the standard pytz API
 
     def __init__(self, minutes):
         if abs(minutes) >= 1440:
@@ -412,24 +408,24 @@ class _FixedOffset(datetime.tzinfo):
         return dt.astimezone(self)
 
 
-def FixedOffset(offset, _tzinfos = {}):
+def FixedOffset(offset, _tzinfos={}):
     """return a fixed-offset timezone based off a number of minutes.
 
         >>> one = FixedOffset(-330)
         >>> one
         pytz.FixedOffset(-330)
-        >>> one.utcoffset(datetime.datetime.now())
-        datetime.timedelta(-1, 66600)
-        >>> one.dst(datetime.datetime.now())
-        datetime.timedelta(0)
+        >>> str(one.utcoffset(datetime.datetime.now()))
+        '-1 day, 18:30:00'
+        >>> str(one.dst(datetime.datetime.now()))
+        '0:00:00'
 
         >>> two = FixedOffset(1380)
         >>> two
         pytz.FixedOffset(1380)
-        >>> two.utcoffset(datetime.datetime.now())
-        datetime.timedelta(0, 82800)
-        >>> two.dst(datetime.datetime.now())
-        datetime.timedelta(0)
+        >>> str(two.utcoffset(datetime.datetime.now()))
+        '23:00:00'
+        >>> str(two.dst(datetime.datetime.now()))
+        '0:00:00'
 
     The datetime.timedelta must be between the range of -1 and 1 day,
     non-inclusive.
@@ -482,14 +478,13 @@ FixedOffset.__safe_for_unpickling__ = True
 
 
 def _test():
-    import doctest, os, sys
+    import doctest
     sys.path.insert(0, os.pardir)
     import pytz
     return doctest.testmod(pytz)
 
 if __name__ == '__main__':
     _test()
-
 all_timezones = \
 ['Africa/Abidjan',
  'Africa/Accra',
@@ -676,6 +671,7 @@ all_timezones = \
  'America/Porto_Acre',
  'America/Porto_Velho',
  'America/Puerto_Rico',
+ 'America/Punta_Arenas',
  'America/Rainy_River',
  'America/Rankin_Inlet',
  'America/Recife',
@@ -731,6 +727,7 @@ all_timezones = \
  'Asia/Aqtobe',
  'Asia/Ashgabat',
  'Asia/Ashkhabad',
+ 'Asia/Atyrau',
  'Asia/Baghdad',
  'Asia/Bahrain',
  'Asia/Baku',
@@ -751,6 +748,7 @@ all_timezones = \
  'Asia/Dili',
  'Asia/Dubai',
  'Asia/Dushanbe',
+ 'Asia/Famagusta',
  'Asia/Gaza',
  'Asia/Harbin',
  'Asia/Hebron',
@@ -816,6 +814,7 @@ all_timezones = \
  'Asia/Vientiane',
  'Asia/Vladivostok',
  'Asia/Yakutsk',
+ 'Asia/Yangon',
  'Asia/Yekaterinburg',
  'Asia/Yerevan',
  'Atlantic/Azores',
@@ -861,7 +860,6 @@ all_timezones = \
  'CST6CDT',
  'Canada/Atlantic',
  'Canada/Central',
- 'Canada/East-Saskatchewan',
  'Canada/Eastern',
  'Canada/Mountain',
  'Canada/Newfoundland',
@@ -955,6 +953,7 @@ all_timezones = \
  'Europe/Samara',
  'Europe/San_Marino',
  'Europe/Sarajevo',
+ 'Europe/Saratov',
  'Europe/Simferopol',
  'Europe/Skopje',
  'Europe/Sofia',
@@ -1072,7 +1071,6 @@ all_timezones = \
  'US/Michigan',
  'US/Mountain',
  'US/Pacific',
- 'US/Pacific-New',
  'US/Samoa',
  'UTC',
  'Universal',
@@ -1252,6 +1250,7 @@ common_timezones = \
  'America/Port_of_Spain',
  'America/Porto_Velho',
  'America/Puerto_Rico',
+ 'America/Punta_Arenas',
  'America/Rainy_River',
  'America/Rankin_Inlet',
  'America/Recife',
@@ -1301,6 +1300,7 @@ common_timezones = \
  'Asia/Aqtau',
  'Asia/Aqtobe',
  'Asia/Ashgabat',
+ 'Asia/Atyrau',
  'Asia/Baghdad',
  'Asia/Bahrain',
  'Asia/Baku',
@@ -1317,6 +1317,7 @@ common_timezones = \
  'Asia/Dili',
  'Asia/Dubai',
  'Asia/Dushanbe',
+ 'Asia/Famagusta',
  'Asia/Gaza',
  'Asia/Hebron',
  'Asia/Ho_Chi_Minh',
@@ -1351,7 +1352,6 @@ common_timezones = \
  'Asia/Pyongyang',
  'Asia/Qatar',
  'Asia/Qyzylorda',
- 'Asia/Rangoon',
  'Asia/Riyadh',
  'Asia/Sakhalin',
  'Asia/Samarkand',
@@ -1372,6 +1372,7 @@ common_timezones = \
  'Asia/Vientiane',
  'Asia/Vladivostok',
  'Asia/Yakutsk',
+ 'Asia/Yangon',
  'Asia/Yekaterinburg',
  'Asia/Yerevan',
  'Atlantic/Azores',
@@ -1444,6 +1445,7 @@ common_timezones = \
  'Europe/Samara',
  'Europe/San_Marino',
  'Europe/Sarajevo',
+ 'Europe/Saratov',
  'Europe/Simferopol',
  'Europe/Skopje',
  'Europe/Sofia',
@@ -1489,7 +1491,6 @@ common_timezones = \
  'Pacific/Guadalcanal',
  'Pacific/Guam',
  'Pacific/Honolulu',
- 'Pacific/Johnston',
  'Pacific/Kiritimati',
  'Pacific/Kosrae',
  'Pacific/Kwajalein',

lib/pytz/exceptions.py

@@ -5,7 +5,7 @@ Custom exceptions raised by pytz.
 __all__ = [
     'UnknownTimeZoneError', 'InvalidTimeError', 'AmbiguousTimeError',
     'NonExistentTimeError',
-    ]
+]
 
 
 class UnknownTimeZoneError(KeyError):

lib/pytz/lazy.py

@@ -1,8 +1,11 @@
 from threading import RLock
 try:
-    from UserDict import DictMixin
-except ImportError:
-    from collections import Mapping as DictMixin
+    from collections.abc import Mapping as DictMixin
+except ImportError:  # Python < 3.3
+    try:
+        from UserDict import DictMixin  # Python 2
+    except ImportError:  # Python 3.0-3.3
+        from collections import Mapping as DictMixin
 
 
 # With lazy loading, we might end up with multiple threads triggering
@@ -13,6 +16,7 @@ _fill_lock = RLock()
 class LazyDict(DictMixin):
     """Dictionary populated on first use."""
     data = None
+
     def __getitem__(self, key):
         if self.data is None:
             _fill_lock.acquire()

lib/pytz/reference.py

@@ -5,17 +5,28 @@ Used for testing against as they are only correct for the years
 '''
 
 from datetime import tzinfo, timedelta, datetime
-from pytz import utc, UTC, HOUR, ZERO
+from pytz import HOUR, ZERO, UTC
+
+__all__ = [
+    'FixedOffset',
+    'LocalTimezone',
+    'USTimeZone',
+    'Eastern',
+    'Central',
+    'Mountain',
+    'Pacific',
+    'UTC'
+]
+
 
 # A class building tzinfo objects for fixed-offset time zones.
 # Note that FixedOffset(0, "UTC") is a different way to build a
 # UTC tzinfo object.
-
 class FixedOffset(tzinfo):
     """Fixed offset in minutes east from UTC."""
 
     def __init__(self, offset, name):
-        self.__offset = timedelta(minutes = offset)
+        self.__offset = timedelta(minutes=offset)
         self.__name = name
 
     def utcoffset(self, dt):
@@ -27,18 +38,19 @@ class FixedOffset(tzinfo):
     def dst(self, dt):
         return ZERO
 
-# A class capturing the platform's idea of local time.
 
 import time as _time
 
-STDOFFSET = timedelta(seconds = -_time.timezone)
+STDOFFSET = timedelta(seconds=-_time.timezone)
 if _time.daylight:
-    DSTOFFSET = timedelta(seconds = -_time.altzone)
+    DSTOFFSET = timedelta(seconds=-_time.altzone)
 else:
     DSTOFFSET = STDOFFSET
 
 DSTDIFF = DSTOFFSET - STDOFFSET
 
+
+# A class capturing the platform's idea of local time.
 class LocalTimezone(tzinfo):
 
     def utcoffset(self, dt):
@@ -66,7 +78,6 @@ class LocalTimezone(tzinfo):
 
 Local = LocalTimezone()
 
-# A complete implementation of current DST rules for major US time zones.
 
 def first_sunday_on_or_after(dt):
     days_to_go = 6 - dt.weekday()
@@ -74,12 +85,15 @@ def first_sunday_on_or_after(dt):
         dt += timedelta(days_to_go)
     return dt
 
+
 # In the US, DST starts at 2am (standard time) on the first Sunday in April.
 DSTSTART = datetime(1, 4, 1, 2)
 # and ends at 2am (DST time; 1am standard time) on the last Sunday of Oct.
 # which is the first Sunday on or after Oct 25.
 DSTEND = datetime(1, 10, 25, 1)
 
+
+# A complete implementation of current DST rules for major US time zones.
 class USTimeZone(tzinfo):
 
     def __init__(self, hours, reprname, stdname, dstname):
@@ -120,8 +134,7 @@ class USTimeZone(tzinfo):
         else:
             return ZERO
 
-Eastern  = USTimeZone(-5, "Eastern",  "EST", "EDT")
-Central  = USTimeZone(-6, "Central",  "CST", "CDT")
+Eastern = USTimeZone(-5, "Eastern", "EST", "EDT")
+Central = USTimeZone(-6, "Central", "CST", "CDT")
 Mountain = USTimeZone(-7, "Mountain", "MST", "MDT")
-Pacific  = USTimeZone(-8, "Pacific",  "PST", "PDT")
-
+Pacific = USTimeZone(-8, "Pacific", "PST", "PDT")

lib/pytz/tzfile.py

@@ -3,38 +3,37 @@
 $Id: tzfile.py,v 1.8 2004/06/03 00:15:24 zenzen Exp $
 '''
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from io import StringIO
-from datetime import datetime, timedelta
+from datetime import datetime
 from struct import unpack, calcsize
 
 from pytz.tzinfo import StaticTzInfo, DstTzInfo, memorized_ttinfo
 from pytz.tzinfo import memorized_datetime, memorized_timedelta
 
+
 def _byte_string(s):
     """Cast a string or byte string to an ASCII byte string."""
     return s.encode('ASCII')
 
 _NULL = _byte_string('\0')
 
+
 def _std_string(s):
     """Cast a string or byte string to an ASCII string."""
     return str(s.decode('ASCII'))
 
+
 def build_tzinfo(zone, fp):
     head_fmt = '>4s c 15x 6l'
     head_size = calcsize(head_fmt)
-    (magic, format, ttisgmtcnt, ttisstdcnt,leapcnt, timecnt,
-        typecnt, charcnt) =  unpack(head_fmt, fp.read(head_size))
+    (magic, format, ttisgmtcnt, ttisstdcnt, leapcnt, timecnt,
+        typecnt, charcnt) = unpack(head_fmt, fp.read(head_size))
 
     # Make sure it is a tzfile(5) file
     assert magic == _byte_string('TZif'), 'Got magic %s' % repr(magic)
 
     # Read out the transition times, localtime indices and ttinfo structures.
     data_fmt = '>%(timecnt)dl %(timecnt)dB %(ttinfo)s %(charcnt)ds' % dict(
-        timecnt=timecnt, ttinfo='lBB'*typecnt, charcnt=charcnt)
+        timecnt=timecnt, ttinfo='lBB' * typecnt, charcnt=charcnt)
     data_size = calcsize(data_fmt)
     data = unpack(data_fmt, fp.read(data_size))
 
@@ -53,7 +52,7 @@ def build_tzinfo(zone, fp):
     i = 0
     while i < len(ttinfo_raw):
         # have we looked up this timezone name yet?
-        tzname_offset = ttinfo_raw[i+2]
+        tzname_offset = ttinfo_raw[i + 2]
         if tzname_offset not in tznames:
             nul = tznames_raw.find(_NULL, tzname_offset)
             if nul < 0:
@@ -61,12 +60,12 @@ def build_tzinfo(zone, fp):
             tznames[tzname_offset] = _std_string(
                 tznames_raw[tzname_offset:nul])
         ttinfo.append((ttinfo_raw[i],
-                       bool(ttinfo_raw[i+1]),
+                       bool(ttinfo_raw[i + 1]),
                        tznames[tzname_offset]))
         i += 3
 
     # Now build the timezone object
-    if len(ttinfo) ==1 or len(transitions) == 0:
+    if len(ttinfo) == 1 or len(transitions) == 0:
         ttinfo[0][0], ttinfo[0][2]
         cls = type(zone, (StaticTzInfo,), dict(
             zone=zone,
@@ -91,21 +90,21 @@ def build_tzinfo(zone, fp):
             if not inf[1]:
                 dst = 0
             else:
-                for j in range(i-1, -1, -1):
+                for j in range(i - 1, -1, -1):
                     prev_inf = ttinfo[lindexes[j]]
                     if not prev_inf[1]:
                         break
-                dst = inf[0] - prev_inf[0] # dst offset
+                dst = inf[0] - prev_inf[0]  # dst offset
 
                 # Bad dst? Look further. DST > 24 hours happens when
                 # a timzone has moved across the international dateline.
-                if dst <= 0 or dst > 3600*3:
-                    for j in range(i+1, len(transitions)):
+                if dst <= 0 or dst > 3600 * 3:
+                    for j in range(i + 1, len(transitions)):
                         stdinf = ttinfo[lindexes[j]]
                         if not stdinf[1]:
                             dst = inf[0] - stdinf[0]
                             if dst > 0:
-                                break # Found a useful std time.
+                                break  # Found a useful std time.
 
             tzname = inf[2]
 
@@ -129,9 +128,7 @@ if __name__ == '__main__':
     from pprint import pprint
     base = os.path.join(os.path.dirname(__file__), 'zoneinfo')
     tz = build_tzinfo('Australia/Melbourne',
-                      open(os.path.join(base,'Australia','Melbourne'), 'rb'))
+                      open(os.path.join(base, 'Australia', 'Melbourne'), 'rb'))
     tz = build_tzinfo('US/Eastern',
-                      open(os.path.join(base,'US','Eastern'), 'rb'))
+                      open(os.path.join(base, 'US', 'Eastern'), 'rb'))
     pprint(tz._utc_transition_times)
-    #print tz.asPython(4)
-    #print tz.transitions_mapping

lib/pytz/tzinfo.py

@@ -13,6 +13,8 @@ from pytz.exceptions import AmbiguousTimeError, NonExistentTimeError
 __all__ = []
 
 _timedelta_cache = {}
+
+
 def memorized_timedelta(seconds):
     '''Create only one instance of each distinct timedelta'''
     try:
@@ -24,6 +26,8 @@ def memorized_timedelta(seconds):
 
 _epoch = datetime.utcfromtimestamp(0)
 _datetime_cache = {0: _epoch}
+
+
 def memorized_datetime(seconds):
     '''Create only one instance of each distinct datetime'''
     try:
@@ -36,21 +40,24 @@ def memorized_datetime(seconds):
         return dt
 
 _ttinfo_cache = {}
+
+
 def memorized_ttinfo(*args):
     '''Create only one instance of each distinct tuple'''
     try:
         return _ttinfo_cache[args]
     except KeyError:
         ttinfo = (
-                memorized_timedelta(args[0]),
-                memorized_timedelta(args[1]),
-                args[2]
-                )
+            memorized_timedelta(args[0]),
+            memorized_timedelta(args[1]),
+            args[2]
+        )
         _ttinfo_cache[args] = ttinfo
         return ttinfo
 
 _notime = memorized_timedelta(0)
 
+
 def _to_seconds(td):
     '''Convert a timedelta to seconds'''
     return td.seconds + td.days * 24 * 60 * 60
@@ -154,14 +161,20 @@ class DstTzInfo(BaseTzInfo):
     timezone definition.
     '''
     # Overridden in subclass
-    _utc_transition_times = None # Sorted list of DST transition times in UTC
-    _transition_info = None # [(utcoffset, dstoffset, tzname)] corresponding
-                            # to _utc_transition_times entries
+
+    # Sorted list of DST transition times, UTC
+    _utc_transition_times = None
+
+    # [(utcoffset, dstoffset, tzname)] corresponding to
+    # _utc_transition_times entries
+    _transition_info = None
+
     zone = None
 
     # Set in __init__
+
     _tzinfos = None
-    _dst = None # DST offset
+    _dst = None  # DST offset
 
     def __init__(self, _inf=None, _tzinfos=None):
         if _inf:
@@ -170,7 +183,8 @@ class DstTzInfo(BaseTzInfo):
         else:
             _tzinfos = {}
             self._tzinfos = _tzinfos
-            self._utcoffset, self._dst, self._tzname = self._transition_info[0]
+            self._utcoffset, self._dst, self._tzname = (
+                self._transition_info[0])
             _tzinfos[self._transition_info[0]] = self
             for inf in self._transition_info[1:]:
                 if inf not in _tzinfos:
@@ -178,8 +192,8 @@ class DstTzInfo(BaseTzInfo):
 
     def fromutc(self, dt):
         '''See datetime.tzinfo.fromutc'''
-        if (dt.tzinfo is not None
-            and getattr(dt.tzinfo, '_tzinfos', None) is not self._tzinfos):
+        if (dt.tzinfo is not None and
+                getattr(dt.tzinfo, '_tzinfos', None) is not self._tzinfos):
             raise ValueError('fromutc: dt.tzinfo is not self')
         dt = dt.replace(tzinfo=None)
         idx = max(0, bisect_right(self._utc_transition_times, dt) - 1)
@@ -337,8 +351,8 @@ class DstTzInfo(BaseTzInfo):
             # obtain the correct timezone by winding the clock back.
             else:
                 return self.localize(
-                    dt - timedelta(hours=6), is_dst=False) + timedelta(hours=6)
-
+                    dt - timedelta(hours=6),
+                    is_dst=False) + timedelta(hours=6)
 
         # If we get this far, we have multiple possible timezones - this
         # is an ambiguous case occuring during the end-of-DST transition.
@@ -351,9 +365,8 @@ class DstTzInfo(BaseTzInfo):
         # Filter out the possiblilities that don't match the requested
         # is_dst
         filtered_possible_loc_dt = [
-            p for p in possible_loc_dt
-                if bool(p.tzinfo._dst) == is_dst
-            ]
+            p for p in possible_loc_dt if bool(p.tzinfo._dst) == is_dst
+        ]
 
         # Hopefully we only have one possibility left. Return it.
         if len(filtered_possible_loc_dt) == 1:
@@ -372,9 +385,10 @@ class DstTzInfo(BaseTzInfo):
         # Choose the earliest (by UTC) applicable timezone if is_dst=True
         # Choose the latest (by UTC) applicable timezone if is_dst=False
         # i.e., behave like end-of-DST transition
-        dates = {} # utc -> local
+        dates = {}  # utc -> local
         for local_dt in filtered_possible_loc_dt:
-            utc_time = local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset
+            utc_time = (
+                local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset)
             assert utc_time not in dates
             dates[utc_time] = local_dt
         return dates[[min, max][not is_dst](dates)]
@@ -389,11 +403,11 @@ class DstTzInfo(BaseTzInfo):
         >>> tz = timezone('America/St_Johns')
         >>> ambiguous = datetime(2009, 10, 31, 23, 30)
 
-        >>> tz.utcoffset(ambiguous, is_dst=False)
-        datetime.timedelta(-1, 73800)
+        >>> str(tz.utcoffset(ambiguous, is_dst=False))
+        '-1 day, 20:30:00'
 
-        >>> tz.utcoffset(ambiguous, is_dst=True)
-        datetime.timedelta(-1, 77400)
+        >>> str(tz.utcoffset(ambiguous, is_dst=True))
+        '-1 day, 21:30:00'
 
         >>> try:
         ...     tz.utcoffset(ambiguous)
@@ -421,19 +435,19 @@ class DstTzInfo(BaseTzInfo):
 
         >>> normal = datetime(2009, 9, 1)
 
-        >>> tz.dst(normal)
-        datetime.timedelta(0, 3600)
-        >>> tz.dst(normal, is_dst=False)
-        datetime.timedelta(0, 3600)
-        >>> tz.dst(normal, is_dst=True)
-        datetime.timedelta(0, 3600)
+        >>> str(tz.dst(normal))
+        '1:00:00'
+        >>> str(tz.dst(normal, is_dst=False))
+        '1:00:00'
+        >>> str(tz.dst(normal, is_dst=True))
+        '1:00:00'
 
         >>> ambiguous = datetime(2009, 10, 31, 23, 30)
 
-        >>> tz.dst(ambiguous, is_dst=False)
-        datetime.timedelta(0)
-        >>> tz.dst(ambiguous, is_dst=True)
-        datetime.timedelta(0, 3600)
+        >>> str(tz.dst(ambiguous, is_dst=False))
+        '0:00:00'
+        >>> str(tz.dst(ambiguous, is_dst=True))
+        '1:00:00'
         >>> try:
         ...     tz.dst(ambiguous)
         ... except AmbiguousTimeError:
@@ -494,23 +508,22 @@ class DstTzInfo(BaseTzInfo):
             dst = 'STD'
         if self._utcoffset > _notime:
             return '<DstTzInfo %r %s+%s %s>' % (
-                    self.zone, self._tzname, self._utcoffset, dst
-                )
+                self.zone, self._tzname, self._utcoffset, dst
+            )
         else:
             return '<DstTzInfo %r %s%s %s>' % (
-                    self.zone, self._tzname, self._utcoffset, dst
-                )
+                self.zone, self._tzname, self._utcoffset, dst
+            )
 
     def __reduce__(self):
         # Special pickle to zone remains a singleton and to cope with
         # database changes.
         return pytz._p, (
-                self.zone,
-                _to_seconds(self._utcoffset),
-                _to_seconds(self._dst),
-                self._tzname
-                )
-
+            self.zone,
+            _to_seconds(self._utcoffset),
+            _to_seconds(self._dst),
+            self._tzname
+        )
 
 
 def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
@@ -549,8 +562,8 @@ def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
     # get changed from the initial guess by the database maintainers to
     # match reality when this information is discovered.
     for localized_tz in tz._tzinfos.values():
-        if (localized_tz._utcoffset == utcoffset
-                and localized_tz._dst == dstoffset):
+        if (localized_tz._utcoffset == utcoffset and
+                localized_tz._dst == dstoffset):
             return localized_tz
 
     # This (utcoffset, dstoffset) information has been removed from the