v2.0.21-beta

API.md

@@ -401,6 +401,7 @@ Returns:
                  "quality_profile": "Original",
                  "rating": "7.8",
                  "rating_key": "153037",
+                 "relay": 0,
                  "section_id": "2",
                  "session_id": "helf15l3rxgw01xxe0jf3l3d",
                  "session_key": "27",
@@ -1316,6 +1317,7 @@ Optional parameters:
     time_range (str):       The number of days of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:
@@ -1341,6 +1343,7 @@ Optional parameters:
     time_range (str):       The number of days of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:
@@ -1366,6 +1369,7 @@ Optional parameters:
     time_range (str):       The number of days of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:
@@ -1391,6 +1395,7 @@ Optional parameters:
     time_range (str):       The number of days of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:
@@ -1416,6 +1421,7 @@ Optional parameters:
     time_range (str):       The number of days of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:
@@ -1441,6 +1447,7 @@ Optional parameters:
     time_range (str):       The number of days of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:
@@ -1466,6 +1473,7 @@ Optional parameters:
     time_range (str):       The number of days of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:
@@ -1491,6 +1499,7 @@ Optional parameters:
     time_range (str):       The number of days of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:
@@ -1516,6 +1525,7 @@ Optional parameters:
     time_range (str):       The number of months of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:
@@ -1777,6 +1787,7 @@ Optional parameters:
     time_range (str):       The number of days of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:
@@ -1802,6 +1813,7 @@ Optional parameters:
     time_range (str):       The number of days of data to return
     y_axis (str):           "plays" or "duration"
     user_id (str):          The user id to filter the data
+    grouping (int):         0 or 1
 
 Returns:
     json:

CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## v2.0.21-beta (2018-03-04)
+
+* Monitoring:
+  * New: Identify if a stream is using Plex Relay.
+  * Change: Don't ping the Plex server if the websocket is disconnected.
+* Notifications:
+  * Fix: Pause/resume state not being sent correctly in some instances.
+* Other:
+  * New: Add Patreon donation method.
+  * Fix: Catch failure to send analytics.
+  * Fix: IP address connection lookup error when the country is missing.
+  * Change: Updated all init scripts to Tautulli.
+  * Change: Move database to tautulli.db.
+  * Change: Move logs to tautulli.log.
+  * Change: Move startup file to Tautulli.py.
+
+
+## v2.0.20-beta (2018-02-24)
+
+* Notifications:
+  * New: Add poster support for Pushover notifications.
+  * New: Add poster support for Pushbullet notifications.
+  * Fix: Incorrect Plex/Tautulli update notification parameter types.
+  * Change: Poster and text sent as a single message for Telegram.
+  * Change: Posters uploaded directly to Telegram without Imgur.
+* UI:
+  * New: Add "Delete" button to synced items table on user pages.
+  * Fix: Button spacing/positioning on mobile site.
+  * Fix: Music statistic cards not using the fallback thumbnail.
+  * Fix: Logo not showing up when using an SVG.
+  * Change: Graphs now respect the "Group History" setting.
+* API:
+  * New: Add grouping to graph API commands.
+* Other:
+  * New: Added Google Analytics to collect installation metrics.
+  * Fix: Reconnecting to the Plex server when server settings are not changed.
+
+
 ## v2.0.19-beta (2018-02-16)
 
 * Monitoring:

PlexPy.py

@@ -21,239 +21,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
-import sys
+from Tautulli import main
 
-# Ensure lib added to path, before any other imports
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'lib/'))
-
-import argparse
-import locale
-import signal
-import time
-
-import plexpy
-from plexpy import config, database, logger, webstart
-
-
-# Register signals, such as CTRL + C
-signal.signal(signal.SIGINT, plexpy.sig_handler)
-signal.signal(signal.SIGTERM, plexpy.sig_handler)
-
-
-def main():
-    """
-    Tautulli application entry point. Parses arguments, setups encoding and
-    initializes the application.
-    """
-
-    # Fixed paths to Tautulli
-    if hasattr(sys, 'frozen'):
-        plexpy.FULL_PATH = os.path.abspath(sys.executable)
-    else:
-        plexpy.FULL_PATH = os.path.abspath(__file__)
-
-    plexpy.PROG_DIR = os.path.dirname(plexpy.FULL_PATH)
-    plexpy.ARGS = sys.argv[1:]
-
-    # From sickbeard
-    plexpy.SYS_PLATFORM = sys.platform
-    plexpy.SYS_ENCODING = None
-
-    try:
-        locale.setlocale(locale.LC_ALL, "")
-        plexpy.SYS_ENCODING = locale.getpreferredencoding()
-    except (locale.Error, IOError):
-        pass
-
-    # for OSes that are poorly configured I'll just force UTF-8
-    if not plexpy.SYS_ENCODING or plexpy.SYS_ENCODING in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'):
-        plexpy.SYS_ENCODING = 'UTF-8'
-
-    # Set up and gather command line arguments
-    parser = argparse.ArgumentParser(
-        description='A Python based monitoring and tracking tool for Plex Media Server.')
-
-    parser.add_argument(
-        '-v', '--verbose', action='store_true', help='Increase console logging verbosity')
-    parser.add_argument(
-        '-q', '--quiet', action='store_true', help='Turn off console logging')
-    parser.add_argument(
-        '-d', '--daemon', action='store_true', help='Run as a daemon')
-    parser.add_argument(
-        '-p', '--port', type=int, help='Force Tautulli to run on a specified port')
-    parser.add_argument(
-        '--dev', action='store_true', help='Start Tautulli in the development environment')
-    parser.add_argument(
-        '--datadir', help='Specify a directory where to store your data files')
-    parser.add_argument(
-        '--config', help='Specify a config file to use')
-    parser.add_argument(
-        '--nolaunch', action='store_true', help='Prevent browser from launching on startup')
-    parser.add_argument(
-        '--pidfile', help='Create a pid file (only relevant when running as a daemon)')
-    parser.add_argument(
-        '--nofork', action='store_true', help='Start Tautulli as a service, do not fork when restarting')
-
-    args = parser.parse_args()
-
-    if args.verbose:
-        plexpy.VERBOSE = True
-    if args.quiet:
-        plexpy.QUIET = True
-
-    # Do an intial setup of the logger.
-    logger.initLogger(console=not plexpy.QUIET, log_dir=False,
-                      verbose=plexpy.VERBOSE)
-
-    if args.dev:
-        plexpy.DEV = True
-        logger.debug(u"Tautulli is running in the dev environment.")
-
-    if args.daemon:
-        if sys.platform == 'win32':
-            sys.stderr.write(
-                "Daemonizing not supported under Windows, starting normally\n")
-        else:
-            plexpy.DAEMON = True
-            plexpy.QUIET = True
-
-    if args.nofork:
-        plexpy.NOFORK = True
-        logger.info("Tautulli is running as a service, it will not fork when restarted.")
-
-    if args.pidfile:
-        plexpy.PIDFILE = str(args.pidfile)
-
-        # If the pidfile already exists, plexpy may still be running, so
-        # exit
-        if os.path.exists(plexpy.PIDFILE):
-            try:
-                with open(plexpy.PIDFILE, 'r') as fp:
-                    pid = int(fp.read())
-                os.kill(pid, 0)
-            except IOError as e:
-                raise SystemExit("Unable to read PID file: %s", e)
-            except OSError:
-                logger.warn("PID file '%s' already exists, but PID %d is " \
-                            "not running. Ignoring PID file." %
-                            (plexpy.PIDFILE, pid))
-            else:
-                # The pidfile exists and points to a live PID. plexpy may
-                # still be running, so exit.
-                raise SystemExit("PID file '%s' already exists. Exiting." %
-                                 plexpy.PIDFILE)
-
-        # The pidfile is only useful in daemon mode, make sure we can write the
-        # file properly
-        if plexpy.DAEMON:
-            plexpy.CREATEPID = True
-
-            try:
-                with open(plexpy.PIDFILE, 'w') as fp:
-                    fp.write("pid\n")
-            except IOError as e:
-                raise SystemExit("Unable to write PID file: %s", e)
-        else:
-            logger.warn("Not running in daemon mode. PID file creation " \
-                        "disabled.")
-
-    # Determine which data directory and config file to use
-    if args.datadir:
-        plexpy.DATA_DIR = args.datadir
-    else:
-        plexpy.DATA_DIR = plexpy.PROG_DIR
-
-    if args.config:
-        config_file = args.config
-    else:
-        config_file = os.path.join(plexpy.DATA_DIR, config.FILENAME)
-
-    # Try to create the DATA_DIR if it doesn't exist
-    if not os.path.exists(plexpy.DATA_DIR):
-        try:
-            os.makedirs(plexpy.DATA_DIR)
-        except OSError:
-            raise SystemExit(
-                'Could not create data directory: ' + plexpy.DATA_DIR + '. Exiting....')
-
-    # Make sure the DATA_DIR is writeable
-    if not os.access(plexpy.DATA_DIR, os.W_OK):
-        raise SystemExit(
-            'Cannot write to the data directory: ' + plexpy.DATA_DIR + '. Exiting...')
-
-    # Put the database in the DATA_DIR
-    plexpy.DB_FILE = os.path.join(plexpy.DATA_DIR, database.FILENAME)
-
-    if plexpy.DAEMON:
-        plexpy.daemonize()
-
-    # Read config and start logging
-    plexpy.initialize(config_file)
-
-    # Start the background threads
-    plexpy.start()
-
-    # Force the http port if neccessary
-    if args.port:
-        http_port = args.port
-        logger.info('Using forced web server port: %i', http_port)
-    else:
-        http_port = int(plexpy.CONFIG.HTTP_PORT)
-
-    # Check if pyOpenSSL is installed. It is required for certificate generation
-    # and for CherryPy.
-    if plexpy.CONFIG.ENABLE_HTTPS:
-        try:
-            import OpenSSL
-        except ImportError:
-            logger.warn("The pyOpenSSL module is missing. Install this " \
-                        "module to enable HTTPS. HTTPS will be disabled.")
-            plexpy.CONFIG.ENABLE_HTTPS = False
-
-    # Try to start the server. Will exit here is address is already in use.
-    web_config = {
-        'http_port': http_port,
-        'http_host': plexpy.CONFIG.HTTP_HOST,
-        'http_root': plexpy.CONFIG.HTTP_ROOT,
-        'http_environment': plexpy.CONFIG.HTTP_ENVIRONMENT,
-        'http_proxy': plexpy.CONFIG.HTTP_PROXY,
-        'enable_https': plexpy.CONFIG.ENABLE_HTTPS,
-        'https_cert': plexpy.CONFIG.HTTPS_CERT,
-        'https_cert_chain': plexpy.CONFIG.HTTPS_CERT_CHAIN,
-        'https_key': plexpy.CONFIG.HTTPS_KEY,
-        'http_username': plexpy.CONFIG.HTTP_USERNAME,
-        'http_password': plexpy.CONFIG.HTTP_PASSWORD,
-        'http_basic_auth': plexpy.CONFIG.HTTP_BASIC_AUTH
-    }
-    webstart.initialize(web_config)
-
-    # Open webbrowser
-    if plexpy.CONFIG.LAUNCH_BROWSER and not args.nolaunch and not plexpy.DEV:
-        plexpy.launch_browser(plexpy.CONFIG.HTTP_HOST, http_port,
-                              plexpy.CONFIG.HTTP_ROOT)
-
-    # Wait endlessy for a signal to happen
-    while True:
-        if not plexpy.SIGNAL:
-            try:
-                time.sleep(1)
-            except KeyboardInterrupt:
-                plexpy.SIGNAL = 'shutdown'
-        else:
-            logger.info('Received signal: %s', plexpy.SIGNAL)
-
-            if plexpy.SIGNAL == 'shutdown':
-                plexpy.shutdown()
-            elif plexpy.SIGNAL == 'restart':
-                plexpy.shutdown(restart=True)
-            elif plexpy.SIGNAL == 'checkout':
-                plexpy.shutdown(restart=True, checkout=True)
-            else:
-                plexpy.shutdown(restart=True, update=True)
-
-            plexpy.SIGNAL = None
-
-# Call main()
+# Call main() from Tautulli.py
 if __name__ == "__main__":
     main()

Tautulli.py

@@ -0,0 +1,263 @@
+#!/bin/sh
+''''which python    >/dev/null 2>&1 && exec python    "$0" "$@" # '''
+''''which python2   >/dev/null 2>&1 && exec python2   "$0" "$@" # '''
+''''which python2.7 >/dev/null 2>&1 && exec python2.7 "$0" "$@" # '''
+''''exec echo "Error: Python not found!" # '''
+
+# -*- coding: utf-8 -*-
+
+# This file is part of Tautulli.
+#
+#  Tautulli is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  Tautulli is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import sys
+
+# Ensure lib added to path, before any other imports
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'lib/'))
+
+import argparse
+import locale
+import signal
+import time
+
+import plexpy
+from plexpy import config, database, logger, webstart
+
+
+# Register signals, such as CTRL + C
+signal.signal(signal.SIGINT, plexpy.sig_handler)
+signal.signal(signal.SIGTERM, plexpy.sig_handler)
+
+
+def main():
+    """
+    Tautulli application entry point. Parses arguments, setups encoding and
+    initializes the application.
+    """
+
+    # Fixed paths to Tautulli
+    if hasattr(sys, 'frozen'):
+        plexpy.FULL_PATH = os.path.abspath(sys.executable)
+    else:
+        plexpy.FULL_PATH = os.path.abspath(__file__)
+
+    plexpy.PROG_DIR = os.path.dirname(plexpy.FULL_PATH)
+    plexpy.ARGS = sys.argv[1:]
+
+    # From sickbeard
+    plexpy.SYS_PLATFORM = sys.platform
+    plexpy.SYS_ENCODING = None
+
+    try:
+        locale.setlocale(locale.LC_ALL, "")
+        plexpy.SYS_LANGUAGE, plexpy.SYS_ENCODING = locale.getdefaultlocale()
+    except (locale.Error, IOError):
+        pass
+
+    # for OSes that are poorly configured I'll just force UTF-8
+    if not plexpy.SYS_ENCODING or plexpy.SYS_ENCODING in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'):
+        plexpy.SYS_ENCODING = 'UTF-8'
+
+    # Set up and gather command line arguments
+    parser = argparse.ArgumentParser(
+        description='A Python based monitoring and tracking tool for Plex Media Server.')
+
+    parser.add_argument(
+        '-v', '--verbose', action='store_true', help='Increase console logging verbosity')
+    parser.add_argument(
+        '-q', '--quiet', action='store_true', help='Turn off console logging')
+    parser.add_argument(
+        '-d', '--daemon', action='store_true', help='Run as a daemon')
+    parser.add_argument(
+        '-p', '--port', type=int, help='Force Tautulli to run on a specified port')
+    parser.add_argument(
+        '--dev', action='store_true', help='Start Tautulli in the development environment')
+    parser.add_argument(
+        '--datadir', help='Specify a directory where to store your data files')
+    parser.add_argument(
+        '--config', help='Specify a config file to use')
+    parser.add_argument(
+        '--nolaunch', action='store_true', help='Prevent browser from launching on startup')
+    parser.add_argument(
+        '--pidfile', help='Create a pid file (only relevant when running as a daemon)')
+    parser.add_argument(
+        '--nofork', action='store_true', help='Start Tautulli as a service, do not fork when restarting')
+
+    args = parser.parse_args()
+
+    if args.verbose:
+        plexpy.VERBOSE = True
+    if args.quiet:
+        plexpy.QUIET = True
+
+    # Do an intial setup of the logger.
+    logger.initLogger(console=not plexpy.QUIET, log_dir=False,
+                      verbose=plexpy.VERBOSE)
+
+    if args.dev:
+        plexpy.DEV = True
+        logger.debug(u"Tautulli is running in the dev environment.")
+
+    if args.daemon:
+        if sys.platform == 'win32':
+            sys.stderr.write(
+                "Daemonizing not supported under Windows, starting normally\n")
+        else:
+            plexpy.DAEMON = True
+            plexpy.QUIET = True
+
+    if args.nofork:
+        plexpy.NOFORK = True
+        logger.info("Tautulli is running as a service, it will not fork when restarted.")
+
+    if args.pidfile:
+        plexpy.PIDFILE = str(args.pidfile)
+
+        # If the pidfile already exists, plexpy may still be running, so
+        # exit
+        if os.path.exists(plexpy.PIDFILE):
+            try:
+                with open(plexpy.PIDFILE, 'r') as fp:
+                    pid = int(fp.read())
+                os.kill(pid, 0)
+            except IOError as e:
+                raise SystemExit("Unable to read PID file: %s", e)
+            except OSError:
+                logger.warn("PID file '%s' already exists, but PID %d is " \
+                            "not running. Ignoring PID file." %
+                            (plexpy.PIDFILE, pid))
+            else:
+                # The pidfile exists and points to a live PID. plexpy may
+                # still be running, so exit.
+                raise SystemExit("PID file '%s' already exists. Exiting." %
+                                 plexpy.PIDFILE)
+
+        # The pidfile is only useful in daemon mode, make sure we can write the
+        # file properly
+        if plexpy.DAEMON:
+            plexpy.CREATEPID = True
+
+            try:
+                with open(plexpy.PIDFILE, 'w') as fp:
+                    fp.write("pid\n")
+            except IOError as e:
+                raise SystemExit("Unable to write PID file: %s", e)
+        else:
+            logger.warn("Not running in daemon mode. PID file creation " \
+                        "disabled.")
+
+    # Determine which data directory and config file to use
+    if args.datadir:
+        plexpy.DATA_DIR = args.datadir
+    else:
+        plexpy.DATA_DIR = plexpy.PROG_DIR
+
+    if args.config:
+        config_file = args.config
+    else:
+        config_file = os.path.join(plexpy.DATA_DIR, config.FILENAME)
+
+    # Try to create the DATA_DIR if it doesn't exist
+    if not os.path.exists(plexpy.DATA_DIR):
+        try:
+            os.makedirs(plexpy.DATA_DIR)
+        except OSError:
+            raise SystemExit(
+                'Could not create data directory: ' + plexpy.DATA_DIR + '. Exiting....')
+
+    # Make sure the DATA_DIR is writeable
+    if not os.access(plexpy.DATA_DIR, os.W_OK):
+        raise SystemExit(
+            'Cannot write to the data directory: ' + plexpy.DATA_DIR + '. Exiting...')
+
+    # Put the database in the DATA_DIR
+    plexpy.DB_FILE = os.path.join(plexpy.DATA_DIR, database.FILENAME)
+
+    # Move 'plexpy.db' to 'tautulli.db'
+    if os.path.isfile(os.path.join(plexpy.DATA_DIR, 'plexpy.db')):
+        os.rename(os.path.join(plexpy.DATA_DIR, 'plexpy.db'), plexpy.DB_FILE)
+
+    if plexpy.DAEMON:
+        plexpy.daemonize()
+
+    # Read config and start logging
+    plexpy.initialize(config_file)
+
+    # Start the background threads
+    plexpy.start()
+
+    # Force the http port if neccessary
+    if args.port:
+        http_port = args.port
+        logger.info('Using forced web server port: %i', http_port)
+    else:
+        http_port = int(plexpy.CONFIG.HTTP_PORT)
+
+    # Check if pyOpenSSL is installed. It is required for certificate generation
+    # and for CherryPy.
+    if plexpy.CONFIG.ENABLE_HTTPS:
+        try:
+            import OpenSSL
+        except ImportError:
+            logger.warn("The pyOpenSSL module is missing. Install this " \
+                        "module to enable HTTPS. HTTPS will be disabled.")
+            plexpy.CONFIG.ENABLE_HTTPS = False
+
+    # Try to start the server. Will exit here is address is already in use.
+    web_config = {
+        'http_port': http_port,
+        'http_host': plexpy.CONFIG.HTTP_HOST,
+        'http_root': plexpy.CONFIG.HTTP_ROOT,
+        'http_environment': plexpy.CONFIG.HTTP_ENVIRONMENT,
+        'http_proxy': plexpy.CONFIG.HTTP_PROXY,
+        'enable_https': plexpy.CONFIG.ENABLE_HTTPS,
+        'https_cert': plexpy.CONFIG.HTTPS_CERT,
+        'https_cert_chain': plexpy.CONFIG.HTTPS_CERT_CHAIN,
+        'https_key': plexpy.CONFIG.HTTPS_KEY,
+        'http_username': plexpy.CONFIG.HTTP_USERNAME,
+        'http_password': plexpy.CONFIG.HTTP_PASSWORD,
+        'http_basic_auth': plexpy.CONFIG.HTTP_BASIC_AUTH
+    }
+    webstart.initialize(web_config)
+
+    # Open webbrowser
+    if plexpy.CONFIG.LAUNCH_BROWSER and not args.nolaunch and not plexpy.DEV:
+        plexpy.launch_browser(plexpy.CONFIG.HTTP_HOST, http_port,
+                              plexpy.CONFIG.HTTP_ROOT)
+
+    # Wait endlessy for a signal to happen
+    while True:
+        if not plexpy.SIGNAL:
+            try:
+                time.sleep(1)
+            except KeyboardInterrupt:
+                plexpy.SIGNAL = 'shutdown'
+        else:
+            logger.info('Received signal: %s', plexpy.SIGNAL)
+
+            if plexpy.SIGNAL == 'shutdown':
+                plexpy.shutdown()
+            elif plexpy.SIGNAL == 'restart':
+                plexpy.shutdown(restart=True)
+            elif plexpy.SIGNAL == 'checkout':
+                plexpy.shutdown(restart=True, checkout=True)
+            else:
+                plexpy.shutdown(restart=True, update=True)
+
+            plexpy.SIGNAL = None
+
+# Call main()
+if __name__ == "__main__":
+    main()

data/interfaces/default/base.html

@@ -15,7 +15,7 @@
     <meta name="author" content="">
     <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
     <link href="${http_root}css/pnotify.custom.min.css" rel="stylesheet" />
-    <link href="${http_root}css/plexpy.css${cache_param}" rel="stylesheet">
+    <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
     <link href="${http_root}css/opensans.min.css" rel="stylesheet">
     <link href="${http_root}css/font-awesome.min.css" rel="stylesheet">
     ${next.headIncludes()}
@@ -47,11 +47,17 @@
         You are running an unknown version of Tautulli.<br />
         <a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>
     </div>
-    % elif plexpy.CONFIG.CHECK_GITHUB and plexpy.CURRENT_VERSION != plexpy.LATEST_VERSION and plexpy.COMMITS_BEHIND > 0 and plexpy.INSTALL_TYPE != 'win':
+    % elif plexpy.CONFIG.CHECK_GITHUB and plexpy.COMMITS_BEHIND > 0 and plexpy.common.BRANCH in ('master', 'beta') and plexpy.common.RELEASE != plexpy.LATEST_RELEASE:
+    <div id="updatebar" style="display: none;">
+        A <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank">
+        new release (${plexpy.LATEST_RELEASE})</a> of Tautulli is available!<br />
+        <a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>
+    </div>
+    % elif plexpy.CONFIG.CHECK_GITHUB and plexpy.COMMITS_BEHIND > 0 and plexpy.CURRENT_VERSION != plexpy.LATEST_VERSION and plexpy.INSTALL_TYPE != 'win':
     <div id="updatebar" style="display: none;">
         A <a href="${anon_url('https://github.com/%s/%s/compare/%s...%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION, plexpy.LATEST_VERSION))}" target="_blank">
-        newer version</a> is available!<br />
-        You are ${plexpy.COMMITS_BEHIND} commits behind.<br />
+        newer version</a> of Tautulli is available!<br />
+        You are ${plexpy.COMMITS_BEHIND} commit${'s' if plexpy.COMMITS_BEHIND > 1 else ''} behind.<br />
         <a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>
     </div>
     % else:
@@ -68,7 +74,7 @@
                     <span class="icon-bar"></span>
                 </button>
                 <a class="navbar-brand" href="home" title="Tautulli">
-                    <object data="${http_root}images/logo-tautulli.svg" type="image/svg+xml" style="height: 45px;"></object>
+                    <img src="${http_root}images/logo-tautulli-45.png" height="45" alt="PlexPy">
                 </a>
             </div>
             <div class="collapse navbar-collapse navbar-right" id="navbar-collapse-1">
@@ -221,15 +227,23 @@ ${next.modalIncludes()}
                     </div>
                 </div>
                 <ul id="donation_type" class="nav nav-pills" role="tablist" style="display: flex; justify-content: center; margin: 10px 0;">
-                    <li class="active"><a href="#paypal-donation" role="tab" data-toggle="tab">PayPal</a></li>
-                    <li><a href="#flattr-donation" role="tab" data-toggle="tab">Flattr</a></li>
+                    <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="paypal-donation" style="text-align: center">
+                    <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">
+                            <img src="images/become_a_patron_button.png" alt="Become a Patron" height="40">
+                        </a>
+                    </div>
+                    <div role="tabpanel" class="tab-pane" id="paypal-donation" style="text-align: center">
                         <p>
                             Click the button below to continue to PayPal.
                         </p>
@@ -237,14 +251,6 @@ ${next.modalIncludes()}
                             <img src="images/gold-rect-paypal-34px.png" alt="PayPal">
                         </a>
                     </div>
