Update

- removed is_local because it was used incorrectly/was unnecessary
- added verify_ssl to config so the request will accept all certificates

Author: Makhuta

custom_components/plex_recently_added/__init__.py

@@ -17,7 +17,7 @@
     CONF_SECTION_LIBRARIES,
     CONF_EXCLUDE_KEYWORDS,
     CONF_ON_DECK,
-    CONF_LOCAL
+    CONF_VERIFY_SSL
     )
 
 
@@ -46,7 +46,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
             config_entry.data.get(CONF_SECTION_TYPES, []),
             config_entry.data.get(CONF_SECTION_LIBRARIES, []),
             config_entry.data.get(CONF_EXCLUDE_KEYWORDS, []),
-            config_entry.data[CONF_LOCAL],
+            config_entry.data[CONF_VERIFY_SSL],
         )
     except FailedToLogin as err:
         raise ConfigEntryNotReady("Failed to Log-in") from err

custom_components/plex_recently_added/config_flow.py

@@ -29,7 +29,7 @@
     CONF_SECTION_LIBRARIES,
     CONF_EXCLUDE_KEYWORDS,
     CONF_ON_DECK,
-    CONF_LOCAL
+    CONF_VERIFY_SSL
     )
 
 from .helpers import setup_client
@@ -44,7 +44,7 @@
     vol.Required(CONF_PORT, default=32400): vol.All(vol.Coerce(int), vol.Range(min=0)),
     vol.Required(CONF_API_KEY): vol.All(str),
     vol.Optional(CONF_SSL, default=False): vol.All(bool),
-    vol.Optional(CONF_LOCAL, default=False): vol.All(bool),
+    vol.Optional(CONF_VERIFY_SSL, default=True): vol.All(bool),
     vol.Optional(CONF_MAX, default=5): vol.All(vol.Coerce(int), vol.Range(min=0)),
     vol.Optional(CONF_ON_DECK, default=False): vol.All(bool),
     vol.Optional(CONF_SECTION_TYPES, default={"movie", "show"}): SelectSelector(SelectSelectorConfig(options=ALL_SECTION_TYPES, mode=SelectSelectorMode.DROPDOWN ,multiple=True)),
@@ -79,7 +79,7 @@ async def async_step_user(
                     user_input.get(CONF_SECTION_TYPES, []),
                     user_input.get(CONF_SECTION_LIBRARIES, []),
                     user_input.get(CONF_EXCLUDE_KEYWORDS, []),
-                    user_input[CONF_LOCAL],
+                    user_input[CONF_VERIFY_SSL],
                 )
             except FailedToLogin as err:
                 errors = {'base': 'failed_to_login'}

custom_components/plex_recently_added/const.py

@@ -11,7 +11,7 @@
 CONF_SECTION_LIBRARIES: Final = 'section_libraries'
 CONF_EXCLUDE_KEYWORDS: Final = 'exclude_keywords'
 CONF_ON_DECK: Final = 'on_deck'
-CONF_LOCAL: Final = 'is_local'
+CONF_VERIFY_SSL: Final = 'verify_ssl'
 
 
 USER_AGENT: Final = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.152 Safari/537.36"

custom_components/plex_recently_added/helpers.py

@@ -12,9 +12,9 @@ def setup_client(
     section_types: list,
     section_libraries: list,
     exclude_keywords: list,
-    is_local: bool,
+    verify_ssl: bool,
     ):
-    client = PlexApi(hass, ssl, token, max, on_deck, host, port, section_types, section_libraries, exclude_keywords, is_local)
+    client = PlexApi(hass, ssl, token, max, on_deck, host, port, section_types, section_libraries, exclude_keywords, verify_ssl)
 
     client.update()
     return client

custom_components/plex_recently_added/plex_api.py

@@ -1,6 +1,7 @@
 from pytz import timezone
 from xml.etree import ElementTree
 import requests
+from urllib3.exceptions import InsecureRequestWarning
 
 from homeassistant.core import HomeAssistant
 from .const import DEFAULT_PARSE_DICT, USER_AGENT, ACCEPTS
@@ -23,7 +24,7 @@ def __init__(
         section_types: list,
         section_libraries: list,
         exclude_keywords: list,
-        is_local: bool
+        verify_ssl: bool
     ):
         self._hass = hass
         self._ssl = 's' if ssl else ''
@@ -35,28 +36,26 @@ def __init__(
         self._section_types = section_types
         self._section_libraries = section_libraries
         self._exclude_keywords = exclude_keywords
-        self._is_local = is_local
+        self._verify_ssl = verify_ssl
 
     def update(self):
-        if self._is_local:
-            info_url = 'http{0}://{1}:{2}'.format(
-                self._ssl,
-                self._host,
-                self._port
-            )
-        else: 
-            info_url = 'http{0}://{1}'.format(
-                self._ssl,
-                self._host,
-            )
+        info_url = 'http{0}://{1}:{2}'.format(
+            self._ssl,
+            self._host,
+            self._port
+        )
 
         """ Getting the server identifier """
+        if not self._verify_ssl:
+            requests.packages.urllib3.disable_warnings(category=InsecureRequestWarning)
         try:
             info_res = requests.get(info_url + "/", headers={
                 "X-Plex-Token": self._token,
                 "User-agent": USER_AGENT,
                 "Accepts": ACCEPTS,
-            }, timeout=10)
+            },
+            verify=self._verify_ssl,
+            timeout=10)
             try:
                 root = ElementTree.fromstring(info_res.text)
             except:
@@ -79,7 +78,9 @@ def update(self):
                 "X-Plex-Token": self._token,
                 "User-agent": USER_AGENT,
                 "Accepts": ACCEPTS,
-            }, timeout=10)
+            },
+            verify=self._verify_ssl,
+            timeout=10)
             try:
                 root = ElementTree.fromstring(libraries.text)
             except:
@@ -100,7 +101,9 @@ def update(self):
                 "X-Plex-Token": self._token,
                 "User-agent": USER_AGENT,
                 "Accepts": ACCEPTS,
-            }, timeout=10)
+            },
+            verify=self._verify_ssl, 
+            timeout=10)
             try:
                 root = ElementTree.fromstring(sub_sec.text)
             except:

custom_components/plex_recently_added/strings.json

@@ -13,7 +13,7 @@
             "section_types": "Which section types to consider",
             "exclude_keywords": "Keyword to be exclude from the sensor",
             "section_libraries": "Which libraries to consider",
-            "is_local": "The server address is local (not using domain)"
+            "verify_ssl": "Verify SSL"
           }
         }
       },

custom_components/plex_recently_added/translations/en.json

@@ -13,7 +13,7 @@
           "section_types": "Which section types to consider",
           "exclude_keywords": "Keyword to be exclude from the sensor",
           "section_libraries": "Which libraries to consider",
-          "is_local": "The server address is local (not using domain)"
+          "verify_ssl": "Verify SSL"
         }
       }
     },