diff --git a/CHANGELOG.md b/CHANGELOG.md index 503e04a4..90c1e0e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## v1.2.0 (2015-09-29) + +* Added option to group consecutive plays in the history tables. +* Added option for websocket monitoring (still slightly experimental and disabled by default). +* Added global search option (searches your Plex library). +* Added option to update any items that may have had their rating keys changed. +* Added option to disable consecutive notifications. +* Some visual tweaks and fixes. +* Fix bug where monitoring wouldn't start up after first run. +* Fix bug showing incorrect transcode decisions for music tracks on history tables. + + ## v1.1.10 (2015-09-20) * Added dedicated settings section for home stats configuration with ability to show/hide selected stats and sections. diff --git a/PlexPy.py b/PlexPy.py index 0243ce0f..4d8d953f 100755 --- a/PlexPy.py +++ b/PlexPy.py @@ -20,7 +20,7 @@ import sys # Ensure lib added to path, before any other imports sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'lib/')) -from plexpy import webstart, logger +from plexpy import webstart, logger, web_socket import locale import time @@ -191,6 +191,16 @@ def main(): # Start the background threads plexpy.start() + # Open connection for websocket + if plexpy.CONFIG.MONITORING_USE_WEBSOCKET: + try: + web_socket.start_thread() + except: + logger.warn(u"Websocket :: Unable to open connection.") + # Fallback to polling + plexpy.POLLING_FAILOVER = True + plexpy.initialize_scheduler() + # Open webbrowser if plexpy.CONFIG.LAUNCH_BROWSER and not args.nolaunch: plexpy.launch_browser(plexpy.CONFIG.HTTP_HOST, http_port, diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 96aa9c81..8d721dad 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -37,7 +37,7 @@ from plexpy import version % elif plexpy.CONFIG.CHECK_GITHUB and plexpy.CURRENT_VERSION != plexpy.LATEST_VERSION and plexpy.COMMITS_BEHIND > 0 and plexpy.INSTALL_TYPE != 'win':
@@ -57,6 +57,18 @@ from plexpy import version