-                    <div role="tabpanel" class="tab-pane" id="flattr-donation" style="text-align: center">
-                        <p>
-                            Click the button below to continue to Flattr.
-                        </p>
-                        <a href="${anon_url('https://flattr.com/submit/auto?user_id=JonnyWong16&url=https://github.com/%s/%s&title=Tautulli&language=en_GB&tags=github&category=software' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank">
-                            <img src="images/flattr-badge-large.png" alt="Flattr">
-                        </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>
@@ -311,17 +317,21 @@ ${next.modalIncludes()}
             complete: function (xhr, status) {
                 var result = $.parseJSON(xhr.responseText);
                 var msg = '';
-                if (result.update === true) {
-                    msg = 'A <a href="' + result.compare_url + '" target="_blank">newer version</a> is available!<br />' +
-                        'You are '+ result.commits_behind + ' commits behind.<br />' +
+                if (result.update === null) {
+                    msg = 'You are running an unknown version of Tautulli.<br />' +
+                        '<a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>';
+                    $('#updatebar').html(msg).fadeIn();
+                } else if (result.update === true && result.release === true) {
+                    msg = 'A <a href="' + result.release_url + '" target="_blank">new release (' + result.latest_release + ')</a> of Tautulli is available!<br />' +
+                        '<a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>';
+                    $('#updatebar').html(msg).fadeIn();
+                } else if (result.update === true && result.release === false) {
+                    msg = 'A <a href="' + result.compare_url + '" target="_blank">newer version</a> of Tautulli is available!<br />' +
+                        'You are '+ result.commits_behind + ' commit' + (result.commits_behind > 1 ? 's' : '') + ' behind.<br />' +
                         '<a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>';
                     $('#updatebar').html(msg).fadeIn();
                 } else if (result.update === false) {
                     showMsg('<i class="fa fa-check"></i> ' + result.message, false, true, 2000);
-                } else if (result.update === null) {
-                    msg = 'You are running an unknown version of Tautulli.<br />' +
-                        '<a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>';
-                    $('#updatebar').html(msg).fadeIn();
                 }
 
                 if (_callback) {

data/interfaces/default/configuration_table.html

@@ -26,7 +26,7 @@ DOCUMENTATION :: END
         </tr>
         <tr>
             <td>Git Commit Hash:</td>
-            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/commit/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CONFIG.GIT_BRANCH))}">${plexpy.CURRENT_VERSION}</a></td>
+            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/commit/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION))}">${plexpy.CURRENT_VERSION}</a></td>
         </tr>
         % endif
         <tr>

data/interfaces/default/css/tautulli-dataTables.css

@@ -359,11 +359,13 @@ table.display tr.shown + tr:hover {
 }
 table.display tr.shown + tr:hover a,
 table.display tr.shown + tr td:hover a,
+table.display tr.shown + tr td:hover a .fa,
 table.display tr.shown + tr .pagination > .active > a,
 table.display tr.shown + tr .pagination > .active > a:hover {
     color: #fff;
 }
 table.display tr.shown + tr table[id^='history_child'] td:hover a, 
+table.display tr.shown + tr table[id^='history_child'] td:hover a .fa,
 table.display tr.shown + tr table[id^='media_info_child'] > tr > td:hover a,
 table.display tr.shown + tr table[id^='media_info_child'] tr.shown + tr table[id^='media_info_child'] td:hover a {
     color: #cc7b19;

data/interfaces/default/css/tautulli.css

@@ -2372,21 +2372,6 @@ a .library-user-instance-box:hover {
 #watched-stats-days-selection label {
     margin-bottom: 0;
 }
-#watched-stats-days {
-    margin: 0;
-    width: 75px;
-    height: 34px;
-}
-#watched-stats-count {
-    margin: 0;
-    width: 75px;
-    height: 34px;
-}
-#recently-added-count {
-    margin: 0;
-    width: 75px;
-    height: 34px;
-}
 .home-padded-header {
     margin: 25px 0;
     height: 34px;
@@ -2395,6 +2380,9 @@ a .library-user-instance-box:hover {
     margin-top: 9px;
     width: 175px;
 }
+.home-padded-header .button-bar {
+    float: left;
+}
 .home-platforms {
 }
 .home-platforms ul,
@@ -3146,7 +3134,7 @@ div.dataTables_info {
     border-radius: 2px;
 }
 .history-thumbnail-popover {
-    z-index: 2;
+    z-index: 2000;
     padding: 0;
     border: 0;
 }
@@ -3316,6 +3304,48 @@ pre::-webkit-scrollbar-thumb {
         width: 100%;
     }
 }
+@media only screen
+  and (min-device-width: 300px)
+  and (max-device-width: 740px) {
+    .header-bar {
+        display: block;
+        float: none !important;
+    }
+    .button-bar {
+        float: left !important;
+        clear: both;
+        margin-top: 15px;
+    }
+    .button-bar > div,
+    .button-bar > button,
+    .button-bar > span {
+        float: left !important;
+        clear: both !important;
+        margin-bottom: 10px;
+    }
+    .button-bar > div > button.btn {
+        float: left !important;
+        clear: both !important;
+    }
+    .home-padded-header .button-bar {
+        margin-top: 10px;
+        margin-bottom: 15px;
+    }
+}
+@media only screen
+  and (min-device-width: 740px)
+  and (max-device-width: 1024px) {
+    .button-bar {
+        float: right !important;
+    }
+    .button-bar > div > button.btn {
+        float: left !important;
+        clear: both !important;
+    }
+    .home-padded-header .button-bar {
+        float: left !important;
+    }
+}
 #search_form {
     width: 300px;
     padding: 8px 15px;
@@ -3390,22 +3420,10 @@ pre::-webkit-scrollbar-thumb {
 .notification-params tr:nth-child(even) td {
     background-color: rgba(255,255,255,0.010);
 }
-#days-selection label {
-    margin-bottom: 0;
-}
-#graph-days {
-    margin: 0;
-    width: 75px;
-    height: 34px;
-}
+#days-selection label,
 #months-selection label {
     margin-bottom: 0;
 }
-#graph-months {
-	margin: 0;
-	width: 75px;
-	height: 34px;
-}
 .card-sortable {
     height: 36px;
     padding: 0 20px 0 0;
@@ -3922,3 +3940,14 @@ a:hover .overlay-refresh-image:hover {
 .stream-info tr:nth-child(even) td {
     background-color: rgba(255,255,255,0.010);
 }
+.number-input {
+    margin: 0 !important;
+    width: 55px !important;
+    height: 34px !important;
+    -moz-appearance: textfield;
+}
+.number-input::-webkit-inner-spin-button,
+.number-input::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}

data/interfaces/default/current_activity_instance.html

@@ -279,6 +279,9 @@ DOCUMENTATION :: END
                                     <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']:
+                                        <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']}">
                                             <span id="external_ip-${sk}" class="external-ip-tooltip" data-toggle="tooltip" title="Lookup External IP" style="display: none;"><i class="fa fa-map-marker"></i></span>
                                         </a>
@@ -289,6 +292,7 @@ DOCUMENTATION :: END
                                                 $("#external_ip-${sk}").show();
                                             });
                                         </script>
+                                        % endif
                                     % else:
                                     N/A
                                     % endif

data/interfaces/default/graphs.html

@@ -2,7 +2,7 @@
 
 <%def name="headIncludes()">
 <link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
-<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 </%def>
 
 <%def name="body()">
@@ -11,7 +11,7 @@
         <div class="header-bar">
             <span><i class="fa fa-bar-chart"></i> Graphs</span>
         </div>
-        <div class="button-bar hidden-xs">
+        <div class="button-bar">
             <div class="btn-group" id="user-selection">
                 <label>
                     <select name="graph-user" id="graph-user" class="btn" style="color: inherit;">
@@ -39,12 +39,12 @@
             </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" 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="${config['graph_days']}" 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" 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="${config['graph_months']}" min="1" data-default="12" data-toggle="tooltip" title="Min: 1 month" />
                 <span class="input-group-addon btn-dark inactive">months</span>
 			</div>
         </div>

data/interfaces/default/history.html

@@ -3,7 +3,7 @@
 <%def name="headIncludes()">
 <link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
 <link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 </%def>
 
 <%def name="body()">

data/interfaces/default/history_table_modal.html

@@ -5,7 +5,15 @@
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
             <h4 class="modal-title" id="myModalLabel">
                 <strong><span id="modal_header_ip_address">
+                    % if data.get('media_type'):
+                    <% h = {'episode': 'TV Show', 'track': 'Music'} %>
+                    <i class="fa fa-history"></i> ${h.get(data['media_type'], data['media_type'].title())} History for <span id="date-header">${data['start_date']}</span>
+                    % elif data.get('transcode_decision'):
+                    <% h = {'copy': 'Direct Stream'} %>
+                    <i class="fa fa-history"></i> ${h.get(data['transcode_decision'], data['transcode_decision'].title())} History for <span id="date-header">${data['start_date']}</span>
+                    % else:
                     <i class="fa fa-history"></i> History for <span id="date-header">${data['start_date']}</span>
+                    % endif
                 </span></strong>
             </h4>
         </div>
@@ -13,11 +21,18 @@
             <table class="display history_table" id="history_table_modal" width="100%">
                 <thead>
                 <tr>
-                    <th align="left" id="started">Started</th>
-                    <th align="left" id="stopped">Stopped</th>
+                    <th align="left" id="delete_row">Delete</th>
+                    <th align="left" id="date">Date</th>
                     <th align="left" id="friendly_name">User</th>
-                    <th align="left" id="player">Player</th>
+                    <th align="left" id="ip_address">IP Address</th>
+                    <th align="left" id="platform">Platform</th>
+                    <th align="left" id="device">Player</th>
                     <th align="left" id="title">Title</th>
+                    <th align="left" id="started">Started</th>
+                    <th align="left" id="paused_counter">Paused</th>
+                    <th align="left" id="stopped">Stopped</th>
+                    <th align="left" id="duration">Duration</th>
+                    <th align="left" id="percent_complete"></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -28,28 +43,31 @@
     </div>
 </div>
 
-<script src="${http_root}js/tables/history_table_modal.js${cache_param}"></script>
+<script src="${http_root}js/tables/history_table.js${cache_param}"></script>
 <script>
     $(document).ready(function() {
         $('#date-header').html(moment('${data["start_date"]}','YYYY-MM-DD').format('ddd MMM Do YYYY'));
-        history_table_modal_options.ajax = {
+        history_table_options.ajax = {
             url: 'get_history',
-            type: 'post',
             data: function ( d ) {
                 return {
                     json_data: JSON.stringify(d),
-                    grouping: false,
                     user_id: "${data['user_id']}",
                     start_date: "${data['start_date']}",
                     media_type: "${data.get('media_type')}",
                     transcode_decision: "${data.get('transcode_decision')}"
                 };
             }
-        }
+        };
 
-        history_table = $('#history_table_modal').DataTable(history_table_modal_options);
+        history_table = $('#history_table_modal').DataTable(history_table_options);
+        history_table.columns([0, 3, 4, 8, 10, 11]).visible(false);
 
         clearSearchButton('history_table_modal', history_table);
+
+        $('#history-modal').on('shown.bs.modal', function() {
+            history_table.columns.adjust().draw();
+        });
     });
 </script>
 % else:

data/interfaces/default/home_stats.html

@@ -88,11 +88,11 @@ DOCUMENTATION :: END
                 % if stat_id in ('top_music', 'popular_music'):
                 <div id="stats-thumb-${stat_id}-bg" class="dashboard-stats-poster-blur" style="background-image: url(pms_image_proxy?img=${row0['thumb']}&width=300&height=300&fallback=cover);"></div>
                 % endif
-                <% type = 'cover' if stat_id in ('top_music', 'popular_music') else 'poster' %>
+                <% height, type = ('300', 'cover') if stat_id in ('top_music', 'popular_music') else ('450', 'poster') %>
                 <% href = 'info?rating_key={}'.format(row0['rating_key']) if row0['rating_key'] else '#' %>
                 <a id="stats-thumb-url-${stat_id}" href="${href}" title="${row0['title']}">
                     % if row0['thumb']:
-                    <div id="stats-thumb-${stat_id}" class="dashboard-stats-${type}" style="background-image: url(pms_image_proxy?img=${row0['thumb']}&width=300&height=300&fallback=${type});"></div>
+                    <div id="stats-thumb-${stat_id}" class="dashboard-stats-${type}" style="background-image: url(pms_image_proxy?img=${row0['thumb']}&width=300&height=${height}&fallback=${type});"></div>
                     % else:
                     <div id="stats-thumb-${stat_id}" class="dashboard-stats-${type}" style="background-image: url(images/${type}.png);"></div>
                     % endif
@@ -217,7 +217,8 @@ DOCUMENTATION :: END
                 $('#stats-thumb-' + stat_id).css('background-image', 'url(pms_image_proxy?img=' + thumb + '&width=300&height=' + height + '&fallback=' + fallback + ')');
                 $('#stats-thumb-' + stat_id + '-bg').css('background-image', 'url(pms_image_proxy?img=' + thumb + '&width=300&height=' + height + '&fallback=' + fallback + ')');
             } else {
-                $('#stats-background-' + stat_id).css('background-image', 'url(images/' + fallback + '.png)');
+                $('#stats-thumb-' + stat_id).css('background-image', 'url(images/' + fallback + '.png)');
+                $('#stats-thumb-' + stat_id + '-bg').css('background-image', 'url(images/' + fallback + '.png)');
             }
         }
     }

data/interfaces/default/index.html

@@ -22,7 +22,16 @@
                 </h3>
             </div>
             <div id="currentActivity">
+                <% from plexpy import PLEX_SERVER_UP %>
+                % if PLEX_SERVER_UP:
                 <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i> Checking for activity...</div>
+                % else:
+                <div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.
+                    % if _session['user_group'] == 'admin':
+                    Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.
+                    % endif
+                </div>
+                % endif
             </div>
         </div>
     </div>
@@ -31,6 +40,7 @@
         <div class="col-md-12">
             <div class="home-padded-header padded-header">
                 <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">
@@ -50,12 +60,13 @@
                     </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" 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="${config['home_stats_length']}" min="1" data-default="30" data-toggle="tooltip" title="Min: 1 day" />
                         <span class="input-group-addon btn-dark inactive">days</span>
                     </div>
                 </div>
             </div>
         </div>
+    </div>
     <div class="row">
         <div class="col-md-12">
             <div id="home-stats" class="home-platforms">
@@ -69,10 +80,12 @@
         <div class="col-md-12">
             <div class="home-padded-header padded-header" id="library-statistics-header">
                 <h3 class="pull-left">Library Statistics</h3>
+                <div class="button-bar">
                     <span class="btn btn-dark active" style="cursor: default">${config['pms_name']}</span>
                 </div>
             </div>
         </div>
+    </div>
     <div class="row">
         <div class="col-md-12">
             <div id="library-stats" class="library-platforms">
@@ -94,6 +107,7 @@
                         <a href="#" id="recently-added-page-right" class="paginate btn-gray disabled" data-id="-1"><i class="fa fa-lg fa-chevron-right"></i></a>
                     </li>
                 </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
@@ -109,12 +123,13 @@
                         </label>
                     </div>
                     <div class="input-group pull-left" style="width: 1px;" id="recently-added-count-selection">
-                    <input type="number" class="form-control" name="recently-added-count" id="recently-added-count" value="${config['home_stats_recently_added_count']}" min="1" max="100" data-default="50" data-toggle="tooltip" title="Min: 1 item<br>Max: 100 items" />
+                        <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="100" data-default="50" data-toggle="tooltip" title="Min: 1 item<br>Max: 100 items" />
                         <span class="input-group-addon btn-dark inactive">items</span>
                     </div>
                 </div>
             </div>
         </div>
+    </div>
     <div class="row">
         <div class="col-md-12">
             <div id="recentlyAdded" style="margin-right: -15px;">
@@ -131,13 +146,13 @@
 <%def name="modalIncludes()">
 
 % if _session['user_group'] == 'admin' and config['update_show_changelog']:
-<% from plexpy.common import VERSION_NUMBER %>
+<% from plexpy.common import RELEASE %>
 <div id="changelog-modal" class="modal fade wide" tabindex="-1" role="dialog" aria-labelledby="changelog-modal">
     <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">Tautulli Updated to <strong>${VERSION_NUMBER}</strong></h4>
+                <h4 class="modal-title">Tautulli Updated to <strong>${RELEASE}</strong></h4>
             </div>
             <div class="modal-body">
             </div>
@@ -235,9 +250,10 @@
                 });
             }
         });
-    };
+    }
 </script>
-% if 'current_activity' in config['home_sections']:
+<% from plexpy import PLEX_SERVER_UP %>
+% if 'current_activity' in config['home_sections'] and PLEX_SERVER_UP:
 <script>
     var defaultHandler = {
         get: function(target, name) {
@@ -274,9 +290,9 @@
 
                 if (!(current_activity)) {
                     % if _session['user_group'] == 'admin':
-                    var msg_settings = ' Verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.';
+                    var msg_settings = ' Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.';
                     % else:
-                    var msg_settings = ''
+                    var msg_settings = '';
                     % endif
                     $('#currentActivityHeader').hide();
                     $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.' + msg_settings + '</div>');

data/interfaces/default/info.html

@@ -64,7 +64,7 @@ DOCUMENTATION :: END
 <%def name="headIncludes()">
 <link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
 <link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 </%def>
 
 <%def name="body()">
@@ -521,6 +521,7 @@ DOCUMENTATION :: END
                             % endfor
                         </select>
                     </div>
+                    <p class="help-block">Note: All custom notification conditions will be bypassed.</p>
                 </div>
             </div>
             <div class="modal-footer">

data/interfaces/default/js/tables/history_table.js

@@ -270,7 +270,7 @@ history_table_options = {
         });
 
         if ($('#row-edit-mode').hasClass('active')) {
-            $('.delete-control').each(function () {
+            $('.history_table .delete-control').each(function () {
                 $(this).removeClass('hidden');
             });
         }
@@ -290,7 +290,9 @@ history_table_options = {
     },
     "preDrawCallback": function(settings) {
         var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
-        showMsg(msg, false, false, 0)
+        showMsg(msg, false, false, 0);
+        $('[data-toggle="tooltip"]').tooltip('destroy');
+        $('[data-toggle="popover"]').popover('destroy');
     },
     "rowCallback": function (row, rowData, rowIndex) {
         if (rowData['group_count'] == 1) {
@@ -464,7 +466,7 @@ function childTableOptions(rowData) {
         });
 
         if ($('#row-edit-mode').hasClass('active')) {
-            $('.delete-control').each(function () {
+            $('.history_table .delete-control').each(function () {
                 $(this).removeClass('hidden');
             });
         }

data/interfaces/default/js/tables/login_logs.js

@@ -113,7 +113,7 @@ login_log_table_options = {
         var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
         showMsg(msg, false, false, 0)
     }
-}
+};
 
 $('.login_log_table').on('click', '> tbody > tr > td.modal-control-ip', function () {
     var tr = $(this).closest('tr');

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

@@ -139,6 +139,13 @@ sync_table_options = {
         // $('html,body').scrollTop(0);
 
         $('#ajaxMsg').fadeOut();
+
+        if ($('#sync-row-edit-mode').hasClass('active')) {
+            $('.sync_table .delete-control').each(function () {
+                $(this).removeClass('hidden');
+            });
+        }
+
     },
     "preDrawCallback": function (settings) {
         var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
@@ -146,7 +153,7 @@ sync_table_options = {
     }
 };
 
-$('#sync_table').on('click', 'td.delete-control > .edit-sync-toggles > button.delete-sync', function () {
+$('.sync_table').on('click', 'td.delete-control > .edit-sync-toggles > button.delete-sync', function () {
     var tr = $(this).parents('tr');
     var row = sync_table.row(tr);
     var rowData = row.data();

data/interfaces/default/libraries.html

@@ -3,7 +3,7 @@
 <%def name="headIncludes()">
 <link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
 <link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 </%def>
 
 <%def name="body()">

data/interfaces/default/library.html

@@ -30,7 +30,7 @@ DOCUMENTATION :: END
 <%def name="headIncludes()">
 <link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
 <link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 </%def>
 
 <%def name="body()">
@@ -382,7 +382,7 @@ DOCUMENTATION :: END
                     user_id: "${_session['user_id']}" == "None" ? null : "${_session['user_id']}"
                 };
             }
-        }
+        };
         history_table = $('#history_table-SID-${data["section_id"]}').DataTable(history_table_options);
 
         var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 11] });
@@ -392,7 +392,13 @@ DOCUMENTATION :: END
     }
 
     $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
+        if (typeof(history_table) === 'undefined') {
             loadHistoryTable();
+        }
+    });
+
+    $("#refresh-history-list").click(function () {
+        history_table.draw();
     });
 
     % if _session['user_group'] == 'admin':
@@ -408,7 +414,7 @@ DOCUMENTATION :: END
                     refresh: refresh_table
                 };
             }
-        }
+        };
         media_info_table = $('#media_info_table-SID-${data["section_id"]}').DataTable(media_info_table_options);
 
         var colvis = new $.fn.dataTable.ColVis(media_info_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
@@ -418,7 +424,9 @@ DOCUMENTATION :: END
     }
 
     $('a[href="#tabs-mediainfo"]').on('shown.bs.tab', function() {
+        if (typeof(media_info_table) === 'undefined') {
             loadMediaInfoTable();
+        }
     });
 
     $("#refresh-media-info-table").click(function () {
@@ -484,10 +492,6 @@ DOCUMENTATION :: END
     });
     % endif
 
-    $("#refresh-history-list").click(function () {
-        history_table.draw();
-    });
-
     function recentlyWatched() {
         // Populate recently watched
         $.ajax({

data/interfaces/default/login.html

@@ -9,7 +9,7 @@
     <meta name="author" content="">
     <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
     <link href="${http_root}css/pnotify.custom.min.css" rel="stylesheet" />
-    <link href="${http_root}css/plexpy.css${cache_param}" rel="stylesheet">
+    <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
     <link href="${http_root}css/opensans.min.css" rel="stylesheet">
     <link href="${http_root}css/font-awesome.min.css" rel="stylesheet">
 
@@ -37,7 +37,7 @@
         <div class="row">
             <div class="login-container">
                 <div class="login-logo">
-                    <object data="${http_root}images/logo-tautulli.svg" type="image/svg+xml" style="height: 100px;"></object>
+                    <img src="${http_root}images/logo-tautulli-100.png" height="100" alt="PlexPy">
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-sm-offset-3">

data/interfaces/default/logs.html

@@ -5,7 +5,7 @@
 
 <%def name="headIncludes()">
 <link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
-<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 <style>
     td {word-break: break-all;}
 </style>
@@ -21,9 +21,9 @@
             <span><i class="fa fa-list-alt"></i> Logs</span>
         </div>
         <div class="button-bar">
-            <div class="btn-group" id="plexpy-log-levels">
+            <div class="btn-group" id="tautulli-log-levels">
                 <label>
-                    <select name="plexpy-log-level-filter" id="plexpy-log-level-filter" class="btn" style="color: inherit;">
+                    <select name="tautulli-log-level-filter" id="tautulli-log-level-filter" class="btn" style="color: inherit;">
                         <option value="">All log levels</option>
                         <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
                         <option value="DEBUG">Debug</option>
@@ -45,7 +45,7 @@
                     </select>
                 </label>
             </div>
-            <button class="btn btn-dark" id="download-plexpylog"><i class="fa fa-download"></i> Download logs</button>
+            <button class="btn btn-dark" id="download-tautullilog"><i class="fa fa-download"></i> Download logs</button>
             <button class="btn btn-dark" id="download-plexserverlog" style="display: none;"><i class="fa fa-download"></i> Download logs</button>
             <button class="btn btn-dark" id="download-plexscannerlog" style="display: none;"><i class="fa fa-download"></i> Download logs</button>
             <button class="btn btn-dark" id="clear-logs"><i class="fa fa-trash-o"></i> Clear logs</button>
@@ -56,17 +56,17 @@
     <div class='table-card-back'>
         <div>
             <ul id="log_tabs" class="nav nav-pills" role="tablist">
-                <li role="presentation" class="active"><a id="plexpy-logs-btn" href="#tabs-plexpy_log" aria-controls="tabs-plexpy_log" role="tab" data-toggle="tab">Tautulli Logs</a></li>
-                <li role="presentation"><a id="plexpy-api-logs-btn" href="#tabs-plexpy_api_log" aria-controls="tabs-plexpy_api_log" role="tab" data-toggle="tab">Tautulli API Logs</a></li>
+                <li role="presentation" class="active"><a id="tautulli-logs-btn" href="#tabs-tautulli_log" aria-controls="tabs-tautulli_log" role="tab" data-toggle="tab">Tautulli Logs</a></li>
+                <li role="presentation"><a id="tautulli-api-logs-btn" href="#tabs-tautulli_api_log" aria-controls="tabs-tautulli_api_log" role="tab" data-toggle="tab">Tautulli API Logs</a></li>
                 <li role="presentation"><a id="plex-logs-btn" href="#tabs-plex_log" aria-controls="tabs-plex_log" role="tab" data-toggle="tab">Plex Media Server Logs</a></li>
                 <li role="presentation"><a id="plex-scanner-logs-btn" href="#tabs-plex_scanner_log" aria-controls="tabs-plex_scanner_log" role="tab" data-toggle="tab">Plex Media Scanner Logs</a></li>
-                <li role="presentation"><a id="plexpy-websocket-logs-btn" href="#tabs-plex_websocket_log" aria-controls="tabs-plex_websocket_log" role="tab" data-toggle="tab">Plex Websocket Logs</a></li>
+                <li role="presentation"><a id="plex-websocket-logs-btn" href="#tabs-plex_websocket_log" aria-controls="tabs-plex_websocket_log" role="tab" data-toggle="tab">Plex Websocket Logs</a></li>
                 <li role="presentation"><a id="notification-logs-btn" href="#tabs-notification_log" aria-controls="tabs-notification_log" role="tab" data-toggle="tab">Notification Logs</a></li>
                 <li role="presentation"><a id="login-logs-btn" href="#tabs-login_log" aria-controls="tabs-login_log" role="tab" data-toggle="tab">Login Logs</a></li>
             </ul>
             <div class="tab-content">
-                <div role="tabpanel" class="tab-pane active" id="tabs-plexpy_log" data-logfile="plexpy">
-                    <table class="display" id="plexpy_log_table" width="100%">
+                <div role="tabpanel" class="tab-pane active" id="tabs-tautulli_log" data-logfile="tautulli">
+                    <table class="display" id="tautulli_log_table" width="100%">
                         <thead>
                             <tr>
                                 <th class="min-tablet" align="left" id="timestamp">Timestamp</th>
@@ -77,8 +77,8 @@
                         <tbody></tbody>
                     </table>
                 </div>
-                <div role="tabpanel" class="tab-pane" id="tabs-plexpy_api_log" data-logfile="plexpy_api">
-                    <table class="display" id="plexpy_api_log_table" width="100%">
+                <div role="tabpanel" class="tab-pane" id="tabs-tautulli_api_log" data-logfile="tautulli_api">
+                    <table class="display" id="tautulli_api_log_table" width="100%">
                         <thead>
                             <tr>
                                 <th class="min-tablet" align="left" id="timestamp">Timestamp</th>
@@ -195,8 +195,8 @@
 <script>
 
         $(document).ready(function() {
-            loadPlexPyLogs('plexpy', selected_log_level);
-            clearSearchButton('plexpy_log_table', log_table);
+            loadtautullilogs('tautulli', selected_log_level);
+            clearSearchButton('tautulli_log_table', log_table);
         });
 
         var log_levels = ['DEBUG', 'INFO', 'WARN', 'ERROR'];
@@ -227,7 +227,7 @@
         }
 
         var selected_log_level = null;
-        function loadPlexPyLogs(logfile, selected_log_level) {
+        function loadtautullilogs(logfile, selected_log_level) {
             log_table_options.ajax = {
                 url: "get_log",
                 type: 'post',
@@ -238,10 +238,10 @@
                         log_level: selected_log_level
                     };
                 }
-            }
+            };
             log_table = $('#' + logfile + '_log_table').DataTable(log_table_options);
 
-            $('#plexpy-log-level-filter').on('change', function () {
+            $('#tautulli-log-level-filter').on('change', function () {
                 selected_log_level = $(this).val() || null;
                 log_table.draw();
             });
@@ -250,7 +250,7 @@
         function loadPlexLogs() {
             plex_log_table_options.ajax = {
                 url: "get_plex_log?log_type=server"
-            }
+            };
             plex_log_table_options.initComplete = bindLogLevelFilter;
             plex_log_table = $('#plex_log_table').DataTable(plex_log_table_options);
         }
@@ -258,7 +258,7 @@
         function loadPlexScannerLogs() {
             plex_log_table_options.ajax = {
                 url: "get_plex_log?log_type=scanner"
-            }
+            };
             plex_log_table_options.initComplete = bindLogLevelFilter;
             plex_scanner_log_table = $('#plex_scanner_log_table').DataTable(plex_log_table_options);
         }
@@ -271,7 +271,7 @@
                         json_data: JSON.stringify(d)
                     };
                 }
