Merge in the latest from pkkid

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -0,0 +1,66 @@
+name: Bug Report
+description: Create a bug report to help us improve.
+body:
+  - type: markdown
+    attributes:
+      value: >
+        **THIS IS NOT THE PLACE TO ASK FOR SUPPORT!**
+        Please use [Discord](https://discord.gg/GtAnnZAkuw) for support issues.
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the Bug
+      description: A clear and concise description of the bug.
+    validations:
+      required: true
+  - type: textarea
+    id: code
+    attributes:
+      label: Code Snippets
+      description: >
+        Add a code snippet that can be used to reproduce the bug.
+        This will be automatically formatted into code, so no need for backticks.
+      render: python
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behavior
+      description: A clear and concise description of what you expected to happen.
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Add any other context about the bug here.
+  - type: input
+    id: os
+    attributes:
+      label: Operating System and Version
+      placeholder: eg. Windows 10, macOS 10.15, Ubuntu 20.04, etc.
+    validations:
+      required: true
+  - type: input
+    id: plex
+    attributes:
+      label: Plex Media Server Version
+      description: Check Plex Server > Settings (not Plex Web) > General.
+      placeholder: eg. 1.24.4.5081
+    validations:
+      required: true
+  - type: input
+    id: python
+    attributes:
+      label: Python Version
+      placeholder: eg. 3.7.10
+    validations:
+      required: true
+  - type: input
+    id: plexapi
+    attributes:
+      label: PlexAPI Version
+      placeholder: eg. 4.7.2
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        Make sure to close your issue when it's solved! If you found the solution yourself please comment so that others benefit from it.

.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "11:00"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "11:00"
+    open-pull-requests-limit: 10

.github/workflows/ci.yaml

@@ -251,6 +251,6 @@ jobs:
         coverage xml
 
     - name: Upload ${{ matrix.plex }} coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2.1.0
       with:
         flags: ${{ matrix.plex }}

.github/workflows/pypi.yml

@@ -4,6 +4,7 @@
 name: PyPI
 
 on:
+  workflow_dispatch: ~
   release:
     types: [published]
 
@@ -26,6 +27,7 @@ jobs:
     - name: Install dependencies and build
       run: |
         pip install -U pip
+        pip install -r requirements.txt
         pip install setuptools wheel
         python setup.py sdist bdist_wheel
 

.gitignore

@@ -26,7 +26,7 @@ lib/
 pip-selfcheck.json
 pyvenv.cfg
 MANIFEST
-
+venv/
 
 # path for the test lib.
 tools/plex

plexapi/__init__.py

@@ -6,6 +6,7 @@
 from uuid import getnode
 
 from plexapi.config import PlexConfig, reset_base_headers
+import plexapi.const as const
 from plexapi.utils import SecretsFilter
 
 # Load User Defined Config
@@ -15,7 +16,7 @@
 
 # PlexAPI Settings
 PROJECT = 'PlexAPI'
-VERSION = '4.4.1'
+VERSION = __version__ = const.__version__
 TIMEOUT = CONFIG.get('plexapi.timeout', 30, int)
 X_PLEX_CONTAINER_SIZE = CONFIG.get('plexapi.container_size', 100, int)
 X_PLEX_ENABLE_FAST_CONNECT = CONFIG.get('plexapi.enable_fast_connect', False, bool)

plexapi/alert.py

@@ -29,14 +29,18 @@ class AlertListener(threading.Thread):
             callback (func): Callback function to call on received messages. The callback function
                 will be sent a single argument 'data' which will contain a dictionary of data
                 received from the server. :samp:`def my_callback(data): ...`
+            callbackError (func): Callback function to call on errors. The callback function
+                will be sent a single argument 'error' which will contain the Error object.
+                :samp:`def my_callback(error): ...`
     """
     key = '/:/websockets/notifications'
 
-    def __init__(self, server, callback=None):
+    def __init__(self, server, callback=None, callbackError=None):
         super(AlertListener, self).__init__()
         self.daemon = True
         self._server = server
         self._callback = callback
+        self._callbackError = callbackError
         self._ws = None
 
     def run(self):
@@ -84,4 +88,9 @@ def _onError(self, *args):  # pragma: no cover
             This is to support compatibility with current and previous releases of websocket-client.
         """
         err = args[-1]
-        log.error('AlertListener Error: %s', err)
+        try:
+            log.error('AlertListener Error: %s', err)
+            if self._callbackError:
+                self._callbackError(err)
+        except Exception as err:  # pragma: no cover
+            log.error('AlertListener Error: Error: %s', err)