-            }
+            };
             notification_log_table = $('#notification_log_table').DataTable(notification_log_table_options);
         }
 
@@ -284,56 +284,56 @@
                         json_data: JSON.stringify(d)
                     };
                 }
-            }
+            };
             login_log_table = $('#login_log_table').DataTable(login_log_table_options);
         }
 
-        $("#plexpy-logs-btn").click(function () {
-            $("#plexpy-log-levels").show();
+        $("#tautulli-logs-btn").click(function () {
+            $("#tautulli-log-levels").show();
             $("#plex-log-levels").hide();
             $("#clear-logs").show();
-            $("#download-plexpylog").show()
-            $("#download-plexserverlog").hide()
-            $("#download-plexscannerlog").hide()
+            $("#download-tautullilog").show();
+            $("#download-plexserverlog").hide();
+            $("#download-plexscannerlog").hide();
             $("#clear-notify-logs").hide();
             $("#clear-login-logs").hide();
-            loadPlexPyLogs('plexpy', selected_log_level);
-            clearSearchButton('plexpy_log_table', log_table);
+            loadtautullilogs('tautulli', selected_log_level);
+            clearSearchButton('tautulli_log_table', log_table);
         });
 
-        $("#plexpy-api-logs-btn").click(function () {
-            $("#plexpy-log-levels").show();
+        $("#tautulli-api-logs-btn").click(function () {
+            $("#tautulli-log-levels").show();
             $("#plex-log-levels").hide();
             $("#clear-logs").show();
-            $("#download-plexpylog").show()
-            $("#download-plexserverlog").hide()
-            $("#download-plexscannerlog").hide()
+            $("#download-tautullilog").show();
+            $("#download-plexserverlog").hide();
+            $("#download-plexscannerlog").hide();
             $("#clear-notify-logs").hide();
             $("#clear-login-logs").hide();
-            loadPlexPyLogs('plexpy_api', selected_log_level);
-            clearSearchButton('plexpy_api_log_table', log_table);
+            loadtautullilogs('tautulli_api', selected_log_level);
+            clearSearchButton('tautulli_api_log_table', log_table);
         });
 
-        $("#plexpy-websocket-logs-btn").click(function () {
-            $("#plexpy-log-levels").show();
+        $("#plex-websocket-logs-btn").click(function () {
+            $("#tautulli-log-levels").show();
             $("#plex-log-levels").hide();
             $("#clear-logs").show();
-            $("#download-plexpylog").show()
-            $("#download-plexserverlog").hide()
-            $("#download-plexscannerlog").hide()
+            $("#download-tautullilog").show();
+            $("#download-plexserverlog").hide();
+            $("#download-plexscannerlog").hide();
             $("#clear-notify-logs").hide();
             $("#clear-login-logs").hide();
-            loadPlexPyLogs('plex_websocket', selected_log_level);
+            loadtautullilogs('plex_websocket', selected_log_level);
             clearSearchButton('plex_websocket_log_table', log_table);
         });
 
         $("#plex-logs-btn").click(function () {
-            $("#plexpy-log-levels").hide();
+            $("#tautulli-log-levels").hide();
             $("#plex-log-levels").show();
             $("#clear-logs").hide();
-            $("#download-plexpylog").hide()
-            $("#download-plexserverlog").show()
-            $("#download-plexscannerlog").hide()
+            $("#download-tautullilog").hide();
+            $("#download-plexserverlog").show();
+            $("#download-plexscannerlog").hide();
             $("#clear-notify-logs").hide();
             $("#clear-login-logs").hide();
             loadPlexLogs();
@@ -341,12 +341,12 @@
         });
 
         $("#plex-scanner-logs-btn").click(function () {
-            $("#plexpy-log-levels").hide();
+            $("#tautulli-log-levels").hide();
             $("#plex-log-levels").show();
             $("#clear-logs").hide();
-            $("#download-plexpylog").hide()
-            $("#download-plexserverlog").hide()
-            $("#download-plexscannerlog").show()
+            $("#download-tautullilog").hide();
+            $("#download-plexserverlog").hide();
+            $("#download-plexscannerlog").show();
             $("#clear-notify-logs").hide();
             $("#clear-login-logs").hide();
             loadPlexScannerLogs();
@@ -354,12 +354,12 @@
         });
 
         $("#notification-logs-btn").click(function () {
-            $("#plexpy-log-levels").hide();
+            $("#tautulli-log-levels").hide();
             $("#plex-log-levels").hide();
             $("#clear-logs").hide();
-            $("#download-plexpylog").hide()
-            $("#download-plexserverlog").hide()
-            $("#download-plexscannerlog").hide()
+            $("#download-tautullilog").hide();
+            $("#download-plexserverlog").hide();
+            $("#download-plexscannerlog").hide();
             $("#clear-notify-logs").show();
             $("#clear-login-logs").hide();
             loadNotificationLogs();
@@ -367,12 +367,12 @@
         });
 
         $("#login-logs-btn").click(function () {
-            $("#plexpy-log-levels").hide();
+            $("#tautulli-log-levels").hide();
             $("#plex-log-levels").hide();
             $("#clear-logs").hide();
-            $("#download-plexpylog").hide()
-            $("#download-plexserverlog").hide()
-            $("#download-plexscannerlog").hide()
+            $("#download-tautullilog").hide();
+            $("#download-plexserverlog").hide();
+            $("#download-plexscannerlog").hide();
             $("#clear-notify-logs").hide();
             $("#clear-login-logs").show();
             loadLoginLogs();
@@ -384,8 +384,8 @@
         });
 
         $("#clear-logs").click(function () {
-            var logfile = $(".tab-pane.active").data('logfile')
-            var title = $("#log_tabs li.active a").text()
+            var logfile = $(".tab-pane.active").data('logfile');
+            var title = $("#log_tabs li.active a").text();
 
             $("#confirm-message").text("Are you sure you want to clear the " + title + "?");
             $('#confirm-modal').modal();
@@ -397,7 +397,7 @@
                     complete: function (xhr, status) {
                         result = $.parseJSON(xhr.responseText);
                         msg = result.message;
-                        if (result.result == 'success') {
+                        if (result.result === 'success') {
                             showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000)
                         } else {
                             showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true)
@@ -408,7 +408,7 @@
             });
         });
 
-        $("#download-plexpylog").click(function () {
+        $("#download-tautullilog").click(function () {
             var logfile = $(".tab-pane.active").data('logfile');
             window.location.href = "download_log?logfile=" + logfile;
         });
@@ -431,7 +431,7 @@
                     complete: function (xhr, status) {
                         result = $.parseJSON(xhr.responseText);
                         msg = result.message;
-                        if (result.result == 'success') {
+                        if (result.result === 'success') {
                             showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000)
                         } else {
                             showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true)
@@ -452,7 +452,7 @@
                     complete: function (xhr, status) {
                         result = $.parseJSON(xhr.responseText);
                         msg = result.message;
-                        if (result.result == 'success') {
+                        if (result.result === 'success') {
                             showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000)
                         } else {
                             showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true)
@@ -473,10 +473,10 @@
                 {
                     clearInterval(timer);
                 }
-                if(refreshrate.value != 0)
+                if(refreshrate.value !== 0)
                 {
                     timer = setInterval(function() {
-                        if ($("#tabs-plexpy_log").hasClass("active") || $("#tabs-plexpy_api_log").hasClass("active") || $("#tabs-plex_websocket_log").hasClass("active")) {
+                        if ($("#tabs-tautulli_log").hasClass("active") || $("#tabs-tautulli_api_log").hasClass("active") || $("#tabs-plex_websocket_log").hasClass("active")) {
                             log_table.ajax.reload();
                         } else if ($("#tabs-plex_log").hasClass("active")) {
                             plex_log_table.ajax.reload();

data/interfaces/default/settings.html

@@ -60,9 +60,9 @@
                 <input type="hidden" id="show_advanced_settings" name="show_advanced_settings" value="${config['show_advanced_settings']}" required>
                 <div class="tab-content">
                     <div role="tabpanel" class="tab-pane active" id="tabs-help_info">
-                        % if common.VERSION_NUMBER:
+                        % if common.RELEASE:
                         <div class="padded-header">
-                            <h3>Version ${common.VERSION_NUMBER} <small><a id="changelog-modal-link" href="#"><i class="fa fa-info-circle"></i> Changelog</a></small></h3>
+                            <h3>Version ${common.RELEASE} <small><a id="changelog-modal-link" href="#"><i class="fa fa-info-circle"></i> Changelog</a></small></h3>
                         </div>
                         % endif
                         <div class="padded-header">
@@ -113,9 +113,9 @@
                         </div>
                         <div class="checkbox advanced-setting">
                             <label>
-                                <input type="checkbox" id="group_history_tables" name="group_history_tables" value="1" ${config['group_history_tables']}> Group Table and Watch Statistics History
+                                <input type="checkbox" id="group_history_tables" name="group_history_tables" value="1" ${config['group_history_tables']}> Group Successive Play History
                             </label>
-                            <p class="help-block">Group successive play history by the same user as a single entry in the tables and watch statistics.</p>
+                            <p class="help-block">Group successive play history by the same user as a single entry in the watch statistics, tables, and graphs.</p>
                         </div>
                         <div class="checkbox advanced-setting">
                             <label>

data/interfaces/default/shutdown.html

@@ -41,13 +41,16 @@
 
 <%def name="javascriptIncludes()">
 <script>
+    // Remove the update bar
+    $('#updatebar').remove();
+
     // Use p.countdown as container, pass redirect, duration, and optional message
     $(".countdown").countdown(reloadPage, ${timer}, "");
-    $('#state-change-modal').modal({
-        keyboard: false
-    })
     // Make modal visible
-    $('#state-change-modal').modal('show')
+    $('#state-change-modal').modal({
+        backdrop: 'static',
+        keyboard: false
+    }).show();
 
     // Redirect to home page after countdown.
     function reloadPage() {

data/interfaces/default/sync.html

@@ -2,7 +2,7 @@
 
 <%def name="headIncludes()">
 <link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
-<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 <link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
 <style>
     td {word-wrap: break-word}
@@ -20,10 +20,10 @@
         </div>
         <div class="button-bar">
             % if _session['user_group'] == 'admin':
-            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect syncs to delete. Data is deleted upon exiting edit mode.</div>
+            <div class="alert alert-danger alert-edit" role="alert" id="sync-row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect syncs to delete. Data is deleted upon exiting delete mode.</div>
             <div class="btn-group">
-                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
-                    <i class="fa fa-pencil"></i> Edit mode
+                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="sync-row-edit-mode">
+                    <i class="fa fa-trash-o"></i> Delete mode
                 </button>&nbsp
             </div>
             % endif
@@ -44,7 +44,7 @@
         </div>
     </div>
     <div class='table-card-back'>
-        <table class="display" id="sync_table" width="100%">
+        <table class="display sync_table" id="sync_table" width="100%">
             <thead>
             <tr>
                 <th align="left" id="delete_row">Delete</th>
@@ -138,8 +138,8 @@
         loadSyncTable(selected_user_id);
 
         % if _session['user_group'] == 'admin':
-        $('#row-edit-mode').on('click', function() {
-            $('#row-edit-mode-alert').fadeIn(200);
+        $('#sync-row-edit-mode').on('click', function() {
+            $('#sync-row-edit-mode-alert').fadeIn(200);
 
             if ($(this).hasClass('active')) {
                 if (syncs_to_delete.length > 0) {
@@ -161,13 +161,13 @@
                                 }
                             });
                         });
-                        sync_table.draw();
+                        sync_table.ajax.reload();
                     });
                 }
 
                 $('.delete-control').each(function () {
                     $(this).addClass('hidden');
-                    $('#row-edit-mode-alert').fadeOut(200);
+                    $('#sync-row-edit-mode-alert').fadeOut(200);
                 });
 
             } else {
@@ -182,7 +182,7 @@
     });
 
     $("#refresh-syncs-list").click(function() {
-        sync_table.draw();
+        sync_table.ajax.reload();
     });
 </script>
 </%def>

data/interfaces/default/user.html

@@ -32,7 +32,7 @@ DOCUMENTATION :: END
 <%def name="headIncludes()">
 <link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
 <link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 </%def>
 
 <%def name="body()">
@@ -213,13 +213,25 @@ DOCUMENTATION :: END
                                             </span>
                                         </div>
                                         <div class="button-bar">
+                                            % if _session['user_group'] == 'admin':
+                                            <div class="alert alert-danger alert-edit" role="alert" id="sync-row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect syncs to delete. Data is deleted upon exiting delete mode.</div>
+                                            <div class="btn-group">
+                                                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="sync-row-edit-mode">
+                                                    <i class="fa fa-trash-o"></i> Delete mode
+                                                </button>&nbsp
+                                            </div>
+                                            % endif
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark refresh-syncs-button" id="refresh-syncs-list"><i class="fa fa-refresh"></i> Refresh synced items</button>
+                                            </div>
                                             <div class="btn-group colvis-button-bar" id="button-bar-sync"></div>
                                         </div>
                                     </div>
                                     <div class="table-card-back">
-                                        <table class="display" id="sync_table-UID-${data['user_id']}" width="100%">
+                                        <table class="display sync_table" id="sync_table-UID-${data['user_id']}" width="100%">
                                             <thead>
                                                 <tr>
+                                                    <th align="left" id="delete_row">Delete</th>
                                                     <th align="left" id="state">State</th>
                                                     <th align="left" id="username">Username</th>
                                                     <th align="left" id="sync_title">Title</th>
@@ -252,6 +264,11 @@ DOCUMENTATION :: END
                                                 </strong>
                                             </span>
                                         </div>
+                                        <div class="button-bar">
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark refresh-ip-address-button" id="refresh-ip-address-list"><i class="fa fa-refresh"></i> Refresh IP addresses</button>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="table-card-back">
                                         <table class="display user_ip_table" id="user_ip_table-UID-${data['user_id']}" width="100%">
@@ -284,6 +301,9 @@ DOCUMENTATION :: END
                                             </span>
                                         </div>
                                         <div class="button-bar">
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark refresh-login-button" id="refresh-login-list"><i class="fa fa-refresh"></i> Refresh logins</button>
+                                            </div>
                                             <div class="btn-group colvis-button-bar" id="button-bar-login"></div>
                                         </div>
                                     </div>
@@ -298,6 +318,7 @@ DOCUMENTATION :: END
                                                     <th align="left" id="host">Host</th>
                                                     <th align="left" id="os">Operating System</th>
                                                     <th align="left" id="browser">Browser</th>
+                                                    <th align="left" id="login_success"></th>
                                                 </tr>
                                             </thead>
                                             <tbody></tbody>
@@ -351,7 +372,7 @@ DOCUMENTATION :: END
                 <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
             </div>
             <div class="modal-body" style="text-align: center;">
-                <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> history item(s)?</p>
+                <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> <span id="deleteType"></span> item(s)?</p>
                 <p>This is permanent and cannot be undone!</p>
             </div>
             <div class="modal-footer">
@@ -388,11 +409,6 @@ DOCUMENTATION :: END
         $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
     });
 
-    $('a[href="#tabs-profile"]').on('shown.bs.tab', function() {
-        var media_type = null;
-        loadHistoryTable(media_type);
-    });
-
     function loadHistoryTable(media_type) {
         // Build watch history table
         history_table_options.ajax = {
@@ -405,7 +421,7 @@ DOCUMENTATION :: END
                     media_type: media_type
                 };
             }
-        }
+        };
         history_table = $('#history_table-UID-${data["user_id"]}').DataTable(history_table_options);
         history_table.column(2).visible(false);
 
@@ -423,29 +439,21 @@ DOCUMENTATION :: END
         });
     }
 
-    $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
-        var media_type = null;
-        loadHistoryTable(media_type);
-    });
-
-    $('a[href="#tabs-synceditems"]').on('shown.bs.tab', function() {
+    function loadSyncTable() {
         // Build user sync table
         sync_table_options.ajax = {
-            url: 'get_sync',
-            data: function(d) {
-                d.user_id = user_id;
-            }
-        }
+             url: 'get_sync?user_id=' + user_id
+        };
         sync_table = $('#sync_table-UID-${data["user_id"]}').DataTable(sync_table_options);
-        sync_table.column(1).visible(false);
+        sync_table.column(2).visible(false);
 
-        var colvis_sync = new $.fn.dataTable.ColVis( sync_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' } );
+        var colvis_sync = new $.fn.dataTable.ColVis( sync_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0] } );
         $( colvis_sync.button() ).appendTo('#button-bar-sync');
 
         clearSearchButton('sync_table-UID-${data["user_id"]}', sync_table);
-    });
+    }
 
-    $('a[href="#tabs-ipaddresses"]').on('shown.bs.tab', function() {
+    function loadIPAddressTable() {
         // Build user IP table
         user_ip_table_options.ajax = {
             url: 'get_user_ips',
@@ -456,27 +464,71 @@ DOCUMENTATION :: END
                     user_id: user_id
                 };
             }
-        }
+        };
         user_ip_table = $('#user_ip_table-UID-${data["user_id"]}').DataTable(user_ip_table_options);
 
         clearSearchButton('user_ip_table-UID-${data["user_id"]}', user_ip_table);
-    });
+    }
 
-    $('a[href="#tabs-tautullilogins"]').on('shown.bs.tab', function() {
+    function loadLoginTable() {
         // Build user login table
         login_log_table_options.ajax = {
             url: 'get_user_logins',
             data: function(d) {
-                d.user_id = user_id;
-            }
+                return {
+                    json_data: JSON.stringify(d),
+                    user_id: user_id
+                };
             }
+        };
         login_log_table = $('#login_log_table-UID-${data["user_id"]}').DataTable(login_log_table_options);
         login_log_table.columns([1, 2]).visible(false);
 
-        var colvis_login = new $.fn.dataTable.ColVis( login_log_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' } );
+        var colvis_login = new $.fn.dataTable.ColVis( login_log_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [7] } );
         $( colvis_login.button() ).appendTo('#button-bar-login');
 
         clearSearchButton('login_log_table-UID-${data["user_id"]}', login_log_table);
+    }
+
+    $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
+        if (typeof(history_table) === 'undefined') {
+            var media_type = null;
+            loadHistoryTable(media_type);
+        }
+    });
+
+    $('a[href="#tabs-synceditems"]').on('shown.bs.tab', function() {
+        if (typeof(sync_table) === 'undefined') {
+            loadSyncTable(user_id);
+        }
+    });
+
+    $('a[href="#tabs-ipaddresses"]').on('shown.bs.tab', function() {
+        if (typeof(user_ip_table) === 'undefined') {
+            loadIPAddressTable(user_id);
+        }
+    });
+
+    $('a[href="#tabs-tautullilogins"]').on('shown.bs.tab', function() {
+        if (typeof(login_log_table) === 'undefined') {
+            loadLoginTable(user_id);
+        }
+    });
+
+    $("#refresh-history-list").click(function () {
+        history_table.draw();
+    });
+
+    $("#refresh-syncs-list").click(function() {
+        sync_table.ajax.reload();
+    });
+
+    $("#refresh-ip-address-list").click(function () {
+        user_ip_table.draw();
+    });
+
+    $("#refresh-login-list").click(function () {
+        login_log_table.draw();
     });
 
     % if _session['user_group'] == 'admin':
@@ -502,6 +554,7 @@ DOCUMENTATION :: END
         if ($(this).hasClass('active')) {
             if (history_to_delete.length > 0) {
                 $('#deleteCount').text(history_to_delete.length);
+                $('#deleteType').text('history');
                 $('#confirm-modal-delete').modal();
                 $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
                     history_to_delete.forEach(function(row, idx) {
@@ -520,14 +573,56 @@ DOCUMENTATION :: END
                 });
             }
 
-            $('.delete-control').each(function () {
+            $('.history_table .delete-control').each(function () {
                 $(this).addClass('hidden');
                 $('#row-edit-mode-alert').fadeOut(200);
             });
 
         } else {
             history_to_delete = [];
-            $('.delete-control').each(function() {
+            $('.history_table .delete-control').each(function() {
+                $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
+                $(this).removeClass('hidden');
+            });
+        }
+    });
+
+    $('#sync-row-edit-mode').on('click', function() {
+        $('#sync-row-edit-mode-alert').fadeIn(200);
+
+        if ($(this).hasClass('active')) {
+            if (syncs_to_delete.length > 0) {
+                $('#deleteCount').text(syncs_to_delete.length);
+                $('#deleteType').text('sync');
+                $('#confirm-modal-delete').modal();
+                $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
+                    syncs_to_delete.forEach(function(row, idx) {
+                        $.ajax({
+                            url: 'delete_sync_rows',
+                            type: 'POST',
+                            data: {
+                                client_id: row.client_id,
+                                sync_id: row.sync_id
+                            },
+                            async: true,
+                            success: function (data) {
+                                var msg = "Sync deleted";
+                                showMsg(msg, false, true, 2000);
+                            }
+                        });
+                    });
+                    sync_table.ajax.reload();
+                });
+            }
+
+            $('.sync_table .delete-control').each(function () {
+                $(this).addClass('hidden');
+                $('#sync-row-edit-mode-alert').fadeOut(200);
+            });
+
+        } else {
+            syncs_to_delete = [];
+            $('.sync_table .delete-control').each(function() {
                 $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
                 $(this).removeClass('hidden');
             });
@@ -535,10 +630,6 @@ DOCUMENTATION :: END
     });
     % endif
 
-    $("#refresh-history-list").click(function () {
-        history_table.draw();
-    });
-
     function recentlyWatched() {
         // Populate recently watched
         $.ajax({

data/interfaces/default/users.html

@@ -3,7 +3,7 @@
 <%def name="headIncludes()">
 <link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
 <link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 </%def>
 
 <%def name="body()">

data/interfaces/default/welcome.html

@@ -14,7 +14,7 @@
     <meta name="author" content="">
     <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
     <link href="${http_root}css/bootstrap-wizard.css" rel="stylesheet">
-    <link href="${http_root}css/plexpy.css${cache_param}" rel="stylesheet">
+    <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
     <link href="${http_root}css/selectize.bootstrap3.css" rel="stylesheet">
     <link href="${http_root}css/opensans.min.css" rel="stylesheet">
     <link href="${http_root}css/font-awesome.min.css" rel="stylesheet">
@@ -51,7 +51,7 @@
             <form>
                 <div class="wizard-card" data-cardname="card1">
                     <div style="float: right;">
-                        <object data="${http_root}images/logo-tautulli.svg" type="image/svg+xml" style="height: 45px;"></object>
+                        <img src="${http_root}images/logo-tautulli-45.png" height="45" alt="PlexPy">
                     </div>
                     <h3 style="line-height: 50px;">Welcome!</h3>
                     <br />

init-scripts/init-alt.freebsd

@@ -1,54 +1,54 @@
 #!/bin/sh
 #
-# PROVIDE: plexpy
-# REQUIRE: plexpy
+# PROVIDE: tautulli
+# REQUIRE: tautulli
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
-# plexpy_enable (bool):     Set to NO by default.
+# tautulli_enable (bool):     Set to NO by default.
 #                       Set it to YES to enable it.
-# plexpy_user:  The user account PlexPy daemon runs as what
-#                       you want it to be. It uses 'plexpy' user by
+# tautulli_user:  The user account Tautulli daemon runs as what
+#                       you want it to be. It uses 'tautulli' user by
 #                       default. Do not sets it as empty or it will run
 #                       as root.
-# plexpy_dir:       Directory where PlexPy lives.
-#                       Default: /usr/local/plexpy
-# plexpy_chdir:  Change to this directory before running PlexPy.
-#     Default is same as plexpy_dir.
-# plexpy_pid:  The name of the pidfile to create.
-#     Default is plexpy.pid in plexpy_dir.
+# tautulli_dir:       Directory where Tautulli lives.
+#                       Default: /usr/local/share/Tautulli
+# tautulli_chdir:  Change to this directory before running Tautulli.
+#     Default is same as tautulli_dir.
+# tautulli_pid:  The name of the pidfile to create.
+#     Default is tautulli.pid in tautulli_dir.
 
 . /etc/rc.subr
 
-name="plexpy"
+name="tautulli"
 rcvar=${name}_enable
 
 load_rc_config ${name}
 
-: ${plexpy_enable:="NO"}
-: ${plexpy_user:="plexpy"}
-: ${plexpy_dir:="/usr/local/plexpy"}
-: ${plexpy_chdir:="${plexpy_dir}"}
-: ${plexpy_pid:="${plexpy_dir}/plexpy.pid"}
-: ${plexpy_conf:="${plexpy_dir}/config.ini"}
+: ${tautulli_enable:="NO"}
+: ${tautulli_user:="tautulli"}
+: ${tautulli_dir:="/usr/local/share/Tautulli"}
+: ${tautulli_chdir:="${tautulli_dir}"}
+: ${tautulli_pid:="${tautulli_dir}/tautulli.pid"}
+: ${tautulli_conf:="${tautulli_dir}/config.ini"}
 
-WGET="/usr/local/bin/wget" # You need wget for this script to safely shutdown PlexPy.
-if [ -e "${plexpy_conf}" ]; then
-        HOST=`grep -A64 "\[General\]" "${plexpy_conf}"|egrep "^http_host"|perl -wple 's/^http_host = (.*)$/$1/'`
-        PORT=`grep -A64 "\[General\]" "${plexpy_conf}"|egrep "^http_port"|perl -wple 's/^http_port = (.*)$/$1/'`
+WGET="/usr/local/bin/wget" # You need wget for this script to safely shutdown Tautulli.
+if [ -e "${tautulli_conf}" ]; then
+        HOST=`grep -A64 "\[General\]" "${tautulli_conf}"|egrep "^http_host"|perl -wple 's/^http_host = (.*)$/$1/'`
+        PORT=`grep -A64 "\[General\]" "${tautulli_conf}"|egrep "^http_port"|perl -wple 's/^http_port = (.*)$/$1/'`
 fi
 
 status_cmd="${name}_status"
 stop_cmd="${name}_stop"
 
-command="${plexpy_dir}/PlexPy.py"
-command_args="--daemon --quiet --nolaunch --port ${PORT} --pidfile ${plexpy_pid} --config ${plexpy_conf}"
+command="${tautulli_dir}/Tautulli.py"
+command_args="--daemon --quiet --nolaunch --port ${PORT} --pidfile ${tautulli_pid} --config ${tautulli_conf}"
 
 # Check for wget and refuse to start without it.
 if [ ! -x "${WGET}" ]; then
-  warn "PlexPy not started: You need wget to safely shut down PlexPy."
+  warn "Tautulli not started: You need wget to safely shut down Tautulli."
   exit 1
 fi
 
@@ -58,21 +58,21 @@ if [ `id -u` != "0" ]; then
   exit 1
 fi
 
-verify_plexpy_pid() {
-    # Make sure the pid corresponds to the PlexPy process.
-    pid=`cat ${plexpy_pid} 2>/dev/null`
-    ps -p ${pid} | grep -q "python ${plexpy_dir}/PlexPy.py"
+verify_tautulli_pid() {
+    # Make sure the pid corresponds to the Tautulli process.
+    pid=`cat ${tautulli_pid} 2>/dev/null`
+    ps -p ${pid} | grep -q "python ${tautulli_dir}/Tautulli.py"
     return $?
 }
 
-# Try to stop PlexPy cleanly by calling shutdown over http.
-plexpy_stop() {
-    if [ ! -e "${plexpy_conf}" ]; then
-        echo "PlexPy' settings file does not exist. Try starting PlexPy, as this should create the file."
+# Try to stop Tautulli cleanly by calling shutdown over http.
+tautulli_stop() {
+    if [ ! -e "${tautulli_conf}" ]; then
+        echo "Tautulli' settings file does not exist. Try starting Tautulli, as this should create the file."
         exit 1
     fi
     echo "Stopping $name"
-    verify_plexpy_pid
+    verify_tautulli_pid
     ${WGET} -O - -q --user=${SBUSR} --password=${SBPWD} "http://${HOST}:${PORT}/shutdown/" >/dev/null
     
     if [ -n "${pid}" ]; then
@@ -81,8 +81,8 @@ plexpy_stop() {
     fi
 }
 
-plexpy_status() {
-    verify_plexpy_pid && echo "$name is running as ${pid}" || echo "$name is not running"
+tautulli_status() {
+    verify_tautulli_pid && echo "$name is running as ${pid}" || echo "$name is not running"
 }
 
 run_rc_command "$1"

init-scripts/init.fedora.centos.service

@@ -1,25 +1,25 @@
 #!/bin/sh
 #
 ### BEGIN INIT INFO
-# Provides:          PlexPy 
+# Provides:          Tautulli
 # Required-Start:    $all
 # Required-Stop:     $all
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: starts PlexPy 
-# Description:       starts PlexPy
+# Short-Description: starts Tautulli
+# Description:       starts Tautulli
 ### END INIT INFO
 
 # Source function library.
 . /etc/init.d/functions
 
 ## Variables
-prog=plexpy
+prog=tautulli
 lockfile=/var/lock/subsys/$prog
-homedir=/opt/plexpy
-datadir=/opt/plexpy
-configfile=/opt/plexpy/config.ini
-pidfile=/var/run/plexpy.pid
+homedir=/opt/Tautulli
+datadir=/opt/Tautulli
+configfile=/opt/Tautulli/config.ini
+pidfile=/var/run/tautulli.pid
 nice=
 # The following line must point to your Python 2.7 install
 python27=/usr/src/Python-2.7.11/python
@@ -30,7 +30,7 @@ options=" --daemon --config $configfile --pidfile $pidfile --datadir $datadir --
 start() {
         # Start daemon.
         echo -n $"Starting $prog: "
-        daemon --pidfile=$pidfile $nice $python27 $homedir/PlexPy.py $options
+        daemon --pidfile=$pidfile $nice $python27 $homedir/Tautulli.py $options
         RETVAL=$?
         echo
         [ $RETVAL -eq 0 ] && touch $lockfile

init-scripts/init.freebsd

@@ -1,45 +1,45 @@
 #!/bin/sh
 #
-# PROVIDE: plexpy
-# REQUIRE: DAEMON plexpy
+# PROVIDE: tautulli
+# REQUIRE: DAEMON tautulli
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
-# plexpy_enable (bool): Set to NO by default.
+# tautulli_enable (bool): Set to NO by default.
 #           Set it to YES to enable it.
-# plexpy_user:  The user account PlexPy daemon runs as what
-#           you want it to be. It uses 'plexpy' user by
+# tautulli_user:  The user account Tautulli daemon runs as what
+#           you want it to be. It uses 'tautulli' user by
 #           default. Do not sets it as empty or it will run
 #           as root.
-# plexpy_dir:   Directory where PlexPy lives.
-#           Default: /usr/local/share/plexpy
-# plexpy_chdir:  Change to this directory before running PlexPy.
-#     Default is same as plexpy_dir.
-# plexpy_pid:  The name of the pidfile to create.
-#     Default is plexpy.pid in plexpy_dir.
+# tautulli_dir:   Directory where Tautulli lives.
+#           Default: /usr/local/share/Tautulli
+# tautulli_chdir:  Change to this directory before running Tautulli.
+#     Default is same as tautulli_dir.
+# tautulli_pid:  The name of the pidfile to create.
+#     Default is tautulli.pid in tautulli_dir.
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 
 . /etc/rc.subr
 
-name="plexpy"
+name="tautulli"
 rcvar=${name}_enable
 
 load_rc_config ${name}
 
-: ${plexpy_enable:="NO"}
-: ${plexpy_user:="plexpy"}
-: ${plexpy_dir:="/usr/local/share/plexpy"}
-: ${plexpy_chdir:="${plexpy_dir}"}
-: ${plexpy_pid:="${plexpy_dir}/plexpy.pid"}
-: ${plexpy_flags:=""}
+: ${tautulli_enable:="NO"}
+: ${tautulli_user:="tautulli"}
+: ${tautulli_dir:="/usr/local/share/Tautulli"}
+: ${tautulli_chdir:="${tautulli_dir}"}
+: ${tautulli_pid:="${tautulli_dir}/tautulli.pid"}
+: ${tautulli_flags:=""}
 
 status_cmd="${name}_status"
 stop_cmd="${name}_stop"
 
-command="${plexpy_dir}/PlexPy.py"
-command_args="--daemon --pidfile ${plexpy_pid} --quiet --nolaunch ${plexpy_flags}"
+command="${tautulli_dir}/Tautulli.py"
+command_args="--daemon --pidfile ${tautulli_pid} --quiet --nolaunch ${tautulli_flags}"
 
 # Ensure user is root when running this script.
 if [ `id -u` != "0" ]; then
@@ -47,21 +47,21 @@ if [ `id -u` != "0" ]; then
   exit 1
 fi
 
-verify_plexpy_pid() {
-    # Make sure the pid corresponds to the PlexPy process.
-    if [ -f ${plexpy_pid} ]; then
-      pid=`cat ${plexpy_pid} 2>/dev/null`
-      ps -p ${pid} | grep -q "python2 ${plexpy_dir}/PlexPy.py"
+verify_tautulli_pid() {
+    # Make sure the pid corresponds to the Tautulli process.
+    if [ -f ${tautulli_pid} ]; then
+      pid=`cat ${tautulli_pid} 2>/dev/null`
+      ps -p ${pid} | grep -q "python2 ${tautulli_dir}/Tautulli.py"
       return $?
     else
       return 0
     fi
 }
 
-# Try to stop PlexPy cleanly by sending SIGTERM
-plexpy_stop() {
+# Try to stop Tautulli cleanly by sending SIGTERM
+tautulli_stop() {
     echo "Stopping $name"
-    verify_plexpy_pid
+    verify_tautulli_pid
     if [ -n "${pid}" ]; then
       kill ${pid}
       wait_for_pids ${pid}
@@ -69,8 +69,8 @@ plexpy_stop() {
     fi
 }
 
-plexpy_status() {
-    verify_plexpy_pid
+tautulli_status() {
+    verify_tautulli_pid
     if [ -n "${pid}" ]; then
       echo "$name is running as ${pid}."
     else

init-scripts/init.freenas

@@ -1,45 +1,45 @@
 #!/bin/sh
 #
-# PROVIDE: plexpy
-# REQUIRE: DAEMON plexpy
+# PROVIDE: tautulli
+# REQUIRE: DAEMON tautulli
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
-# plexpy_enable (bool): Set to NO by default.
+# tautulli_enable (bool): Set to NO by default.
 #           Set it to YES to enable it.
-# plexpy_user:  The user account PlexPy daemon runs as what
-#           you want it to be. It uses 'plexpy' user by
+# tautulli_user:  The user account Tautulli daemon runs as what
+#           you want it to be. It uses 'tautulli' user by
 #           default. Do not sets it as empty or it will run
 #           as root.
-# plexpy_dir:   Directory where PlexPy lives.
-#           Default: /usr/local/share/plexpy
-# plexpy_chdir:  Change to this directory before running PlexPy.
-#     Default is same as plexpy_dir.
-# plexpy_pid:  The name of the pidfile to create.
-#     Default is plexpy.pid in plexpy_dir.
+# tautulli_dir:   Directory where Tautulli lives.
+#           Default: /usr/local/share/Tautulli
+# tautulli_chdir:  Change to this directory before running Tautulli.
+#     Default is same as tautulli_dir.
+# tautulli_pid:  The name of the pidfile to create.
+#     Default is tautulli.pid in tautulli_dir.
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 
 . /etc/rc.subr
 
-name="plexpy"
+name="tautulli"
 rcvar=${name}_enable
 
 load_rc_config ${name}
 
-: ${plexpy_enable:="NO"}
-: ${plexpy_user:="plexpy"}
-: ${plexpy_dir:="/usr/local/share/plexpy"}
-: ${plexpy_chdir:="${plexpy_dir}"}
-: ${plexpy_pid:="${plexpy_dir}/plexpy.pid"}
-: ${plexpy_flags:=""}
+: ${tautulli_enable:="NO"}
+: ${tautulli_user:="tautulli"}
+: ${tautulli_dir:="/usr/local/share/Tautulli"}
+: ${tautulli_chdir:="${tautulli_dir}"}
+: ${tautulli_pid:="${tautulli_dir}/tautulli.pid"}
+: ${tautulli_flags:=""}
 
 status_cmd="${name}_status"
 stop_cmd="${name}_stop"
 
-command="${plexpy_dir}/PlexPy.py"
-command_args="--daemon --pidfile ${plexpy_pid} --quiet --nolaunch ${plexpy_flags}"
+command="${tautulli_dir}/Tautulli.py"
+command_args="--daemon --pidfile ${tautulli_pid} --quiet --nolaunch ${tautulli_flags}"
 
 # Ensure user is root when running this script.
 if [ `id -u` != "0" ]; then
@@ -47,21 +47,21 @@ if [ `id -u` != "0" ]; then
   exit 1
 fi
 
-verify_plexpy_pid() {
-    # Make sure the pid corresponds to the PlexPy process.
-    if [ -f ${plexpy_pid} ]; then
-      pid=`cat ${plexpy_pid} 2>/dev/null`
-      ps -p ${pid} | grep -q "python2 ${plexpy_dir}/PlexPy.py"
+verify_tautulli_pid() {
+    # Make sure the pid corresponds to the Tautulli process.
+    if [ -f ${tautulli_pid} ]; then
+      pid=`cat ${tautulli_pid} 2>/dev/null`
+      ps -p ${pid} | grep -q "python2 ${tautulli_dir}/Tautulli.py"
       return $?
     else
       return 0
     fi
 }
 
-# Try to stop PlexPy cleanly by sending SIGTERM
-plexpy_stop() {
+# Try to stop Tautulli cleanly by sending SIGTERM
+tautulli_stop() {
     echo "Stopping $name."
-    verify_plexpy_pid
+    verify_tautulli_pid
     if [ -n "${pid}" ]; then
       kill ${pid}
       wait_for_pids ${pid}
@@ -69,8 +69,8 @@ plexpy_stop() {
     fi
 }
 
-plexpy_status() {
-    verify_plexpy_pid
+tautulli_status() {
+    verify_tautulli_pid
     if [ -n "${pid}" ]; then
       echo "$name is running as ${pid}."
     else

init-scripts/init.osx

@@ -3,12 +3,12 @@
 <plist version="1.0">
 <dict>
   <key>Label</key>
-  <string>plexpy</string>
+  <string>tautulli</string>
   <key>ProgramArguments</key>
   <array>
-       <!-- Modify these two lines if you need to to reflect your python location and PlexPy install location -->
+       <!-- Modify these two lines if you need to to reflect your python location and Tautulli install location -->
        <string>/usr/bin/python</string>
-       <string>/Applications/PlexPy/PlexPy.py</string>
+       <string>/Applications/Tautulli/Tautulli.py</string>
   </array>
   <key>RunAtLoad</key>
   <true/>

init-scripts/init.solaris11

@@ -2,9 +2,9 @@
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
         Created by Manifold
---><service_bundle type="manifest" name="plexpy">
+--><service_bundle type="manifest" name="tautulli">
 
-    <service name="application/plexpy" type="service" version="1">
+    <service name="application/tautulli" type="service" version="1">
 
         <create_default_instance enabled="true"/>
 
@@ -19,10 +19,10 @@
         </dependency>
 
         <method_context>
-            <method_credential user="plexpy" group="nogroup"/>
+            <method_credential user="tautulli" group="nogroup"/>
         </method_context>
 
-        <exec_method type="method" name="start" exec="python /opt/plexpy/PlexPy.py --daemon --quiet --nolaunch" timeout_seconds="60"/>
+        <exec_method type="method" name="start" exec="python /opt/Tautulli/Tautulli.py --daemon --quiet --nolaunch" timeout_seconds="60"/>
 
         <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60"/>
 
@@ -37,7 +37,7 @@
         <template>
             <common_name>
                 <loctext xml:lang="C">
-                    PlexPy
+                    Tautulli
                 </loctext>
             </common_name>
         </template>

init-scripts/init.systemd

@@ -1,11 +1,11 @@
-# PlexPy - Stats for Plex Media Server usage
+# Tautulli - Stats for Plex Media Server usage
 #
 # Service Unit file for systemd system manager
 #
 # INSTALLATION NOTES
 #
 #   1. Rename this file as you want, ensuring that it ends in .service
-#       e.g. 'plexpy.service'
+#       e.g. 'tautulli.service'
 #
 #   2. Adjust configuration settings as required.  More details in the
 #      "CONFIGURATION NOTES" section shown below.
@@ -15,39 +15,39 @@
 #
 #   4. Enable boot-time autostart with the following commands:
 #       systemctl daemon-reload
-#       systemctl enable plexpy.service
+#       systemctl enable tautulli.service
 #
 #   5. Start now with the following command:
-#       systemctl start plexpy.service
+#       systemctl start tautulli.service
 #
 # CONFIGURATION NOTES
 #
-#    - The example settings in this file assume that you will run PlexPy as user: plexpy
-#    - To create this user and give it ownership of the plexpy directory: 
-#       sudo adduser --system --no-create-home plexpy
-#       sudo chown plexpy:nogroup -R /opt/plexpy
+#    - The example settings in this file assume that you will run Tautulli as user: tautulli
+#    - To create this user and give it ownership of the tautulli directory: 
+#       sudo adduser --system --no-create-home tautulli
+#       sudo chown tautulli:nogroup -R /opt/Tautulli
 #     
 #    - Option names (e.g. ExecStart=, Type=) appear to be case-sensitive)
 #
 #    - Adjust ExecStart= to point to:
-#       1. Your PlexPy executable,
+#       1. Your Tautulli executable,
 #       2. Your config file (recommended is to put it somewhere in /etc)
-#       3. Your datadir (recommended is to NOT put it in your PlexPy exec dir)
+#       3. Your datadir (recommended is to NOT put it in your Tautulli exec dir)
 #
-#    - Adjust User= and Group= to the user/group you want PlexPy to run as.
+#    - Adjust User= and Group= to the user/group you want Tautulli to run as.
 #
-#    - WantedBy= specifies which target (i.e. runlevel) to start PlexPy for.
+#    - WantedBy= specifies which target (i.e. runlevel) to start Tautulli for.
 #        multi-user.target equates to runlevel 3 (multi-user text mode)
 #        graphical.target  equates to runlevel 5 (multi-user X11 graphical mode)
 
 [Unit]
-Description=PlexPy - Stats for Plex Media Server usage
+Description=Tautulli - Stats for Plex Media Server usage
 
 [Service]
-ExecStart=/opt/plexpy/PlexPy.py --quiet --daemon --nolaunch --config /opt/plexpy/config.ini --datadir /opt/plexpy
+ExecStart=/opt/Tautulli/Tautulli.py --quiet --daemon --nolaunch --config /opt/Tautulli/config.ini --datadir /opt/Tautulli
 GuessMainPID=no
 Type=forking
-User=plexpy
+User=tautulli
 Group=nogroup
 
 [Install]

init-scripts/init.ubuntu

@@ -1,71 +1,71 @@
 #!/bin/sh
 #
 ## Don't edit this file
-## Edit user configuation in /etc/default/plexpy to change
+## Edit user configuation in /etc/default/tautulli to change
 ##
 ## Make sure init script is executable
 ## sudo chmod +x /path/to/init.ubuntu
 ##
 ## Install the init script
-## sudo ln -s /path/to/init.ubuntu /etc/init.d/plexpy
+## sudo ln -s /path/to/init.ubuntu /etc/init.d/tautulli
 ##
-## Create the plexpy daemon user:
-## sudo adduser --system --no-create-home plexpy
+## Create the tautulli daemon user:
+## sudo adduser --system --no-create-home tautulli
 ##
-## Make sure /opt/plexpy is owned by the plexpy user
-## sudo chown plexpy:nogroup -R /opt/plexpy
+## Make sure /opt/Tautulli is owned by the tautulli user
+## sudo chown tautulli:nogroup -R /opt/Tautulli
 ##
 ## Touch the default file to stop the warning message when starting
-## sudo touch /etc/default/plexpy
+## sudo touch /etc/default/tautulli
 ##
-## To start PlexPy automatically
-## sudo  update-rc.d plexpy defaults
+## To start Tautulli automatically
+## sudo  update-rc.d tautulli defaults
 ##
-## To start/stop/restart PlexPy
-## sudo service plexpy start
-## sudo service plexpy stop
-## sudo service plexpy restart
+## To start/stop/restart Tautulli
+## sudo service tautulli start
+## sudo service tautulli stop
+## sudo service tautulli restart
 ##
-## HP_USER=         #$RUN_AS, username to run plexpy under, the default is plexpy
-## HP_HOME=         #$APP_PATH, the location of PlexPy.py, the default is /opt/plexpy
-## HP_DATA=         #$DATA_DIR, the location of plexpy.db, cache, logs, the default is /opt/plexpy
-## HP_PIDFILE=      #$PID_FILE, the location of plexpy.pid, the default is /var/run/plexpy/plexpy.pid
+## TAUTULLI_USER=         #$RUN_AS, username to run Tautulli under, the default is tautulli
+## TAUTULLI_HOME=         #$APP_PATH, the location of Tautulli.py, the default is /opt/Tautulli
+## TAUTULLI_DATA=         #$DATA_DIR, the location of plexpy.db, cache, logs, the default is /opt/Tautulli
+## TAUTULLI_PIDFILE=      #$PID_FILE, the location of tautulli.pid, the default is /var/run/tautulli/tautulli.pid
 ## PYTHON_BIN=      #$DAEMON, the location of the python binary, the default is /usr/bin/python
-## HP_OPTS=         #$EXTRA_DAEMON_OPTS, extra cli option for plexpy, i.e. " --config=/home/plexpy/config.ini"
+## TAUTULLI_OPTS=         #$EXTRA_DAEMON_OPTS, extra cli option for Tautulli, i.e. " --config=/home/Tautulli/config.ini"
 ## SSD_OPTS=        #$EXTRA_SSD_OPTS, extra start-stop-daemon option like " --group=users"
-## HP_PORT=         #$PORT_OPTS, hardcoded port for the webserver, overrides value in config.ini
+## TAUTULLI_PORT=         #$PORT_OPTS, hardcoded port for the webserver, overrides value in config.ini
 ##
 ## EXAMPLE if want to run as different user
-## add HP_USER=username to /etc/default/plexpy
-## otherwise default plexpy is used
+## add TAUTULLI_USER=username to /etc/default/tautulli
+## otherwise default tautulli is used
 #
 ### BEGIN INIT INFO
-# Provides:          plexpy
+# Provides:          tautulli
 # Required-Start:    $local_fs $network $remote_fs
 # Required-Stop:     $local_fs $network $remote_fs
 # Should-Start:      $NetworkManager
 # Should-Stop:       $NetworkManager
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: starts instance of PlexPy
-# Description:       starts instance of PlexPy using start-stop-daemon
+# Short-Description: starts instance of Tautulli
+# Description:       starts instance of Tautulli using start-stop-daemon
 ### END INIT INFO
 
 # Script name
-NAME=plexpy
+NAME=tautulli
 
 # App name
-DESC=PlexPy
+DESC=Tautulli
 
 SETTINGS_LOADED=FALSE
 
 . /lib/lsb/init-functions
 
-# Source PlexPy configuration
-if [ -f /etc/default/plexpy ]; then
-    SETTINGS=/etc/default/plexpy
+# Source Tautulli configuration
+if [ -f /etc/default/tautulli ]; then
+    SETTINGS=/etc/default/tautulli
 else
-    log_warning_msg "/etc/default/plexpy not found using default settings.";
+    log_warning_msg "/etc/default/tautulli not found using default settings.";
 fi
 
 check_retval() {
@@ -84,32 +84,32 @@ load_settings() {
 
         ## The defaults
         # Run as username
-        RUN_AS=${HP_USER-plexpy}
+        RUN_AS=${TAUTULLI_USER-tautulli}
 
-        # Path to app HP_HOME=path_to_app_PlexPy.py
-        APP_PATH=${HP_HOME-/opt/plexpy}
+        # Path to app TAUTULLI_HOME=path_to_app_Tautulli.py
+        APP_PATH=${TAUTULLI_HOME-/opt/Tautulli}
 
         # Data directory where plexpy.db, cache and logs are stored
-        DATA_DIR=${HP_DATA-/opt/plexpy}
+        DATA_DIR=${TAUTULLI_DATA-/opt/Tautulli}
 
         # Path to store PID file
-        PID_FILE=${HP_PIDFILE-/var/run/plexpy/plexpy.pid}
+        PID_FILE=${TAUTULLI_PIDFILE-/var/run/tautulli/tautulli.pid}
 
         # Path to python bin
         DAEMON=${PYTHON_BIN-/usr/bin/python}
 
-        # Extra daemon option like: HP_OPTS=" --config=/home/plexpy/config.ini"
-        EXTRA_DAEMON_OPTS=${HP_OPTS-}
+        # Extra daemon option like: TAUTULLI_OPTS=" --config=/home/Tautulli/config.ini"
+        EXTRA_DAEMON_OPTS=${TAUTULLI_OPTS-}
 
         # Extra start-stop-daemon option like START_OPTS=" --group=users"
         EXTRA_SSD_OPTS=${SSD_OPTS-}
 
         # Hardcoded port to run on, overrides config.ini settings
-        [ -n "$HP_PORT" ] && {
-            PORT_OPTS=" --port=${HP_PORT} "
+        [ -n "$TAUTULLI_PORT" ] && {
+            PORT_OPTS=" --port=${TAUTULLI_PORT} "
         }
 
-        DAEMON_OPTS=" PlexPy.py --quiet --daemon --nolaunch --pidfile=${PID_FILE} --datadir=${DATA_DIR} ${PORT_OPTS}${EXTRA_DAEMON_OPTS}"
+        DAEMON_OPTS=" Tautulli.py --quiet --daemon --nolaunch --pidfile=${PID_FILE} --datadir=${DATA_DIR} ${PORT_OPTS}${EXTRA_DAEMON_OPTS}"
 
         SETTINGS_LOADED=TRUE
     fi
@@ -162,7 +162,7 @@ handle_updates () {
         return 0; }
 }
 
-start_plexpy () {
+start_tautulli () {
     handle_pid
     handle_datadir
     handle_updates
@@ -175,7 +175,7 @@ start_plexpy () {
     fi
 }
 
-stop_plexpy () {
+stop_tautulli () {
     if is_running; then
         log_daemon_msg "Stopping $DESC"
         start-stop-daemon -o --stop --pidfile $PID_FILE --retry 15
@@ -187,14 +187,14 @@ stop_plexpy () {
 
 case "$1" in
     start)
-        start_plexpy
+        start_tautulli
         ;;
     stop)
-        stop_plexpy
+        stop_tautulli
         ;;
     restart|force-reload)
-        stop_plexpy
-        start_plexpy
+        stop_tautulli
+        start_tautulli
         ;;
     status)
         status_of_proc -p "$PID_FILE" "$DAEMON" "$DESC"

init-scripts/init.upstart

@@ -1,18 +1,18 @@
-# plexpy
+# tautulli
 #
 # This is a session/user job. Install this file into /usr/share/upstart/sessions
-# if plexpy is installed system wide, and into $XDG_CONFIG_HOME/upstart if
-# plexpy is installed per user. Change the executable path appropiately.
+# if Tautulli is installed system wide, and into $XDG_CONFIG_HOME/upstart if
+# Tautulli is installed per user. Change the executable path appropiately.
 
 start on desktop-start
 stop on desktop-end
 
-env CONFIG=""$XDG_CONFIG_HOME"/plexpy"
-env DATA=""$XDG_DATA_HOME"/plexpy"
+env CONFIG=""$XDG_CONFIG_HOME"/Tautulli"
+env DATA=""$XDG_DATA_HOME"/Tautulli"
 
 pre-start script
     [ -d "$CONFIG" ] || mkdir -p "$CONFIG"
     [ -d "$DATA" ] || mkdir -p "$DATA"
 end script
 
-exec PlexPy.py --nolaunch --config "$CONFIG"/config.ini --datadir "$DATA"
+exec Tautulli.py --nolaunch --config "$CONFIG"/config.ini --datadir "$DATA"

lib/UniversalAnalytics/HTTPLog.py

@@ -0,0 +1,121 @@
+#!/usr/bin/python
+###############################################################################
+# Formatting filter for urllib2's HTTPHandler(debuglevel=1) output
+# Copyright (c) 2013, Analytics Pros
+# 
+# This project is free software, distributed under the BSD license. 
+# Analytics Pros offers consulting and integration services if your firm needs 
+# assistance in strategy, implementation, or auditing existing work.
+###############################################################################
+
+
+import sys, re, os
+from cStringIO import StringIO
+
+
+
+class BufferTranslator(object):
+    """ Provides a buffer-compatible interface for filtering buffer content.
+    """
+    parsers = []
+
+    def __init__(self, output):
+        self.output = output
+        self.encoding = getattr(output, 'encoding', None)
+
+    def write(self, content):
+        content = self.translate(content)
+        self.output.write(content)
+
+
+    @staticmethod
+    def stripslashes(content):
+        return content.decode('string_escape')
+
+    @staticmethod
+    def addslashes(content):
+        return content.encode('string_escape')
+
+    def translate(self, line):
+        for pattern, method in self.parsers:
+            match = pattern.match(line)
+            if match:
+                return method(match)
+            
+        return line
+            
+
+
+class LineBufferTranslator(BufferTranslator):
+    """ Line buffer implementation supports translation of line-format input
+        even when input is not already line-buffered. Caches input until newlines 
+        occur, and then dispatches translated input to output buffer.
+    """
+    def __init__(self, *a, **kw):
+        self._linepending = []
+        super(LineBufferTranslator, self).__init__(*a, **kw)
+    
+    def write(self, _input):
+        lines = _input.splitlines(True)
+        for i in range(0, len(lines)):
+            last = i
+            if lines[i].endswith('\n'):
+                prefix = len(self._linepending) and ''.join(self._linepending) or ''
+                self.output.write(self.translate(prefix + lines[i]))
+                del self._linepending[0:]
+                last = -1
+                
+        if last >= 0:
+            self._linepending.append(lines[ last ])
+
+
+    def __del__(self):
+        if len(self._linepending):
+            self.output.write(self.translate(''.join(self._linepending)))
+
+
+class HTTPTranslator(LineBufferTranslator):
+    """ Translates output from |urllib2| HTTPHandler(debuglevel = 1) into
+        HTTP-compatible, readible text structures for human analysis.
+    """
+
+    RE_LINE_PARSER = re.compile(r'^(?:([a-z]+):)\s*(\'?)([^\r\n]*)\2(?:[\r\n]*)$')
+    RE_LINE_BREAK = re.compile(r'(\r?\n|(?:\\r)?\\n)')
+    RE_HTTP_METHOD = re.compile(r'^(POST|GET|HEAD|DELETE|PUT|TRACE|OPTIONS)')
+    RE_PARAMETER_SPACER = re.compile(r'&([a-z0-9]+)=')
+
+    @classmethod
+    def spacer(cls, line):
+        return cls.RE_PARAMETER_SPACER.sub(r' &\1= ', line)
+
+    def translate(self, line):
+
+        parsed = self.RE_LINE_PARSER.match(line)
+
+        if parsed:
+            value = parsed.group(3)
+            stage = parsed.group(1)
+
+            if stage == 'send': # query string is rendered here
+                return '\n# HTTP Request:\n' + self.stripslashes(value)
+            elif stage == 'reply':
+                return '\n\n# HTTP Response:\n' + self.stripslashes(value)
+            elif stage == 'header':
+                return value + '\n'
+            else:
+                return value
+
+
+        return line
+
+
+def consume(outbuffer = None): # Capture standard output
+    sys.stdout = HTTPTranslator(outbuffer or sys.stdout)
+    return sys.stdout
+
+
+if __name__ == '__main__':
+    consume(sys.stdout).write(sys.stdin.read())
+    print '\n'
+
+# vim: set nowrap tabstop=4 shiftwidth=4 softtabstop=0 expandtab textwidth=0 filetype=python foldmethod=indent foldcolumn=4

lib/UniversalAnalytics/Tracker.py

@@ -0,0 +1,433 @@
+###############################################################################
+# Universal Analytics for Python
+# Copyright (c) 2013, Analytics Pros
+# 
+# This project is free software, distributed under the BSD license. 
+# Analytics Pros offers consulting and integration services if your firm needs 
+# assistance in strategy, implementation, or auditing existing work.
+###############################################################################
+
+from urllib2 import urlopen, build_opener, install_opener
+from urllib2 import Request, HTTPSHandler
+from urllib2 import URLError, HTTPError
+from urllib import urlencode
+
+import random
+import datetime
+import time
+import uuid
+import hashlib
+import socket
+
+
+def generate_uuid(basedata=None):
+    """ Provides a _random_ UUID with no input, or a UUID4-format MD5 checksum of any input data provided """
+    if basedata is None:
+        return str(uuid.uuid4())
+    elif isinstance(basedata, basestring):
+        checksum = hashlib.md5(basedata).hexdigest()
+        return '%8s-%4s-%4s-%4s-%12s' % (
+        checksum[0:8], checksum[8:12], checksum[12:16], checksum[16:20], checksum[20:32])
+
+
+class Time(datetime.datetime):
+    """ Wrappers and convenience methods for processing various time representations """
+
+    @classmethod
+    def from_unix(cls, seconds, milliseconds=0):
+        """ Produce a full |datetime.datetime| object from a Unix timestamp """
+        base = list(time.gmtime(seconds))[0:6]
+        base.append(milliseconds * 1000)  # microseconds
+        return cls(*base)
+
+    @classmethod
+    def to_unix(cls, timestamp):
+        """ Wrapper over time module to produce Unix epoch time as a float """
+        if not isinstance(timestamp, datetime.datetime):
+            raise TypeError, 'Time.milliseconds expects a datetime object'
+        base = time.mktime(timestamp.timetuple())
+        return base
+
+    @classmethod
+    def milliseconds_offset(cls, timestamp, now=None):
+        """ Offset time (in milliseconds) from a |datetime.datetime| object to now """
+        if isinstance(timestamp, (int, float)):
+            base = timestamp
+        else:
+            base = cls.to_unix(timestamp)
+            base = base + (timestamp.microsecond / 1000000)
+        if now is None:
+            now = time.time()
+        return (now - base) * 1000
+
+
+class HTTPRequest(object):
+    """ URL Construction and request handling abstraction.
+        This is not intended to be used outside this module.
+
+        Automates mapping of persistent state (i.e. query parameters)
+        onto transcient datasets for each query.
+    """
+
+    endpoint = 'https://www.google-analytics.com/collect'
+
+    @staticmethod
+    def debug():
+        """ Activate debugging on urllib2 """
+        handler = HTTPSHandler(debuglevel=1)
+        opener = build_opener(handler)
+        install_opener(opener)
+
+    # Store properties for all requests
+    def __init__(self, user_agent=None, *args, **opts):
+        self.user_agent = user_agent or 'Analytics Pros - Universal Analytics (Python)'
+
+    @classmethod
+    def fixUTF8(cls, data):  # Ensure proper encoding for UA's servers...
+        """ Convert all strings to UTF-8 """
+        for key in data:
+            if isinstance(data[key], basestring):
+                data[key] = data[key].encode('utf-8')
+        return data
+
+    # Apply stored properties to the given dataset & POST to the configured endpoint
+    def send(self, data):
+        request = Request(
+            self.endpoint + '?' + urlencode(self.fixUTF8(data)),
+            headers={
+                'User-Agent': self.user_agent
+            }
+        )
+        self.open(request)
+
+    def open(self, request):
+        try:
+            return urlopen(request)
+        except HTTPError as e:
+            return False
+        except URLError as e:
+            self.cache_request(request)
+            return False
+
+    def cache_request(self, request):
+        # TODO: implement a proper caching mechanism here for re-transmitting hits
+        # record = (Time.now(), request.get_full_url(), request.get_data(), request.headers)
+        pass
+
+
+class HTTPPost(HTTPRequest):
+
+    # Apply stored properties to the given dataset & POST to the configured endpoint 
+    def send(self, data):
+        request = Request(
+            self.endpoint,
+            data=urlencode(self.fixUTF8(data)),
+            headers={
+                'User-Agent': self.user_agent
+            }
+        )
+        self.open(request)
+
+
+class Tracker(object):
+    """ Primary tracking interface for Universal Analytics """
+    params = None
+    parameter_alias = {}
+    valid_hittypes = ('pageview', 'event', 'social', 'screenview', 'transaction', 'item', 'exception', 'timing')
+
+    @classmethod
+    def alias(cls, typemap, base, *names):
+        """ Declare an alternate (humane) name for a measurement protocol parameter """
+        cls.parameter_alias[base] = (typemap, base)
+        for i in names:
+            cls.parameter_alias[i] = (typemap, base)
+
+    @classmethod
+    def coerceParameter(cls, name, value=None):
+        if isinstance(name, basestring) and name[0] == '&':
+            return name[1:], str(value)
+        elif name in cls.parameter_alias:
+            typecast, param_name = cls.parameter_alias.get(name)
+            return param_name, typecast(value)
+        else:
+            raise KeyError, 'Parameter "{0}" is not recognized'.format(name)
+
+    def payload(self, data):
+        for key, value in data.iteritems():
+            try:
+                yield self.coerceParameter(key, value)
+            except KeyError:
+                continue
+
+    option_sequence = {
+        'pageview': [(basestring, 'dp')],
+        'event': [(basestring, 'ec'), (basestring, 'ea'), (basestring, 'el'), (int, 'ev')],
+        'social': [(basestring, 'sn'), (basestring, 'sa'), (basestring, 'st')],
+        'timing': [(basestring, 'utc'), (basestring, 'utv'), (basestring, 'utt'), (basestring, 'utl')]
+    }
+
+    @classmethod
+    def consume_options(cls, data, hittype, args):
+        """ Interpret sequential arguments related to known hittypes based on declared structures """
+        opt_position = 0
+        data['t'] = hittype  # integrate hit type parameter
+        if hittype in cls.option_sequence:
+            for expected_type, optname in cls.option_sequence[hittype]:
+                if opt_position < len(args) and isinstance(args[opt_position], expected_type):
+                    data[optname] = args[opt_position]
+                opt_position += 1
+
+    @classmethod
+    def hittime(cls, timestamp=None, age=None, milliseconds=None):
+        """ Returns an integer represeting the milliseconds offset for a given hit (relative to now) """
+        if isinstance(timestamp, (int, float)):
+            return int(Time.milliseconds_offset(Time.from_unix(timestamp, milliseconds=milliseconds)))
+        if isinstance(timestamp, datetime.datetime):
+            return int(Time.milliseconds_offset(timestamp))
+        if isinstance(age, (int, float)):
+            return int(age * 1000) + (milliseconds or 0)
+
+    @property
+    def account(self):
+        return self.params.get('tid', None)
+
+    def __init__(self, account, name=None, client_id=None, hash_client_id=False, user_id=None, user_agent=None,
+                 use_post=True):
+
+        if use_post is False:
+            self.http = HTTPRequest(user_agent=user_agent)
+        else:
+            self.http = HTTPPost(user_agent=user_agent)
+
+        self.params = {'v': 1, 'tid': account}
+
+        if client_id is None:
+            client_id = generate_uuid()
+
+        self.params['cid'] = client_id
+
+        self.hash_client_id = hash_client_id
+
+        if user_id is not None:
+            self.params['uid'] = user_id
+
+    def set_timestamp(self, data):
+        """ Interpret time-related options, apply queue-time parameter as needed """
+        if 'hittime' in data:  # an absolute timestamp
+            data['qt'] = self.hittime(timestamp=data.pop('hittime', None))
+        if 'hitage' in data:  # a relative age (in seconds)
+            data['qt'] = self.hittime(age=data.pop('hitage', None))
+
+    def send(self, hittype, *args, **data):
+        """ Transmit HTTP requests to Google Analytics using the measurement protocol """
+
+        if hittype not in self.valid_hittypes:
+            raise KeyError('Unsupported Universal Analytics Hit Type: {0}'.format(repr(hittype)))
+
+        self.set_timestamp(data)
+        self.consume_options(data, hittype, args)
+
+        for item in args:  # process dictionary-object arguments of transcient data
+            if isinstance(item, dict):
+                for key, val in self.payload(item):
+                    data[key] = val
+
+        for k, v in self.params.iteritems():  # update only absent parameters
+            if k not in data:
+                data[k] = v
+
+        data = dict(self.payload(data))
+
+        if self.hash_client_id:
+            data['cid'] = generate_uuid(data['cid'])
+
+        # Transmit the hit to Google...
+        self.http.send(data)
+
+    # Setting persistent attibutes of the session/hit/etc (inc. custom dimensions/metrics)
+    def set(self, name, value=None):
+        if isinstance(name, dict):
+            for key, value in name.iteritems():
+                try:
+                    param, value = self.coerceParameter(key, value)
+                    self.params[param] = value
+                except KeyError:
+                    pass
+        elif isinstance(name, basestring):
+            try:
+                param, value = self.coerceParameter(name, value)
+                self.params[param] = value
+            except KeyError:
+                pass
+
+    def __getitem__(self, name):
+        param, value = self.coerceParameter(name, None)
+        return self.params.get(param, None)
+
+    def __setitem__(self, name, value):
+        param, value = self.coerceParameter(name, value)
+        self.params[param] = value
+
+    def __delitem__(self, name):
+        param, value = self.coerceParameter(name, None)
+        if param in self.params:
+            del self.params[param]
+
+
+def safe_unicode(obj):
+    """ Safe convertion to the Unicode string version of the object """
+    try:
+        return unicode(obj)
+    except UnicodeDecodeError:
+        return obj.decode('utf-8')
+
+
+# Declaring name mappings for Measurement Protocol parameters
+MAX_CUSTOM_DEFINITIONS = 200
+MAX_EC_LISTS = 11  # 1-based index
+MAX_EC_PRODUCTS = 11  # 1-based index
+MAX_EC_PROMOTIONS = 11  # 1-based index
+
+Tracker.alias(int, 'v', 'protocol-version')
+Tracker.alias(safe_unicode, 'cid', 'client-id', 'clientId', 'clientid')
+Tracker.alias(safe_unicode, 'tid', 'trackingId', 'account')
+Tracker.alias(safe_unicode, 'uid', 'user-id', 'userId', 'userid')
+Tracker.alias(safe_unicode, 'uip', 'user-ip', 'userIp', 'ipaddr')
+Tracker.alias(safe_unicode, 'ua', 'userAgent', 'userAgentOverride', 'user-agent')
+Tracker.alias(safe_unicode, 'dp', 'page', 'path')
+Tracker.alias(safe_unicode, 'dt', 'title', 'pagetitle', 'pageTitle' 'page-title')
+Tracker.alias(safe_unicode, 'dl', 'location')
+Tracker.alias(safe_unicode, 'dh', 'hostname')
+Tracker.alias(safe_unicode, 'sc', 'sessioncontrol', 'session-control', 'sessionControl')
+Tracker.alias(safe_unicode, 'dr', 'referrer', 'referer')
+Tracker.alias(int, 'qt', 'queueTime', 'queue-time')
+Tracker.alias(safe_unicode, 't', 'hitType', 'hittype')
+Tracker.alias(int, 'aip', 'anonymizeIp', 'anonIp', 'anonymize-ip')
+Tracker.alias(safe_unicode, 'ds', 'dataSource', 'data-source')
+
+# Campaign attribution
+Tracker.alias(safe_unicode, 'cn', 'campaign', 'campaignName', 'campaign-name')
+Tracker.alias(safe_unicode, 'cs', 'source', 'campaignSource', 'campaign-source')
+Tracker.alias(safe_unicode, 'cm', 'medium', 'campaignMedium', 'campaign-medium')
+Tracker.alias(safe_unicode, 'ck', 'keyword', 'campaignKeyword', 'campaign-keyword')
+Tracker.alias(safe_unicode, 'cc', 'content', 'campaignContent', 'campaign-content')
+Tracker.alias(safe_unicode, 'ci', 'campaignId', 'campaignID', 'campaign-id')
+
+# Technical specs
+Tracker.alias(safe_unicode, 'sr', 'screenResolution', 'screen-resolution', 'resolution')
+Tracker.alias(safe_unicode, 'vp', 'viewport', 'viewportSize', 'viewport-size')
+Tracker.alias(safe_unicode, 'de', 'encoding', 'documentEncoding', 'document-encoding')
+Tracker.alias(int, 'sd', 'colors', 'screenColors', 'screen-colors')
+Tracker.alias(safe_unicode, 'ul', 'language', 'user-language', 'userLanguage')
+
+# Mobile app
+Tracker.alias(safe_unicode, 'an', 'appName', 'app-name', 'app')
+Tracker.alias(safe_unicode, 'cd', 'contentDescription', 'screenName', 'screen-name', 'content-description')
+Tracker.alias(safe_unicode, 'av', 'appVersion', 'app-version', 'version')
+Tracker.alias(safe_unicode, 'aid', 'appID', 'appId', 'application-id', 'app-id', 'applicationId')
+Tracker.alias(safe_unicode, 'aiid', 'appInstallerId', 'app-installer-id')
+
+# Ecommerce
+Tracker.alias(safe_unicode, 'ta', 'affiliation', 'transactionAffiliation', 'transaction-affiliation')
+Tracker.alias(safe_unicode, 'ti', 'transaction', 'transactionId', 'transaction-id')
+Tracker.alias(float, 'tr', 'revenue', 'transactionRevenue', 'transaction-revenue')
+Tracker.alias(float, 'ts', 'shipping', 'transactionShipping', 'transaction-shipping')
+Tracker.alias(float, 'tt', 'tax', 'transactionTax', 'transaction-tax')
+Tracker.alias(safe_unicode, 'cu', 'currency', 'transactionCurrency',
+              'transaction-currency')  # Currency code, e.g. USD, EUR
+Tracker.alias(safe_unicode, 'in', 'item-name', 'itemName')
+Tracker.alias(float, 'ip', 'item-price', 'itemPrice')
+Tracker.alias(float, 'iq', 'item-quantity', 'itemQuantity')
+Tracker.alias(safe_unicode, 'ic', 'item-code', 'sku', 'itemCode')
+Tracker.alias(safe_unicode, 'iv', 'item-variation', 'item-category', 'itemCategory', 'itemVariation')
+
+# Events
+Tracker.alias(safe_unicode, 'ec', 'event-category', 'eventCategory', 'category')
+Tracker.alias(safe_unicode, 'ea', 'event-action', 'eventAction', 'action')
+Tracker.alias(safe_unicode, 'el', 'event-label', 'eventLabel', 'label')
+Tracker.alias(int, 'ev', 'event-value', 'eventValue', 'value')
+Tracker.alias(int, 'ni', 'noninteractive', 'nonInteractive', 'noninteraction', 'nonInteraction')
+
+# Social
+Tracker.alias(safe_unicode, 'sa', 'social-action', 'socialAction')
+Tracker.alias(safe_unicode, 'sn', 'social-network', 'socialNetwork')
+Tracker.alias(safe_unicode, 'st', 'social-target', 'socialTarget')
+
+# Exceptions
+Tracker.alias(safe_unicode, 'exd', 'exception-description', 'exceptionDescription', 'exDescription')
+Tracker.alias(int, 'exf', 'exception-fatal', 'exceptionFatal', 'exFatal')
+
+# User Timing
+Tracker.alias(safe_unicode, 'utc', 'timingCategory', 'timing-category')
+Tracker.alias(safe_unicode, 'utv', 'timingVariable', 'timing-variable')
+Tracker.alias(float, 'utt', 'time', 'timingTime', 'timing-time')
+Tracker.alias(safe_unicode, 'utl', 'timingLabel', 'timing-label')
+Tracker.alias(float, 'dns', 'timingDNS', 'timing-dns')
+Tracker.alias(float, 'pdt', 'timingPageLoad', 'timing-page-load')
+Tracker.alias(float, 'rrt', 'timingRedirect', 'timing-redirect')
+Tracker.alias(safe_unicode, 'tcp', 'timingTCPConnect', 'timing-tcp-connect')
+Tracker.alias(safe_unicode, 'srt', 'timingServerResponse', 'timing-server-response')
+
+# Custom dimensions and metrics
+for i in range(0, 200):
+    Tracker.alias(safe_unicode, 'cd{0}'.format(i), 'dimension{0}'.format(i))
+    Tracker.alias(int, 'cm{0}'.format(i), 'metric{0}'.format(i))
+
+# Content groups
+for i in range(0, 5):
+    Tracker.alias(safe_unicode, 'cg{0}'.format(i), 'contentGroup{0}'.format(i))
+
+# Enhanced Ecommerce
+Tracker.alias(str, 'pa')  # Product action
+Tracker.alias(str, 'tcc')  # Coupon code
+Tracker.alias(unicode, 'pal')  # Product action list
+Tracker.alias(int, 'cos')  # Checkout step
+Tracker.alias(str, 'col')  # Checkout step option
+
+Tracker.alias(str, 'promoa')  # Promotion action
+
+for product_index in range(1, MAX_EC_PRODUCTS):
+    Tracker.alias(str, 'pr{0}id'.format(product_index))  # Product SKU
+    Tracker.alias(unicode, 'pr{0}nm'.format(product_index))  # Product name
+    Tracker.alias(unicode, 'pr{0}br'.format(product_index))  # Product brand
+    Tracker.alias(unicode, 'pr{0}ca'.format(product_index))  # Product category
+    Tracker.alias(unicode, 'pr{0}va'.format(product_index))  # Product variant
+    Tracker.alias(str, 'pr{0}pr'.format(product_index))  # Product price
+    Tracker.alias(int, 'pr{0}qt'.format(product_index))  # Product quantity
+    Tracker.alias(str, 'pr{0}cc'.format(product_index))  # Product coupon code
+    Tracker.alias(int, 'pr{0}ps'.format(product_index))  # Product position
+
+    for custom_index in range(MAX_CUSTOM_DEFINITIONS):
+        Tracker.alias(str, 'pr{0}cd{1}'.format(product_index, custom_index))  # Product custom dimension
+        Tracker.alias(int, 'pr{0}cm{1}'.format(product_index, custom_index))  # Product custom metric
+
+    for list_index in range(1, MAX_EC_LISTS):
+        Tracker.alias(str, 'il{0}pi{1}id'.format(list_index, product_index))  # Product impression SKU
+        Tracker.alias(unicode, 'il{0}pi{1}nm'.format(list_index, product_index))  # Product impression name
+        Tracker.alias(unicode, 'il{0}pi{1}br'.format(list_index, product_index))  # Product impression brand
+        Tracker.alias(unicode, 'il{0}pi{1}ca'.format(list_index, product_index))  # Product impression category
+        Tracker.alias(unicode, 'il{0}pi{1}va'.format(list_index, product_index))  # Product impression variant
+        Tracker.alias(int, 'il{0}pi{1}ps'.format(list_index, product_index))  # Product impression position
+        Tracker.alias(int, 'il{0}pi{1}pr'.format(list_index, product_index))  # Product impression price
+
+        for custom_index in range(MAX_CUSTOM_DEFINITIONS):
+            Tracker.alias(str, 'il{0}pi{1}cd{2}'.format(list_index, product_index,
+                                                        custom_index))  # Product impression custom dimension
+            Tracker.alias(int, 'il{0}pi{1}cm{2}'.format(list_index, product_index,
+                                                        custom_index))  # Product impression custom metric
+
+for list_index in range(1, MAX_EC_LISTS):
+    Tracker.alias(unicode, 'il{0}nm'.format(list_index))  # Product impression list name
+
+for promotion_index in range(1, MAX_EC_PROMOTIONS):
+    Tracker.alias(str, 'promo{0}id'.format(promotion_index))  # Promotion ID
+    Tracker.alias(unicode, 'promo{0}nm'.format(promotion_index))  # Promotion name
+    Tracker.alias(str, 'promo{0}cr'.format(promotion_index))  # Promotion creative
+    Tracker.alias(str, 'promo{0}ps'.format(promotion_index))  # Promotion position
+
+
+# Shortcut for creating trackers
+def create(account, *args, **kwargs):
+    return Tracker(account, *args, **kwargs)
+
+# vim: set nowrap tabstop=4 shiftwidth=4 softtabstop=0 expandtab textwidth=0 filetype=python foldmethod=indent foldcolumn=4

lib/UniversalAnalytics/__init__.py

@@ -0,0 +1 @@
+import Tracker

plexpy/__init__.py

@@ -15,7 +15,6 @@
 
 import os
 from Queue import Queue
-import shutil
 import sqlite3
 import sys
 import subprocess
@@ -33,6 +32,7 @@ except ImportError:
 import cherrypy
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.triggers.interval import IntervalTrigger
+from UniversalAnalytics import Tracker
 
 import activity_handler
 import activity_pinger
@@ -55,6 +55,7 @@ ARGS = None
 SIGNAL = None
 
 SYS_PLATFORM = None
+SYS_LANGUAGE = None
 SYS_ENCODING = None
 
 QUIET = False
@@ -72,6 +73,7 @@ NOTIFY_QUEUE = Queue()
 INIT_LOCK = threading.Lock()
 _INITIALIZED = False
 _STARTED = False
+_UPDATE = False
 
 DATA_DIR = None
 
@@ -85,6 +87,7 @@ CURRENT_VERSION = None
 LATEST_VERSION = None
 COMMITS_BEHIND = None
 PREV_RELEASE = None
+LATEST_RELEASE = None
 
 UMASK = None
 
@@ -95,6 +98,8 @@ DEV = False
 WS_CONNECTED = False
 PLEX_SERVER_UP = None
 
+TRACKER = None
+
 
 def initialize(config_file):
     with INIT_LOCK:
@@ -106,6 +111,7 @@ def initialize(config_file):
         global LATEST_VERSION
         global PREV_RELEASE
         global UMASK
+        global _UPDATE
 
         CONFIG = plexpy.config.Config(config_file)
         CONFIG_FILE = config_file
@@ -234,7 +240,7 @@ def initialize(config_file):
 
         # Get the previous release from the file
         release_file = os.path.join(DATA_DIR, "release.lock")
-        PREV_RELEASE = common.VERSION_NUMBER
+        PREV_RELEASE = common.RELEASE
         if os.path.isfile(release_file):
             try:
                 with open(release_file, "r") as fp:
@@ -246,14 +252,15 @@ def initialize(config_file):
             PREV_RELEASE = 'v1.4.25'
 
         # Check if the release was updated
-        if common.VERSION_NUMBER != PREV_RELEASE:
+        if common.RELEASE != PREV_RELEASE:
             CONFIG.UPDATE_SHOW_CHANGELOG = 1
             CONFIG.write()
+            _UPDATE = True
 
         # Write current release version to file for update checking
         try:
             with open(release_file, "w") as fp:
-                fp.write(common.VERSION_NUMBER)
+                fp.write(common.RELEASE)
         except IOError as e:
             logger.error(u"Unable to write current release to file '%s': %s" %
                          (release_file, e))
@@ -454,6 +461,19 @@ def start():
         if CONFIG.FIRST_RUN_COMPLETE:
             activity_pinger.connect_server(log=True, startup=True)
 
+        if CONFIG.SYSTEM_ANALYTICS:
+            global TRACKER
+            TRACKER = initialize_tracker()
+
+            # Send system analytics events
+            if not CONFIG.FIRST_RUN_COMPLETE:
+                analytics_event(category='system', action='install')
+
+            elif _UPDATE:
+                analytics_event(category='system', action='update')
+
+            analytics_event(category='system', action='start')
+
         _STARTED = True
 
 
@@ -1667,3 +1687,42 @@ def shutdown(restart=False, update=False, checkout=False):
 
 def generate_uuid():
     return uuid.uuid4().hex
+
+
+def initialize_tracker():
+    data = {
+        'dataSource': 'server',
+        'appName': 'Tautulli',
+        'appVersion': common.RELEASE,
+        'appId': plexpy.INSTALL_TYPE,
+        'appInstallerId': plexpy.CONFIG.GIT_BRANCH,
+        'dimension1': '{} {}'.format(common.PLATFORM, common.PLATFORM_VERSION),  # App Platform
+        'userLanguage': plexpy.SYS_LANGUAGE,
+        'documentEncoding': plexpy.SYS_ENCODING,
+        'noninteractive': True
+        }
+
+    tracker = Tracker.create('UA-111522699-2', client_id=CONFIG.PMS_UUID, hash_client_id=True,
+                             user_agent=common.USER_AGENT)
+    tracker.set(data)
+
+    return tracker
+
+
+def analytics_event(category, action, label=None, value=None, **kwargs):
+    data = {'category': category, 'action': action}
+
+    if label is not None:
+        data['label'] = label
+
+    if value is not None:
+        data['value'] = value
+
+    if kwargs:
+        data.update(kwargs)
+
+    if TRACKER:
+        try:
+            TRACKER.send('event', data)
+        except Exception as e:
+            logger.warn(u"Failed to send analytics event for category '%s', action '%s': %s" % (category, action, e))

plexpy/activity_handler.py

@@ -74,9 +74,22 @@ class ActivityHandler(object):
         return None
 
     def update_db_session(self, session=None):
+        if session is None:
+            session = self.get_live_session()
+
+        if session:
             # Update our session temp table values
-        monitor_proc = activity_processor.ActivityProcessor()
-        monitor_proc.write_session(session=session, notify=False)
+            ap = activity_processor.ActivityProcessor()
+            ap.write_session(session=session, notify=False)
+
+        self.set_session_state()
+
+    def set_session_state(self):
+        ap = activity_processor.ActivityProcessor()
+        ap.set_session_state(session_key=self.get_session_key(),
+                             state=self.timeline['state'],
+                             view_offset=self.timeline['viewOffset'],
+                             stopped=int(time.time()))
 
     def on_start(self):
         if self.is_valid_session():
@@ -114,10 +127,7 @@ class ActivityHandler(object):
             # Update the session state and viewOffset
             # Set force_stop to true to disable the state set
             if not force_stop:
-                ap.set_session_state(session_key=self.get_session_key(),
-                                     state=self.timeline['state'],
-                                     view_offset=self.timeline['viewOffset'],
-                                     stopped=int(time.time()))
+                self.set_session_state()
 
             # Retrieve the session data from our temp table
             db_session = ap.get_session_by_key(session_key=self.get_session_key())
@@ -150,10 +160,7 @@ class ActivityHandler(object):
             ap.set_session_last_paused(session_key=self.get_session_key(), timestamp=int(time.time()))
 
             # Update the session state and viewOffset
-            ap.set_session_state(session_key=self.get_session_key(),
-                                 state=self.timeline['state'],
-                                 view_offset=self.timeline['viewOffset'],
-                                 stopped=int(time.time()))
+            self.update_db_session()
 
             # Retrieve the session data from our temp table
             db_session = ap.get_session_by_key(session_key=self.get_session_key())
@@ -170,10 +177,7 @@ class ActivityHandler(object):
             ap.set_session_last_paused(session_key=self.get_session_key(), timestamp=None)
 
             # Update the session state and viewOffset
-            ap.set_session_state(session_key=self.get_session_key(),
-                                 state=self.timeline['state'],
-                                 view_offset=self.timeline['viewOffset'],
-                                 stopped=int(time.time()))
+            self.update_db_session()
 
             # Retrieve the session data from our temp table
             db_session = ap.get_session_by_key(session_key=self.get_session_key())
@@ -198,10 +202,7 @@ class ActivityHandler(object):
             buffer_last_triggered = ap.get_session_buffer_trigger_time(self.get_session_key())
 
             # Update the session state and viewOffset
-            ap.set_session_state(session_key=self.get_session_key(),
-                                 state=self.timeline['state'],
-                                 view_offset=self.timeline['viewOffset'],
-                                 stopped=int(time.time()))
+            self.update_db_session()
 
             time_since_last_trigger = 0
             if buffer_last_triggered:
@@ -243,9 +244,7 @@ class ActivityHandler(object):
                         # Update the session in our temp session table
                         # if the last set temporary stopped time exceeds 15 seconds
                         if int(time.time()) - db_session['stopped'] > 60:
-                            session = self.get_live_session()
-                            if session:
-                                self.update_db_session(session=session)
+                            self.update_db_session()
 
                     # Start our state checks
                     if this_state != last_state:

plexpy/api2.py

@@ -167,8 +167,8 @@ class API2:
         """
         logfile = os.path.join(plexpy.CONFIG.LOG_DIR, logger.FILENAME)
         templog = []
-        start = int(kwargs.get('start', 0))
-        end = int(kwargs.get('end', 0))
+        start = int(start)
+        end = int(end)
 
         if regex:
             logger.api_debug(u'Tautulli APIv2 :: Filtering log using regex %s' % regex)

plexpy/common.py

@@ -19,13 +19,12 @@ from collections import OrderedDict
 import version
 
 # Identify Our Application
-USER_AGENT = 'Tautulli/-' + version.PLEXPY_BRANCH + ' v' + version.PLEXPY_RELEASE_VERSION + ' (' + platform.system() + \
-             ' ' + platform.release() + ')'
-
 PLATFORM = platform.system()
 PLATFORM_VERSION = platform.release()
 BRANCH = version.PLEXPY_BRANCH
-VERSION_NUMBER = version.PLEXPY_RELEASE_VERSION
+RELEASE = version.PLEXPY_RELEASE_VERSION
+
+USER_AGENT = 'Tautulli/{} ({} {})'.format(RELEASE, PLATFORM, PLATFORM_VERSION)
 
 DEFAULT_USER_THUMB = "interfaces/default/images/gravatar-default-80x80.png"
 DEFAULT_POSTER_THUMB = "interfaces/default/images/poster.png"
@@ -469,28 +468,29 @@ NOTIFICATION_PARAMETERS = [
     {
         'category': 'Plex Update Available',
         'parameters': [
-             {'name': 'Update Version', 'type': 'int', 'value': 'update_version', 'description': 'The available update version for your Plex Server.'},
-             {'name': 'Update Url', 'type': 'int', 'value': 'update_url', 'description': 'The download URL for the available update.'},
-             {'name': 'Update Release Date', 'type': 'int', 'value': 'update_release_date', 'description': 'The release date of the available update.'},
-             {'name': 'Update Channel', 'type': 'int', 'value': 'update_channel', 'description': 'The update channel.', 'example': 'Public or Plex Pass'},
-             {'name': 'Update Platform', 'type': 'int', 'value': 'update_platform', 'description': 'The platform of your Plex Server.'},
-             {'name': 'Update Distro', 'type': 'int', 'value': 'update_distro', 'description': 'The distro of your Plex Server.'},
-             {'name': 'Update Distro Build', 'type': 'int', 'value': 'update_distro_build', 'description': 'The distro build of your Plex Server.'},
-             {'name': 'Update Requirements', 'type': 'int', 'value': 'update_requirements', 'description': 'The requirements for the available update.'},
-             {'name': 'Update Extra Info', 'type': 'int', 'value': 'update_extra_info', 'description': 'Any extra info for the available update.'},
-             {'name': 'Update Changelog Added', 'type': 'int', 'value': 'update_changelog_added', 'description': 'The added changelog for the available update.'},
-             {'name': 'Update Changelog Fixed', 'type': 'int', 'value': 'update_changelog_fixed', 'description': 'The fixed changelog for the available update.'},
+             {'name': 'Update Version', 'type': 'str', 'value': 'update_version', 'description': 'The available update version for your Plex Server.'},
+             {'name': 'Update Url', 'type': 'str', 'value': 'update_url', 'description': 'The download URL for the available update.'},
+             {'name': 'Update Release Date', 'type': 'str', 'value': 'update_release_date', 'description': 'The release date of the available update.'},
+             {'name': 'Update Channel', 'type': 'str', 'value': 'update_channel', 'description': 'The update channel.', 'example': 'Public or Plex Pass'},
+             {'name': 'Update Platform', 'type': 'str', 'value': 'update_platform', 'description': 'The platform of your Plex Server.'},
+             {'name': 'Update Distro', 'type': 'str', 'value': 'update_distro', 'description': 'The distro of your Plex Server.'},
+             {'name': 'Update Distro Build', 'type': 'str', 'value': 'update_distro_build', 'description': 'The distro build of your Plex Server.'},
+             {'name': 'Update Requirements', 'type': 'str', 'value': 'update_requirements', 'description': 'The requirements for the available update.'},
+             {'name': 'Update Extra Info', 'type': 'str', 'value': 'update_extra_info', 'description': 'Any extra info for the available update.'},
+             {'name': 'Update Changelog Added', 'type': 'str', 'value': 'update_changelog_added', 'description': 'The added changelog for the available update.'},
+             {'name': 'Update Changelog Fixed', 'type': 'str', 'value': 'update_changelog_fixed', 'description': 'The fixed changelog for the available update.'},
          ]
      },
     {
         'category': 'Tautulli Update Available',
         'parameters': [
-             {'name': 'Tautulli Update Version', 'type': 'int', 'value': 'tautulli_update_version', 'description': 'The available update version for Tautulli.'},
-             {'name': 'Tautulli Update Tar', 'type': 'int', 'value': 'tautulli_update_tar', 'description': 'The tar download URL for the available update.'},
-             {'name': 'Tautulli Update Zip', 'type': 'int', 'value': 'tautulli_update_zip', 'description': 'The zip download URL for the available update.'},
-             {'name': 'Tautulli Update Commit', 'type': 'int', 'value': 'tautulli_update_commit', 'description': 'The commit hash for the available update.'},
+             {'name': 'Tautulli Update Version', 'type': 'str', 'value': 'tautulli_update_version', 'description': 'The available update version for Tautulli.'},
+             {'name': 'Tautulli Update Release URL', 'type': 'str', 'value': 'tautulli_update_release_url', 'description': 'The release page URL on GitHub'},
+             {'name': 'Tautulli Update Tar', 'type': 'str', 'value': 'tautulli_update_tar', 'description': 'The tar download URL for the available update.'},
+             {'name': 'Tautulli Update Zip', 'type': 'str', 'value': 'tautulli_update_zip', 'description': 'The zip download URL for the available update.'},
+             {'name': 'Tautulli Update Commit', 'type': 'str', 'value': 'tautulli_update_commit', 'description': 'The commit hash for the available update.'},
              {'name': 'Tautulli Update Behind', 'type': 'int', 'value': 'tautulli_update_behind', 'description': 'The number of commits behind for the available update.'},
-             {'name': 'Tautulli Update Changelog', 'type': 'int', 'value': 'tautulli_update_changelog', 'description': 'The changelog for the available update.'},
+             {'name': 'Tautulli Update Changelog', 'type': 'str', 'value': 'tautulli_update_changelog', 'description': 'The changelog for the available update.'},
         ]
      },
 ]

plexpy/config.py

@@ -615,6 +615,7 @@ _CONFIG_DEFINITIONS = {
     'XBMC_ON_CONCURRENT': (int, 'XBMC', 0),
     'XBMC_ON_NEWDEVICE': (int, 'XBMC', 0),
     'JWT_SECRET': (str, 'Advanced', ''),
+    'SYSTEM_ANALYTICS': (int, 'Advanced', 1)
 }
 
 _BLACKLIST_KEYS = ['_APITOKEN', '_TOKEN', '_KEY', '_SECRET', '_PASSWORD', '_APIKEY', '_ID', '_HOOK']

plexpy/database.py

@@ -23,7 +23,7 @@ import time
 import plexpy
 import logger
 
-FILENAME = "plexpy.db"
+FILENAME = "tautulli.db"
 db_lock = threading.Lock()
 
 
@@ -63,9 +63,9 @@ def make_backup(cleanup=False, scheduler=False):
     """ Makes a backup of db, removes all but the last 5 backups """
 
     if scheduler:
-        backup_file = 'plexpy.backup-%s.sched.db' % arrow.now().format('YYYYMMDDHHmmss')
+        backup_file = 'tautulli.backup-%s.sched.db' % arrow.now().format('YYYYMMDDHHmmss')
     else:
-        backup_file = 'plexpy.backup-%s.db' % arrow.now().format('YYYYMMDDHHmmss')
+        backup_file = 'tautulli.backup-%s.db' % arrow.now().format('YYYYMMDDHHmmss')
     backup_folder = plexpy.CONFIG.BACKUP_DIR
     backup_file_fp = os.path.join(backup_folder, backup_file)
 

plexpy/graphs.py

@@ -27,7 +27,7 @@ class Graphs(object):
     def __init__(self):
         pass
 
-    def get_total_plays_per_day(self, time_range='30', y_axis='plays', user_id=None):
+    def get_total_plays_per_day(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
         monitor_db = database.MonitorDatabase()
 
         if not time_range.isdigit():
@@ -39,16 +39,21 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:    
             if y_axis == 'plays':
                 query = 'SELECT date(started, "unixepoch", "localtime") AS date_played, ' \
                         'SUM(CASE WHEN media_type = "episode" THEN 1 ELSE 0 END) AS tv_count, ' \
                         'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \
                         'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \
-                        'FROM session_history ' \
-                        'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
                         'GROUP BY date_played ' \
-                        'ORDER BY started ASC' % (time_range, user_cond)
+                        'ORDER BY started ASC' % (group_by, time_range, user_cond)
 
                 result = monitor_db.select(query)
             else:
@@ -60,7 +65,7 @@ class Graphs(object):
                         'SUM(CASE WHEN media_type = "track" AND stopped > 0 THEN (stopped - started) ' \
                         ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS music_count ' \
                         'FROM session_history ' \
-                        'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
                         'GROUP BY date_played ' \
                         'ORDER BY started ASC' % (time_range, user_cond)
 
@@ -111,7 +116,7 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_per_dayofweek(self, time_range='30', y_axis='plays', user_id=None):
+    def get_total_plays_per_dayofweek(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
         monitor_db = database.MonitorDatabase()
 
         if not time_range.isdigit():
@@ -123,6 +128,11 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:
             if y_axis == 'plays':
                 query = 'SELECT strftime("%%w", datetime(started, "unixepoch", "localtime")) AS daynumber, ' \
@@ -137,10 +147,10 @@ class Graphs(object):
                         'SUM(CASE WHEN media_type = "episode" THEN 1 ELSE 0 END) AS tv_count, ' \
                         'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \
                         'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \
-                        'FROM session_history ' \
-                        'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
                         'GROUP BY dayofweek ' \
-                        'ORDER BY daynumber' % (time_range, user_cond)
+                        'ORDER BY daynumber' % (group_by, time_range, user_cond)
 
                 result = monitor_db.select(query)
             else:
@@ -160,7 +170,7 @@ class Graphs(object):
                         'SUM(CASE WHEN media_type = "track" AND stopped > 0 THEN (stopped - started) ' \
                         ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS music_count ' \
                         'FROM session_history ' \
-                        'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
                         'GROUP BY dayofweek ' \
                         'ORDER BY daynumber' % (time_range, user_cond)
 
@@ -212,7 +222,7 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_per_hourofday(self, time_range='30', y_axis='plays', user_id=None):
+    def get_total_plays_per_hourofday(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
         monitor_db = database.MonitorDatabase()
 
         if not time_range.isdigit():
@@ -224,16 +234,21 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:
             if y_axis == 'plays':
                 query = 'SELECT strftime("%%H", datetime(started, "unixepoch", "localtime")) AS hourofday, ' \
                         'SUM(CASE WHEN media_type = "episode" THEN 1 ELSE 0 END) AS tv_count, ' \
                         'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \
                         'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \
-                        'FROM session_history ' \
-                        'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
                         'GROUP BY hourofday ' \
-                        'ORDER BY hourofday' % (time_range, user_cond)
+                        'ORDER BY hourofday' % (group_by, time_range, user_cond)
 
                 result = monitor_db.select(query)
             else:
@@ -245,7 +260,7 @@ class Graphs(object):
                         'SUM(CASE WHEN media_type = "track" AND stopped > 0 THEN (stopped - started) ' \
                         ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS music_count ' \
                         'FROM session_history ' \
-                        'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
                         'GROUP BY hourofday ' \
                         'ORDER BY hourofday' % (time_range, user_cond)
 
@@ -295,7 +310,7 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_per_month(self, time_range='12', y_axis='plays', user_id=None):
+    def get_total_plays_per_month(self, time_range='12', y_axis='plays', user_id=None, grouping=None):
         import time as time
 
         if not time_range.isdigit():
@@ -309,16 +324,21 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:
             if y_axis == 'plays':
                 query = 'SELECT strftime("%%Y-%%m", datetime(started, "unixepoch", "localtime")) AS datestring, ' \
                         'SUM(CASE WHEN media_type = "episode" THEN 1 ELSE 0 END) AS tv_count, ' \
                         'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \
                         'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \
-                        'FROM session_history ' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
                         'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s months", "localtime") %s' \
                         'GROUP BY strftime("%%Y-%%m", datetime(started, "unixepoch", "localtime")) ' \
-                        'ORDER BY datestring DESC LIMIT %s' % (time_range, user_cond, time_range)
+                        'ORDER BY datestring DESC LIMIT %s' % (group_by, time_range, user_cond, time_range)
 
                 result = monitor_db.select(query)
             else:
@@ -384,7 +404,7 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None):
+    def get_total_plays_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
         monitor_db = database.MonitorDatabase()
 
         if not time_range.isdigit():
@@ -396,6 +416,11 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:
             if y_axis == 'plays':
                 query = 'SELECT platform, ' \
@@ -403,11 +428,11 @@ class Graphs(object):
                         'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \
                         'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count, ' \
                         'COUNT(id) AS total_count ' \
-                        'FROM session_history ' \
-                        'WHERE (datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
+                        'WHERE (datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \
                         'GROUP BY platform ' \
                         'ORDER BY total_count DESC ' \
-                        'LIMIT 10' % (time_range, user_cond)
+                        'LIMIT 10' % (group_by, time_range, user_cond)
 
                 result = monitor_db.select(query)
             else:
@@ -421,7 +446,7 @@ class Graphs(object):
                         'SUM(CASE WHEN stopped > 0 THEN (stopped - started) ' \
                         ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \
                         'FROM session_history ' \
-                        'WHERE (datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \
+                        'WHERE (datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \
                         'GROUP BY platform ' \
                         'ORDER BY total_duration DESC ' \
                         'LIMIT 10' % (time_range, user_cond)
@@ -453,7 +478,7 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None):
+    def get_total_plays_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
         monitor_db = database.MonitorDatabase()
 
         if not time_range.isdigit():
@@ -465,6 +490,11 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:
             if y_axis == 'plays':
                 query = 'SELECT ' \
@@ -475,12 +505,12 @@ class Graphs(object):
                         'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \
                         'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count, ' \
                         'COUNT(session_history.id) AS total_count ' \
-                        'FROM session_history ' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
                         'JOIN users ON session_history.user_id = users.user_id ' \
-                        'WHERE (datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \
+                        'WHERE (datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \
                         'GROUP BY session_history.user_id ' \
                         'ORDER BY total_count DESC ' \
-                        'LIMIT 10' % (time_range, user_cond)
+                        'LIMIT 10' % (group_by, time_range, user_cond)
 
                 result = monitor_db.select(query)
             else:
@@ -498,7 +528,7 @@ class Graphs(object):
                         ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \
                         'FROM session_history ' \
                         'JOIN users ON session_history.user_id = users.user_id ' \
-                        'WHERE (datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \
+                        'WHERE (datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \
                         'GROUP BY session_history.user_id ' \
                         'ORDER BY total_duration DESC ' \
                         'LIMIT 10' % (time_range, user_cond)
@@ -535,7 +565,7 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_per_stream_type(self, time_range='30', y_axis='plays', user_id=None):
+    def get_total_plays_per_stream_type(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
         monitor_db = database.MonitorDatabase()
 
         if not time_range.isdigit():
@@ -547,6 +577,11 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:
             if y_axis == 'plays':
                 query = 'SELECT date(session_history.started, "unixepoch", "localtime") AS date_played, ' \
@@ -556,14 +591,15 @@ class Graphs(object):
                         'THEN 1 ELSE 0 END) AS ds_count, ' \
                         'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \
                         'THEN 1 ELSE 0 END) AS tc_count ' \
-                        'FROM session_history ' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
-                        'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                        'WHERE (datetime(started, "unixepoch", "localtime") >= ' \
                         'datetime("now", "-%s days", "localtime")) AND ' \
-                        '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR ' \
+                        '(session_history.media_type = "episode" OR ' \
+                        'session_history.media_type = "movie" OR ' \
                         'session_history.media_type = "track") %s' \
                         'GROUP BY date_played ' \
-                        'ORDER BY started ASC' % (time_range, user_cond)
+                        'ORDER BY started ASC' % (group_by, time_range, user_cond)
 
                 result = monitor_db.select(query)
             else:
@@ -579,7 +615,7 @@ class Graphs(object):
                         ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tc_count ' \
                         'FROM session_history ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
-                        'WHERE datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= ' \
                         'datetime("now", "-%s days", "localtime") AND ' \
                         '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR ' \
                         'session_history.media_type = "track") %s' \
@@ -633,7 +669,7 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_by_source_resolution(self, time_range='30', y_axis='plays', user_id=None):
+    def get_total_plays_by_source_resolution(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
         monitor_db = database.MonitorDatabase()
 
         if not time_range.isdigit():
@@ -645,6 +681,11 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:
             if y_axis == 'plays':
                 query = 'SELECT session_history_media_info.video_resolution AS resolution, ' \
@@ -655,14 +696,14 @@ class Graphs(object):
                         'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \
                         'THEN 1 ELSE 0 END) AS tc_count, ' \
                         'COUNT(session_history.id) AS total_count ' \
-                        'FROM session_history ' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
-                        'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                        'WHERE (datetime(started, "unixepoch", "localtime") >= ' \
                         'datetime("now", "-%s days", "localtime")) AND ' \
                         '(session_history.media_type = "episode" OR session_history.media_type = "movie") %s' \
                         'GROUP BY resolution ' \
                         'ORDER BY total_count DESC ' \
-                        'LIMIT 10' % (time_range, user_cond)
+                        'LIMIT 10' % (group_by, time_range, user_cond)
 
                 result = monitor_db.select(query)
             else:
@@ -680,7 +721,7 @@ class Graphs(object):
                         ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \
                         'FROM session_history ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
-                        'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                        'WHERE (datetime(started, "unixepoch", "localtime") >= ' \
                         'datetime("now", "-%s days", "localtime")) AND ' \
                         '(session_history.media_type = "episode" OR session_history.media_type = "movie") %s' \
                         'GROUP BY resolution ' \
@@ -718,7 +759,7 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_by_stream_resolution(self, time_range='30', y_axis='plays', user_id=None):
+    def get_total_plays_by_stream_resolution(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
         monitor_db = database.MonitorDatabase()
 
         if not time_range.isdigit():
@@ -730,6 +771,11 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:
             if y_axis == 'plays':
                 query = 'SELECT ' \
@@ -752,14 +798,14 @@ class Graphs(object):
                         'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" '\
                         'THEN 1 ELSE 0 END) AS tc_count, ' \
                         'COUNT(session_history.id) AS total_count ' \
-                        'FROM session_history ' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
-                        'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                        'WHERE (datetime(started, "unixepoch", "localtime") >= ' \
                         'datetime("now", "-%s days", "localtime")) AND ' \
                         '(session_history.media_type = "episode" OR session_history.media_type = "movie") %s' \
                         'GROUP BY resolution ' \
                         'ORDER BY total_count DESC ' \
-                        'LIMIT 10' % (time_range, user_cond)
+                        'LIMIT 10' % (group_by, time_range, user_cond)
 
                 result = monitor_db.select(query)
             else:
@@ -789,7 +835,7 @@ class Graphs(object):
                         ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \
                         'FROM session_history ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
-                        'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                        'WHERE (datetime(started, "unixepoch", "localtime") >= ' \
                         'datetime("now", "-%s days", "localtime")) AND ' \
                         '(session_history.media_type = "episode" OR session_history.media_type = "movie") %s' \
                         'GROUP BY resolution ' \
@@ -827,7 +873,7 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_stream_type_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None):
+    def get_stream_type_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
         monitor_db = database.MonitorDatabase()
 
         if not time_range.isdigit():
@@ -839,6 +885,11 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:
             if y_axis == 'plays':
                 query = 'SELECT session_history.platform AS platform, ' \
@@ -849,13 +900,15 @@ class Graphs(object):
                         'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \
                         'THEN 1 ELSE 0 END) AS tc_count, ' \
                         'COUNT(session_history.id) AS total_count ' \
-                        'FROM session_history ' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
-                        'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= ' \
                         'datetime("now", "-%s days", "localtime") AND ' \
-                        '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") %s' \
+                        '(session_history.media_type = "episode" OR ' \
+                        'session_history.media_type = "movie" OR ' \
+                        'session_history.media_type = "track") %s' \
                         'GROUP BY platform ' \
-                        'ORDER BY total_count DESC LIMIT 10' % (time_range, user_cond)
+                        'ORDER BY total_count DESC LIMIT 10' % (group_by, time_range, user_cond)
 
                 result = monitor_db.select(query)
             else:
@@ -874,9 +927,11 @@ class Graphs(object):
                         ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \
                         'FROM session_history ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
-                        'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= ' \
                         'datetime("now", "-%s days", "localtime") AND ' \
-                        '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") %s' \
+                        '(session_history.media_type = "episode" OR ' \
+                        'session_history.media_type = "movie" OR ' \
+                        'session_history.media_type = "track") %s' \
                         'GROUP BY platform ' \
                         'ORDER BY total_duration DESC LIMIT 10' % (time_range, user_cond)
 
@@ -908,7 +963,7 @@ class Graphs(object):
 
         return output
 
-    def get_stream_type_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None):
+    def get_stream_type_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
         monitor_db = database.MonitorDatabase()
 
         if not time_range.isdigit():
@@ -920,6 +975,11 @@ class Graphs(object):
         elif user_id and user_id.isdigit():
             user_cond = 'AND session_history.user_id = %s ' % user_id
 
+        if grouping is None:
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+
+        group_by = 'reference_id' if grouping else 'id'
+
         try:
             if y_axis == 'plays':
                 query = 'SELECT ' \
@@ -933,14 +993,16 @@ class Graphs(object):
                         'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \
                         'THEN 1 ELSE 0 END) AS tc_count, ' \
                         'COUNT(session_history.id) AS total_count ' \
-                        'FROM session_history ' \
+                        'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
                         'JOIN users ON session_history.user_id = users.user_id ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
-                        'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= ' \
                         'datetime("now", "-%s days", "localtime") AND ' \
-                        '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") %s' \
+                        '(session_history.media_type = "episode" OR ' \
+                        'session_history.media_type = "movie" OR ' \
+                        'session_history.media_type = "track") %s' \
                         'GROUP BY username ' \
-                        'ORDER BY total_count DESC LIMIT 10' % (time_range, user_cond)
+                        'ORDER BY total_count DESC LIMIT 10' % (group_by, time_range, user_cond)
 
                 result = monitor_db.select(query)
             else:
@@ -963,9 +1025,11 @@ class Graphs(object):
                         'FROM session_history ' \
                         'JOIN users ON session_history.user_id = users.user_id ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
-                        'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \
+                        'WHERE datetime(started, "unixepoch", "localtime") >= ' \
                         'datetime("now", "-%s days", "localtime") AND ' \
-                        '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") %s' \
+                        '(session_history.media_type = "episode" OR ' \
+                        'session_history.media_type = "movie" OR ' \
+                        'session_history.media_type = "track") %s' \
                         'GROUP BY username ' \
                         'ORDER BY total_duration DESC LIMIT 10' % (time_range, user_cond)
 

plexpy/helpers.py

@@ -646,7 +646,7 @@ def whois_lookup(ip_address):
         countries = ipwhois.utils.get_countries()
         nets = whois['nets']
         for net in nets:
-            net['country'] = countries[net['country']]
+            net['country'] = countries.get(net['country'])
             if net['postal_code']:
                  net['postal_code'] = net['postal_code'].replace('-', ' ')
     except ValueError as e:

plexpy/http_handler.py

@@ -41,7 +41,7 @@ class HTTPHandler(object):
 
         self.headers = {'X-Plex-Device-Name': 'Tautulli',
                         'X-Plex-Product': 'Tautulli',
-                        'X-Plex-Version': plexpy.common.VERSION_NUMBER,
+                        'X-Plex-Version': plexpy.common.RELEASE,
                         'X-Plex-Platform': plexpy.common.PLATFORM,
                         'X-Plex-Platform-Version': plexpy.common.PLATFORM_VERSION,
                         'X-Plex-Client-Identifier': plexpy.CONFIG.PMS_UUID,

plexpy/logger.py

@@ -30,8 +30,8 @@ import plexpy
 import helpers
 
 # These settings are for file logging only
-FILENAME = "plexpy.log"
-FILENAME_API = "plexpy_api.log"
+FILENAME = "tautulli.log"
+FILENAME_API = "tautulli_api.log"
 FILENAME_PLEX_WEBSOCKET = "plex_websocket.log"
 MAX_SIZE = 5000000  # 5 MB
 MAX_FILES = 5
@@ -39,9 +39,9 @@ MAX_FILES = 5
 _BLACKLIST_WORDS = set()
 
 # Tautulli logger
-logger = logging.getLogger("plexpy")
+logger = logging.getLogger("tautulli")
 # Tautulli API logger
-logger_api = logging.getLogger("plexpy_api")
+logger_api = logging.getLogger("tautulli_api")
 # Tautulli websocket logger
 logger_plex_websocket = logging.getLogger("plex_websocket")
 
@@ -178,9 +178,9 @@ def initMultiprocessing():
 def initLogger(console=False, log_dir=False, verbose=False):
     """
     Setup logging for Tautulli. It uses the logger instance with the name
-    'plexpy'. Three log handlers are added:
+    'tautulli'. Three log handlers are added:
 
-    * RotatingFileHandler: for the file plexpy.log
+    * RotatingFileHandler: for the file tautulli.log
     * LogListHandler: for Web UI
     * StreamHandler: for console (if console)
 

plexpy/notification_handler.py

@@ -677,7 +677,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
 
     available_params = {
         # Global paramaters
-        'tautulli_version': common.VERSION_NUMBER,
+        'tautulli_version': common.RELEASE,
         'tautulli_remote': plexpy.CONFIG.GIT_REMOTE,
         'tautulli_branch': plexpy.CONFIG.GIT_BRANCH,
         'tautulli_commit': plexpy.CURRENT_VERSION,
@@ -877,7 +877,7 @@ def build_server_notify_params(notify_action=None, **kwargs):
 
     available_params = {
         # Global paramaters
-        'tautulli_version': common.VERSION_NUMBER,
+        'tautulli_version': common.RELEASE,
         'tautulli_remote': plexpy.CONFIG.GIT_REMOTE,
         'tautulli_branch': plexpy.CONFIG.GIT_BRANCH,
         'tautulli_commit': plexpy.CURRENT_VERSION,
@@ -907,6 +907,7 @@ def build_server_notify_params(notify_action=None, **kwargs):
         'update_changelog_fixed': pms_download_info['changelog_fixed'],
         # Tautulli update parameters
         'tautulli_update_version': plexpy_download_info['tag_name'],
+        'tautulli_update_release_url': plexpy_download_info['html_url'],
         'tautulli_update_tar': plexpy_download_info['tarball_url'],
         'tautulli_update_zip': plexpy_download_info['zipball_url'],
         'tautulli_update_commit': kwargs.pop('plexpy_update_commit', ''),

plexpy/notifiers.py

@@ -892,18 +892,21 @@ class ANDROIDAPP(Notifier):
         if not CRYPTODOME:
             config_option.append({
                 'label': 'Warning',
-                'description': '<strong>The PyCryptodome library is missing. ' \
-                    'The content of your notifications will be sent unencrypted!</strong><br>' \
-                    'Please install the library to encrypt the notification contents. ' \
-                    'Instructions can be found in the ' \
-                    '<a href="' + helpers.anon_url('https://github.com/%s/%s-Wiki/wiki/Frequently-Asked-Questions#notifications-pycryptodome'
-                                                   % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO)) + '" target="_blank">FAQ</a>.',
+                'description': '<strong>The PyCryptodome library is missing. '
+                               'The content of your notifications will be sent unencrypted!</strong><br>'
+                               'Please install the library to encrypt the notification contents. '
+                               'Instructions can be found in the '
+                               '<a href="' + helpers.anon_url(
+                                   'https://github.com/%s/%s-Wiki/wiki/'
+                                   'Frequently-Asked-Questions#notifications-pycryptodome'
+                                   % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO)) +
+                               '" target="_blank">FAQ</a>.',
                 'input_type': 'help'
                 })
         else:
             config_option.append({
                 'label': 'Note',
-                'description': 'The PyCryptodome library was found. ' \
+                'description': 'The PyCryptodome library was found. '
                                'The content of your notifications will be sent encrypted!',
                 'input_type': 'help'
                 })
@@ -911,7 +914,8 @@ class ANDROIDAPP(Notifier):
         config_option[-1]['description'] += '<br><br>Notifications are sent using the ' \
             '<a href="' + helpers.anon_url('https://onesignal.com') + '" target="_blank">' \
             'OneSignal</a> API. Some user data is collected and cannot be encrypted. ' \
-            'Please read the <a href="' + helpers.anon_url('https://onesignal.com/privacy_policy') + '" target="_blank">' \
+            'Please read the <a href="' + helpers.anon_url(
+                'https://onesignal.com/privacy_policy') + '" target="_blank">' \
             'OneSignal Privacy Policy</a> for more details.'
 
         devices = self.get_devices()
@@ -919,8 +923,8 @@ class ANDROIDAPP(Notifier):
         if not devices:
             config_option.append({
                 'label': 'Device',
-                'description': 'No devices registered. ' \
-                    '<a data-tab-destination="tabs-android_app" data-toggle="tab" data-dismiss="modal" ' \
+                'description': 'No devices registered. '
+                               '<a data-tab-destination="tabs-android_app" data-toggle="tab" data-dismiss="modal" '
                                'style="cursor: pointer;">Get the Android App</a> and register a device.',
                 'input_type': 'help'
                 })
@@ -929,8 +933,8 @@ class ANDROIDAPP(Notifier):
                 'label': 'Device',
                 'value': self.config['device_id'],
                 'name': 'androidapp_device_id',
-                'description': 'Set your Android app device or ' \
-                    '<a data-tab-destination="tabs-android_app" data-toggle="tab" data-dismiss="modal" ' \
+                'description': 'Set your Android app device or '
+                               '<a data-tab-destination="tabs-android_app" data-toggle="tab" data-dismiss="modal" '
                                'style="cursor: pointer;">register a new device</a> with Tautulli.',
                 'input_type': 'select',
                 'select_options': devices
@@ -1184,7 +1188,7 @@ class DISCORD(Notifier):
                           'value': self.config['incl_card'],
                           'name': 'discord_incl_card',
                           'description': 'Include an info card with a poster and metadata with the notifications.<br>'
-                                         'Imgur upload may need to be enabled under the notifications settings tab.',
+                                         'Note: Imgur upload may need to be enabled under the notifications settings tab.',
                           'input_type': 'checkbox'
                           },
                          {'label': 'Include Plot Summaries',
@@ -1209,7 +1213,7 @@ class DISCORD(Notifier):
                           'value': self.config['movie_provider'],
                           'name': 'discord_movie_provider',
                           'description': 'Select the source for movie links on the info cards. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_movie_providers()
                           },
@@ -1217,7 +1221,7 @@ class DISCORD(Notifier):
                           'value': self.config['tv_provider'],
                           'name': 'discord_tv_provider',
                           'description': 'Select the source for tv show links on the info cards. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_tv_providers()
                           },
@@ -1557,14 +1561,14 @@ class FACEBOOK(Notifier):
                           'value': self.config['incl_card'],
                           'name': 'facebook_incl_card',
                           'description': 'Include an info card with a poster and metadata with the notifications.<br>'
-                                         'Imgur upload may need to be enabled under the notifications settings tab.',
+                                         'Note: Imgur upload may need to be enabled under the notifications settings tab.',
                           'input_type': 'checkbox'
                           },
                          {'label': 'Movie Link Source',
                           'value': self.config['movie_provider'],
                           'name': 'facebook_movie_provider',
                           'description': 'Select the source for movie links on the info cards. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_movie_providers()
                           },
@@ -1572,7 +1576,7 @@ class FACEBOOK(Notifier):
                           'value': self.config['tv_provider'],
                           'name': 'facebook_tv_provider',
                           'description': 'Select the source for tv show links on the info cards. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_tv_providers()
                           },
@@ -1616,6 +1620,7 @@ class GROUPME(Notifier):
                 poster_content = result[0]
             else:
                 poster_content = ''
+                logger.error(u"Tautulli Notifiers :: Unable to retrieve image for {name}.".format(name=self.NAME))
 
             if poster_content:
                 headers = {'X-Access-Token': self.config['access_token'],
@@ -1629,9 +1634,9 @@ class GROUPME(Notifier):
                     data['attachments'] = [{'type': 'image',
                                             'url': r_content['payload']['picture_url']}]
                 else:
-                    logger.error(u"Tautulli Notifiers :: {name} poster failed: [{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
+                    logger.error(u"Tautulli Notifiers :: {name} poster failed: "
+                                 u"[{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
                     logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
-                    return False
 
         return self.make_request('https://api.groupme.com/v3/bots/post', json=data)
 
@@ -1835,7 +1840,7 @@ class HIPCHAT(Notifier):
 
         headers = {'Content-type': 'application/json'}
 
-        return self.make_request(self.config['hook'], json=data)
+        return self.make_request(self.config['hook'], headers=headers, json=data)
 
     def return_config_options(self):
         config_option = [{'label': 'Hipchat Custom Integrations Full URL',
@@ -1877,7 +1882,7 @@ class HIPCHAT(Notifier):
                           'value': self.config['incl_card'],
                           'name': 'hipchat_incl_card',
                           'description': 'Include an info card with a poster and metadata with the notifications.<br>'
-                                         'Imgur upload may need to be enabled under the notifications settings tab.<br>'
+                                         'Note: Imgur upload may need to be enabled under the notifications settings tab.<br>'
                                          'Note: This will change the notification type to HTML and emoticons will no longer work.',
                           'input_type': 'checkbox'
                           },
@@ -1897,7 +1902,7 @@ class HIPCHAT(Notifier):
                           'value': self.config['movie_provider'],
                           'name': 'hipchat_movie_provider',
                           'description': 'Select the source for movie links on the info cards. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_movie_providers()
                           },
@@ -1905,7 +1910,7 @@ class HIPCHAT(Notifier):
                           'value': self.config['tv_provider'],
                           'name': 'hipchat_tv_provider',
                           'description': 'Select the source for tv show links on the info cards. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_tv_providers()
                           },
@@ -1927,7 +1932,7 @@ class IFTTT(Notifier):
     """
     NAME = 'IFTTT'
     _DEFAULT_CONFIG = {'key': '',
-                       'event': 'plexpy'
+                       'event': 'tautulli'
                        }
 
     def agent_notify(self, subject='', body='', action='', **kwargs):
@@ -2090,14 +2095,14 @@ class JOIN(Notifier):
                           'value': self.config['incl_poster'],
                           'name': 'join_incl_poster',
                           'description': 'Include a poster with the notifications.<br>'
-                                         'Imgur upload may need to be enabled under the notifications settings tab.',
+                                         'Note: Imgur upload may need to be enabled under the notifications settings tab.',
                           'input_type': 'checkbox'
                           },
                          {'label': 'Movie Link Source',
                           'value': self.config['movie_provider'],
                           'name': 'join_movie_provider',
                           'description': 'Select the source for movie links in the notificaation. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_movie_providers()
                           },
@@ -2105,7 +2110,7 @@ class JOIN(Notifier):
                           'value': self.config['tv_provider'],
                           'name': 'join_tv_provider',
                           'description': 'Select the source for tv show links in the notificaation. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_tv_providers()
                           },
@@ -2130,7 +2135,7 @@ class MQTT(Notifier):
                        'protocol': 'MQTTv311',
                        'username': '',
                        'password': '',
-                       'clientid': 'plexpy',
+                       'clientid': 'tautulli',
                        'topic': '',
                        'qos': 1,
                        'retain': 0,
@@ -2315,7 +2320,7 @@ class OSX(Notifier):
         self.objc.classAddMethod(cls, SEL, new_IMP)
 
     def _swizzled_bundleIdentifier(self, original, swizzled):
-        return 'ade.plexpy.osxnotify'
+        return 'ade.tautulli.osxnotify'
 
     def agent_notify(self, subject='', body='', action='', **kwargs):
 
@@ -2559,29 +2564,66 @@ class PUSHBULLET(Notifier):
     NAME = 'Pushbullet'
     _DEFAULT_CONFIG = {'api_key': '',
                        'device_id': '',
-                       'channel_tag': ''
+                       'channel_tag': '',
+                       'incl_subject': 1,
+                       'incl_poster': 0
                        }
 
     def agent_notify(self, subject='', body='', action='', **kwargs):
         data = {'type': 'note',
-                'title': subject.encode("utf-8"),
                 'body': body.encode("utf-8")}
 
+        headers = {'Content-type': 'application/json',
+                   'Access-Token': self.config['api_key']
+                   }
+
+        if self.config['incl_subject']:
+            data['title'] = subject.encode("utf-8")
+
         # Can only send to a device or channel, not both.
         if self.config['device_id']:
             data['device_iden'] = self.config['device_id']
         elif self.config['channel_tag']:
             data['channel_tag'] = self.config['channel_tag']
 
-        headers = {'Content-type': 'application/json',
-                   'Access-Token': self.config['api_key']
-                   }
+        if self.config['incl_poster'] and kwargs.get('parameters', {}).get('media_type'):
+            # Grab formatted metadata
+            pretty_metadata = PrettyMetadata(kwargs['parameters'])
+
+            # Retrieve the poster from Plex
+            result = pmsconnect.PmsConnect().get_image(img=pretty_metadata.parameters.get('poster_thumb', ''))
+            if result and result[0]:
+                poster_content = result[0]
+            else:
+                poster_content = ''
+                logger.error(u"Tautulli Notifiers :: Unable to retrieve image for {name}.".format(name=self.NAME))
+
+            if poster_content:
+                poster_filename = 'poster_{}.jpg'.format(pretty_metadata.parameters['rating_key'])
+                file_json = {'file_name': poster_filename, 'file_type': 'image/jpeg'}
+                files = {'file': (poster_filename, poster_content, 'image/jpeg')}
+
+                r = requests.post('https://api.pushbullet.com/v2/upload-request', headers=headers, json=file_json)
+
+                file_response = r.json()
+                upload_url = file_response.pop('upload_url')
+
+                r = requests.post(upload_url, files=files)
+
+                if r.status_code == 204:
+                    data['type'] = 'file'
+                    file_response.pop('data', None)
+                    data.update(file_response)
+                else:
+                    logger.error(u"Tautulli Notifiers :: Unable to upload image to {name}: "
+                                 u"[{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
+                    logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
 
         return self.make_request('https://api.pushbullet.com/v2/pushes', headers=headers, json=data)
 
     def get_devices(self):
         if self.config['api_key']:
-            headers={'Content-type': "application/json",
+            headers = {'Content-type': "application/json",
                        'Access-Token': self.config['api_key']
                        }
 
@@ -2594,7 +2636,8 @@ class PUSHBULLET(Notifier):
                 devices.update({'': ''})
                 return devices
             else:
-                logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} devices list: [{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
+                logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} devices list: "
+                             u"[{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
                 logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
                 return {'': ''}
 
@@ -2612,7 +2655,7 @@ class PUSHBULLET(Notifier):
                          {'label': 'Device',
                           'value': self.config['device_id'],
                           'name': 'pushbullet_device_id',
-                          'description': 'Set your Pushbullet device. If set, will override channel tag. ' \
+                          'description': 'Set your Pushbullet device. If set, will override channel tag. '
                                          'Leave blank to notify on all devices.',
                           'input_type': 'select',
                           'select_options': self.get_devices()
@@ -2622,6 +2665,18 @@ class PUSHBULLET(Notifier):
                           'name': 'pushbullet_channel_tag',
                           'description': 'A channel tag (optional).',
                           'input_type': 'text'
+                          },
+                         {'label': 'Include Subject Line',
+                          'value': self.config['incl_subject'],
+                          'name': 'pushbullet_incl_subject',
+                          'description': 'Include the subject line with the notifications.',
+                          'input_type': 'checkbox'
+                          },
+                         {'label': 'Include Poster Image',
+                          'value': self.config['incl_poster'],
+                          'name': 'pushbullet_incl_poster',
+                          'description': 'Include a poster with the notifications.',
+                          'input_type': 'checkbox'
                           }
                          ]
 
@@ -2639,6 +2694,8 @@ class PUSHOVER(Notifier):
                        'priority': 0,
                        'sound': '',
                        'incl_url': 1,
+                       'incl_subject': 1,
+                       'incl_poster': 0,
                        'movie_provider': '',
                        'tv_provider': '',
                        'music_provider': ''
@@ -2647,11 +2704,18 @@ class PUSHOVER(Notifier):
     def agent_notify(self, subject='', body='', action='', **kwargs):
         data = {'token': self.config['api_token'],
                 'user': self.config['key'],
-                'title': subject.encode("utf-8"),
                 'message': body.encode("utf-8"),
                 'sound': self.config['sound'],
                 'html': self.config['html_support'],
-                'priority': self.config['priority']}
+                'priority': self.config['priority'],
+                'timestamp': int(time.time())}
+
+        if self.config['incl_subject']:
+            data['title'] = subject.encode("utf-8")
+
+        headers = {'Content-type': 'application/x-www-form-urlencoded'}
+
+        files = {}
 
         if self.config['incl_url'] and kwargs.get('parameters', {}).get('media_type'):
             # Grab formatted metadata
@@ -2672,9 +2736,24 @@ class PUSHOVER(Notifier):
             data['url'] = provider_link
             data['url_title'] = caption
 
-        headers = {'Content-type': 'application/x-www-form-urlencoded'}
+        if self.config['incl_poster'] and kwargs.get('parameters', {}).get('media_type'):
+            # Grab formatted metadata
+            pretty_metadata = PrettyMetadata(kwargs['parameters'])
 
-        return self.make_request('https://api.pushover.net/1/messages.json', headers=headers, data=data)
+            # Retrieve the poster from Plex
+            result = pmsconnect.PmsConnect().get_image(img=pretty_metadata.parameters.get('poster_thumb', ''))
+            if result and result[0]:
+                poster_content = result[0]
+            else:
+                poster_content = ''
+                logger.error(u"Tautulli Notifiers :: Unable to retrieve image for {name}.".format(name=self.NAME))
+
+            if poster_content:
+                poster_filename = 'poster_{}.jpg'.format(pretty_metadata.parameters['rating_key'])
+                files = {'attachment': (poster_filename, poster_content, 'image/jpeg')}
+                headers = {}
+
+        return self.make_request('https://api.pushover.net/1/messages.json', headers=headers, data=data, files=files)
 
     def get_sounds(self):
         if self.config['api_token']:
@@ -2688,7 +2767,8 @@ class PUSHOVER(Notifier):
                 sounds.update({'': ''})
                 return sounds
             else:
-                logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} sounds list: [{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
+                logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} sounds list: "
+                             u"[{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
                 logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
                 return {'': ''}
 
@@ -2735,11 +2815,23 @@ class PUSHOVER(Notifier):
                           'description': 'Include a supplementary URL with the notifications.',
                           'input_type': 'checkbox'
                           },
+                         {'label': 'Include Subject Line',
+                          'value': self.config['incl_subject'],
+                          'name': 'pushover_incl_subject',
+                          'description': 'Include the subject line with the notifications.',
+                          'input_type': 'checkbox'
+                          },
+                         {'label': 'Include Poster Image',
+                          'value': self.config['incl_poster'],
+                          'name': 'pushover_incl_poster',
+                          'description': 'Include a poster with the notifications.',
+                          'input_type': 'checkbox'
+                          },
                          {'label': 'Movie Link Source',
                           'value': self.config['movie_provider'],
                           'name': 'pushover_movie_provider',
                           'description': 'Select the source for movie links in the notification. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_movie_providers()
                           },
@@ -2747,7 +2839,7 @@ class PUSHOVER(Notifier):
                           'value': self.config['tv_provider'],
                           'name': 'pushover_tv_provider',
                           'description': 'Select the source for tv show links in the notification. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_tv_providers()
                           },
@@ -3074,7 +3166,7 @@ class SLACK(Notifier):
                           'value': self.config['incl_card'],
                           'name': 'slack_incl_card',
                           'description': 'Include an info card with a poster and metadata with the notifications.<br>'
-                                         'Imgur upload may need to be enabled under the notifications settings tab.',
+                                         'Note: Imgur upload may need to be enabled under the notifications settings tab.',
                           'input_type': 'checkbox'
                           },
                          {'label': 'Include Plot Summaries',
@@ -3099,7 +3191,7 @@ class SLACK(Notifier):
                           'value': self.config['movie_provider'],
                           'name': 'slack_movie_provider',
                           'description': 'Select the source for movie links on the info cards. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_movie_providers()
                           },
@@ -3107,7 +3199,7 @@ class SLACK(Notifier):
                           'value': self.config['tv_provider'],
                           'name': 'slack_tv_provider',
                           'description': 'Select the source for tv show links on the info cards. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_tv_providers()
                           },
@@ -3144,41 +3236,46 @@ class TELEGRAM(Notifier):
         else:
             text = body.encode('utf-8')
 
-        if self.config['incl_poster'] and kwargs.get('parameters'):
-            parameters = kwargs['parameters']
-            poster_url = parameters.get('poster_url','')
-
-            if poster_url:
-                poster_data = {'photo': poster_url,
-                               'chat_id': self.config['chat_id'],
-                               'disable_notification': True}
-
-                r = requests.post('https://api.telegram.org/bot{}/sendPhoto'.format(self.config['bot_token']), json=poster_data)
-
-                if r.status_code == 200:
-                    logger.info(u"Tautulli Notifiers :: {name} poster sent.".format(name=self.NAME))
-                else:
-                    logger.error(u"Tautulli Notifiers :: {name} poster failed: [{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
-                    logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
-
-        data['text'] = text
-
         if self.config['html_support']:
             data['parse_mode'] = 'HTML'
 
+        if self.config['incl_poster'] and kwargs.get('parameters'):
+            # Grab formatted metadata
+            pretty_metadata = PrettyMetadata(kwargs['parameters'])
+
+            # Retrieve the poster from Plex
+            result = pmsconnect.PmsConnect().get_image(img=pretty_metadata.parameters.get('poster_thumb', ''))
+            if result and result[0]:
+                poster_content = result[0]
+            else:
+                poster_content = ''
+                logger.error(u"Tautulli Notifiers :: Unable to retrieve image for {name}.".format(name=self.NAME))
+
+            if poster_content:
+                poster_filename = 'poster_{}.jpg'.format(pretty_metadata.parameters['rating_key'])
+                files = {'photo': (poster_filename, poster_content, 'image/jpeg')}
+                data['caption'] = text
+
+                return self.make_request('https://api.telegram.org/bot{}/sendPhoto'.format(self.config['bot_token']),
+                                         data=data, files=files)
+
+        data['text'] = text
+
         if self.config['disable_web_preview']:
             data['disable_web_page_preview'] = True
 
         headers = {'Content-type': 'application/x-www-form-urlencoded'}
 
-        return self.make_request('https://api.telegram.org/bot{}/sendMessage'.format(self.config['bot_token']), headers=headers, data=data)
+        return self.make_request('https://api.telegram.org/bot{}/sendMessage'.format(self.config['bot_token']),
+                                 headers=headers, data=data)
 
     def return_config_options(self):
         config_option = [{'label': 'Telegram Bot Token',
                           'value': self.config['bot_token'],
                           'name': 'telegram_bot_token',
                           'description': 'Your Telegram bot token. '
-                                         'Contact <a href="' + helpers.anon_url('https://telegram.me/BotFather') + '" target="_blank">@BotFather</a>'
+                                         'Contact <a href="' + helpers.anon_url('https://telegram.me/BotFather') +
+                                         '" target="_blank">@BotFather</a>'
                                          ' on Telegram to get one.',
                           'input_type': 'text'
                           },
@@ -3186,7 +3283,8 @@ class TELEGRAM(Notifier):
                           'value': self.config['chat_id'],
                           'name': 'telegram_chat_id',
                           'description': 'Your Telegram Chat ID, Group ID, or @channelusername. '
-                                         'Contact <a href="' + helpers.anon_url('https://telegram.me/myidbot') + '" target="_blank">@myidbot</a>'
+                                         'Contact <a href="' + helpers.anon_url('https://telegram.me/myidbot') +
+                                         '" target="_blank">@myidbot</a>'
                                          ' on Telegram to get an ID.',
                           'input_type': 'text'
                           },
@@ -3199,8 +3297,7 @@ class TELEGRAM(Notifier):
                          {'label': 'Include Poster Image',
                           'value': self.config['incl_poster'],
                           'name': 'telegram_incl_poster',
-                          'description': 'Include a poster with the notifications.<br>'
-                                         'Imgur upload may need to be enabled under the notifications settings tab.',
+                          'description': 'Include a poster with the notifications.',
                           'input_type': 'checkbox'
                           },
                          {'label': 'Enable HTML Support',
@@ -3310,7 +3407,7 @@ class TWITTER(Notifier):
                           'value': self.config['incl_poster'],
                           'name': 'twitter_incl_poster',
                           'description': 'Include a poster with the notifications.<br>'
-                                         'Imgur upload may need to be enabled under the notifications settings tab.',
+                                         'Note: Imgur upload may need to be enabled under the notifications settings tab.',
                           'input_type': 'checkbox'
                           }
                          ]
@@ -3501,7 +3598,7 @@ class ZAPIER(Notifier):
                           'value': self.config['movie_provider'],
                           'name': 'zapier_movie_provider',
                           'description': 'Select the source for movie links in the notification. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_movie_providers()
                           },
@@ -3509,7 +3606,7 @@ class ZAPIER(Notifier):
                           'value': self.config['tv_provider'],
                           'name': 'zapier_tv_provider',
                           'description': 'Select the source for tv show links in the notification. Leave blank for default.<br>'
-                                         '3rd party API lookup may need to be enabled under the notifications settings tab.',
+                                         'Note: 3rd party API lookup may need to be enabled under the notifications settings tab.',
                           'input_type': 'select',
                           'select_options': PrettyMetadata().get_tv_providers()
                           },

plexpy/pmsconnect.py

@@ -1404,6 +1404,10 @@ class PmsConnect(object):
                                'location': 'wan' if player_details['local'] == '0' else 'lan'
                                }
 
+        # Check if using Plex Relay
+        session_details['relay'] = int(session_details['location'] != 'lan'
+                                       and player_details['ip_address_public'] == '127.0.0.1')
+
         # Get the transcode details
         if session.getElementsByTagName('TranscodeSession'):
             transcode_info = session.getElementsByTagName('TranscodeSession')[0]

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_BRANCH = "beta"
-PLEXPY_RELEASE_VERSION = "v2.0.19-beta"
+PLEXPY_RELEASE_VERSION = "v2.0.21-beta"

plexpy/versioncheck.py

@@ -20,9 +20,9 @@ import subprocess
 import tarfile
 
 import plexpy
+import common
 import logger
 import request
-import version
 
 
 def runGit(args):
@@ -65,7 +65,7 @@ def runGit(args):
 
 def getVersion():
 
-    if version.PLEXPY_BRANCH.startswith('win32build'):
+    if common.BRANCH.startswith('win32build'):
         plexpy.INSTALL_TYPE = 'win'
 
         # Don't have a way to update exe yet, but don't want to set VERSION to None
@@ -120,15 +120,15 @@ def getVersion():
         version_file = os.path.join(plexpy.PROG_DIR, 'version.txt')
 
         if not os.path.isfile(version_file):
-            return None, 'origin', 'master'
+            return None, 'origin', common.BRANCH
 
         with open(version_file, 'r') as f:
             current_version = f.read().strip(' \n\r')
 
         if current_version:
-            return current_version, plexpy.CONFIG.GIT_REMOTE, plexpy.CONFIG.GIT_BRANCH
+            return current_version, 'origin', common.BRANCH
         else:
-            return None, 'origin', 'master'
+            return None, 'origin', common.BRANCH
 
 
 def checkGithub(auto_update=False):
@@ -196,6 +196,8 @@ def checkGithub(auto_update=False):
         else:
             release = releases[0]
 
+        plexpy.LATEST_RELEASE = release['tag_name']
+
         plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpyupdate', 'plexpy_download_info': release,
                                  'plexpy_update_commit': plexpy.LATEST_VERSION, 'plexpy_update_behind': plexpy.COMMITS_BEHIND})
 

plexpy/webserve.py

@@ -63,7 +63,7 @@ def serve_template(templatename, **kwargs):
 
     http_root = plexpy.HTTP_ROOT
     server_name = plexpy.CONFIG.PMS_NAME
-    cache_param = '?' + (plexpy.CURRENT_VERSION or common.VERSION_NUMBER)
+    cache_param = '?' + (plexpy.CURRENT_VERSION or common.RELEASE)
 
     _session = get_session_info()
 
@@ -1799,7 +1799,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_plays_by_date(self, time_range='30', user_id=None, y_axis='plays', **kwargs):
+    def get_plays_by_date(self, time_range='30', user_id=None, y_axis='plays', grouping=None, **kwargs):
         """ Get graph data by date.
 
             ```
@@ -1810,6 +1810,7 @@ class WebInterface(object):
                 time_range (str):       The number of days of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -1823,8 +1824,10 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
-        result = graph.get_total_plays_per_day(time_range=time_range, user_id=user_id, y_axis=y_axis)
+        result = graph.get_total_plays_per_day(time_range=time_range, user_id=user_id, y_axis=y_axis, grouping=grouping)
 
         if result:
             return result
@@ -1835,7 +1838,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_plays_by_dayofweek(self, time_range='30', user_id=None, y_axis='plays', **kwargs):
+    def get_plays_by_dayofweek(self, time_range='30', user_id=None, y_axis='plays', grouping=None, **kwargs):
         """ Get graph data by day of the week.
 
             ```
@@ -1846,6 +1849,7 @@ class WebInterface(object):
                 time_range (str):       The number of days of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -1859,6 +1863,8 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
         result = graph.get_total_plays_per_dayofweek(time_range=time_range, user_id=user_id, y_axis=y_axis)
 
@@ -1871,7 +1877,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_plays_by_hourofday(self, time_range='30', user_id=None, y_axis='plays', **kwargs):
+    def get_plays_by_hourofday(self, time_range='30', user_id=None, y_axis='plays', grouping=None, **kwargs):
         """ Get graph data by hour of the day.
 
             ```
@@ -1882,6 +1888,7 @@ class WebInterface(object):
                 time_range (str):       The number of days of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -1895,6 +1902,8 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
         result = graph.get_total_plays_per_hourofday(time_range=time_range, user_id=user_id, y_axis=y_axis)
 
@@ -1907,7 +1916,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_plays_per_month(self, time_range='12', y_axis='plays', user_id=None, **kwargs):
+    def get_plays_per_month(self, time_range='12', y_axis='plays', user_id=None, grouping=None, **kwargs):
         """ Get graph data by month.
 
             ```
@@ -1918,6 +1927,7 @@ class WebInterface(object):
                 time_range (str):       The number of months of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -1931,6 +1941,8 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
         result = graph.get_total_plays_per_month(time_range=time_range, y_axis=y_axis, user_id=user_id)
 
@@ -1943,7 +1955,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_plays_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None, **kwargs):
+    def get_plays_by_top_10_platforms(self, time_range='30', y_axis='plays', grouping=None, user_id=None, **kwargs):
         """ Get graph data by top 10 platforms.
 
             ```
@@ -1954,6 +1966,7 @@ class WebInterface(object):
                 time_range (str):       The number of days of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -1967,6 +1980,8 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
         result = graph.get_total_plays_by_top_10_platforms(time_range=time_range, y_axis=y_axis, user_id=user_id)
 
@@ -1979,7 +1994,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_plays_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None, **kwargs):
+    def get_plays_by_top_10_users(self, time_range='30', y_axis='plays', grouping=None, user_id=None, **kwargs):
         """ Get graph data by top 10 users.
 
             ```
@@ -1990,6 +2005,7 @@ class WebInterface(object):
                 time_range (str):       The number of days of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -2003,6 +2019,8 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
         result = graph.get_total_plays_by_top_10_users(time_range=time_range, y_axis=y_axis, user_id=user_id)
 
@@ -2015,7 +2033,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_plays_by_stream_type(self, time_range='30', y_axis='plays', user_id=None, **kwargs):
+    def get_plays_by_stream_type(self, time_range='30', y_axis='plays', grouping=None, user_id=None, **kwargs):
         """ Get graph data by stream type by date.
 
             ```
@@ -2026,6 +2044,7 @@ class WebInterface(object):
                 time_range (str):       The number of days of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -2039,6 +2058,8 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
         result = graph.get_total_plays_per_stream_type(time_range=time_range, y_axis=y_axis, user_id=user_id)
 
@@ -2051,7 +2072,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_plays_by_source_resolution(self, time_range='30', y_axis='plays', user_id=None, **kwargs):
+    def get_plays_by_source_resolution(self, time_range='30', y_axis='plays', grouping=None, user_id=None, **kwargs):
         """ Get graph data by source resolution.
 
             ```
@@ -2062,6 +2083,7 @@ class WebInterface(object):
                 time_range (str):       The number of days of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -2075,6 +2097,8 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
         result = graph.get_total_plays_by_source_resolution(time_range=time_range, y_axis=y_axis, user_id=user_id)
 
@@ -2087,7 +2111,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_plays_by_stream_resolution(self, time_range='30', y_axis='plays', user_id=None, **kwargs):
+    def get_plays_by_stream_resolution(self, time_range='30', y_axis='plays', grouping=None, user_id=None, **kwargs):
         """ Get graph data by stream resolution.
 
             ```
@@ -2098,6 +2122,7 @@ class WebInterface(object):
                 time_range (str):       The number of days of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -2111,6 +2136,8 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
         result = graph.get_total_plays_by_stream_resolution(time_range=time_range, y_axis=y_axis, user_id=user_id)
 
@@ -2123,7 +2150,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_stream_type_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None, **kwargs):
+    def get_stream_type_by_top_10_users(self, time_range='30', y_axis='plays', grouping=None, user_id=None, **kwargs):
         """ Get graph data by stream type by top 10 users.
 
             ```
@@ -2134,6 +2161,7 @@ class WebInterface(object):
                 time_range (str):       The number of days of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -2147,6 +2175,8 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
         result = graph.get_stream_type_by_top_10_users(time_range=time_range, y_axis=y_axis, user_id=user_id)
 
@@ -2159,7 +2189,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_stream_type_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None, **kwargs):
+    def get_stream_type_by_top_10_platforms(self, time_range='30', y_axis='plays', grouping=None, user_id=None, **kwargs):
         """ Get graph data by stream type by top 10 platforms.
 
             ```
@@ -2170,6 +2200,7 @@ class WebInterface(object):
                 time_range (str):       The number of days of data to return
                 y_axis (str):           "plays" or "duration"
                 user_id (str):          The user id to filter the data
+                grouping (int):         0 or 1
 
             Returns:
                 json:
@@ -2183,6 +2214,8 @@ class WebInterface(object):
                      }
             ```
         """
+        grouping = int(grouping) if str(grouping).isdigit() else grouping
+
         graph = graphs.Graphs()
         result = graph.get_stream_type_by_top_10_platforms(time_range=time_range, y_axis=y_axis, user_id=user_id)
 
@@ -2260,7 +2293,7 @@ class WebInterface(object):
         filtered = []
         fa = filt.append
 
-        if logfile == "plexpy_api":
+        if logfile == "tautulli_api":
             filename = logger.FILENAME_API
         elif logfile == "plex_websocket":
             filename = logger.FILENAME_PLEX_WEBSOCKET
@@ -2463,7 +2496,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
     def delete_logs(self, logfile='', **kwargs):
-        if logfile == "plexpy_api":
+        if logfile == "tautulli_api":
             filename = logger.FILENAME_API
         elif logfile == "plex_websocket":
             filename = logger.FILENAME_PLEX_WEBSOCKET
@@ -2505,7 +2538,7 @@ class WebInterface(object):
     @cherrypy.expose
     @requireAuth(member_of("admin"))
     def logFile(self, logfile='', **kwargs):
-        if logfile == "plexpy_api":
+        if logfile == "tautulli_api":
             filename = logger.FILENAME_API
         elif logfile == "plex_websocket":
             filename = logger.FILENAME_PLEX_WEBSOCKET
@@ -2697,8 +2730,8 @@ class WebInterface(object):
             reschedule = True
 
         # If we change the SSL setting for PMS or PMS remote setting, make sure we grab the new url.
-        if kwargs.get('pms_ssl') != plexpy.CONFIG.PMS_SSL or \
-            kwargs.get('pms_is_remote') != plexpy.CONFIG.PMS_IS_REMOTE or \
+        if kwargs.get('pms_ssl') != str(plexpy.CONFIG.PMS_SSL) or \
+            kwargs.get('pms_is_remote') != str(plexpy.CONFIG.PMS_IS_REMOTE) or \
             kwargs.get('pms_url_manual') != plexpy.CONFIG.PMS_URL_MANUAL:
             server_changed = True
 
@@ -3543,14 +3576,30 @@ class WebInterface(object):
 
         if not plexpy.CURRENT_VERSION:
             return {'result': 'error',
-                    'message': 'You are running an unknown version of Tautulli.',
-                    'update': None}
+                    'update': None,
+                    'message': 'You are running an unknown version of Tautulli.'
+                    }
 
-        elif plexpy.CURRENT_VERSION != plexpy.LATEST_VERSION and \
-                plexpy.COMMITS_BEHIND > 0 and plexpy.INSTALL_TYPE != 'win':
+        elif plexpy.COMMITS_BEHIND > 0 and plexpy.common.BRANCH in ('master', 'beta') and \
+                plexpy.common.RELEASE != plexpy.LATEST_RELEASE:
             return {'result': 'success',
                     'update': True,
-                    'message': 'An update for Tautulli is available.',
+                    'release': True,
+                    'message': 'A new release (%) of Tautulli is available.' % plexpy.LATEST_RELEASE,
+                    'latest_release': plexpy.LATEST_RELEASE,
+                    'release_url': helpers.anon_url(
+                        'https://github.com/%s/%s/releases/tag/%s'
+                        % (plexpy.CONFIG.GIT_USER,
+                           plexpy.CONFIG.GIT_REPO,
+                           plexpy.LATEST_RELEASE))
+                    }
+
+        elif plexpy.COMMITS_BEHIND > 0 and plexpy.CURRENT_VERSION != plexpy.LATEST_VERSION and \
+                plexpy.INSTALL_TYPE != 'win':
+            return {'result': 'success',
+                    'update': True,
+                    'release': False,
+                    'message': 'A newer version of Tautulli is available.',
                     'latest_version': plexpy.LATEST_VERSION,
                     'commits_behind': plexpy.COMMITS_BEHIND,
                     'compare_url': helpers.anon_url(
@@ -3564,7 +3613,8 @@ class WebInterface(object):
         else:
             return {'result': 'success',
                     'update': False,
-                    'message': 'Tautulli is up to date.'}
+                    'message': 'Tautulli is up to date.'
+                    }
 
     @cherrypy.expose
     @requireAuth(member_of("admin"))
@@ -3618,7 +3668,7 @@ class WebInterface(object):
         latest_only = (latest_only == 'true')
         since_prev_release = (since_prev_release == 'true')
 
-        if since_prev_release and plexpy.PREV_RELEASE == common.VERSION_NUMBER:
+        if since_prev_release and plexpy.PREV_RELEASE == common.RELEASE:
             latest_only = True
             since_prev_release = False
 
@@ -3862,7 +3912,7 @@ class WebInterface(object):
     @addtoapi()
     def download_log(self, logfile='', **kwargs):
         """ Download the Tautulli log file. """
-        if logfile == "plexpy_api":
+        if logfile == "tautulli_api":
             filename = logger.FILENAME_API
             log = logger.logger_api
         elif logfile == "plex_websocket":
@@ -4656,6 +4706,7 @@ class WebInterface(object):
                              "quality_profile": "Original",
                              "rating": "7.8",
                              "rating_key": "153037",
+                             "relay": 0,
                              "section_id": "2",
                              "session_id": "helf15l3rxgw01xxe0jf3l3d",
                              "session_key": "27",

plexpy/webstart.py

@@ -72,7 +72,7 @@ def initialize(options):
         if plexpy.CONFIG.HTTP_PLEX_ADMIN:
             login_allowed.append("Plex admin")
 
-        logger.info(u"Tautulli WebStart :: Web server authentication is enabled: %s allowed", ' and '.join(login_allowed))
+        logger.info(u"Tautulli WebStart :: Web server authentication is enabled: %s.", ' and '.join(login_allowed))
 
         if options['http_basic_auth']:
             auth_enabled = False