Fix

- issue with response not being XML

Author: Makhuta

custom_components/plex_recently_added/__init__.py

@@ -34,8 +34,7 @@
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     try:
-        client = await hass.async_add_executor_job(
-            setup_client,
+        client = await setup_client(
             hass,
             config_entry.data[CONF_SSL],
             config_entry.data[CONF_API_KEY],

custom_components/plex_recently_added/config_flow.py

@@ -67,8 +67,7 @@ async def async_step_user(
         if user_input is not None:
             self._async_abort_entries_match({CONF_API_KEY: user_input[CONF_API_KEY]})
             try:
-                await self.hass.async_add_executor_job(
-                    setup_client,
+                await setup_client(
                     self.hass,
                     user_input[CONF_SSL],
                     user_input[CONF_API_KEY],

custom_components/plex_recently_added/const.py

@@ -15,7 +15,7 @@
 
 
 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"
-ACCEPTS: Final = "application/xml"
+ACCEPTS: Final = "application/xml, text/xml;q=0.9"
 
 DEFAULT_PARSE_DICT: Final = {
     'title_default': '$title',

custom_components/plex_recently_added/coordinator.py

@@ -28,6 +28,6 @@ def __init__(self, hass: HomeAssistant, client: PlexApi):
 
     async def _async_update_data(self) -> Dict[str, Any]:
         try:
-            return await self.hass.async_add_executor_job(self._client.update)
+            return await self._client.update()
         except FailedToLogin:
             raise ConfigEntryError("Failed to Log-in") from err

custom_components/plex_recently_added/helpers.py

@@ -1,7 +1,7 @@
 from homeassistant.core import HomeAssistant
 from .plex_api import PlexApi
 
-def setup_client(
+async def setup_client(
     hass: HomeAssistant,
     ssl: bool,
     token: str,
@@ -16,5 +16,5 @@ def setup_client(
     ):
     client = PlexApi(hass, ssl, token, max, on_deck, host, port, section_types, section_libraries, exclude_keywords, verify_ssl)
 
-    client.update()
+    await client.update()
     return client

custom_components/plex_recently_added/plex_api.py

@@ -11,6 +11,10 @@
 import logging
 _LOGGER = logging.getLogger(__name__)
 
+def check_headers(response):
+    if 'text/xml' not in response.headers.get('Content-Type', '') and 'application/xml' not in response.headers.get('Content-Type', ''):
+        raise ValueError(f"Expected XML but received different content type: {response.headers.get('Content-Type')}")
+
 class PlexApi():
     def __init__(
         self,
@@ -37,8 +41,8 @@ def __init__(
         self._section_libraries = section_libraries
         self._exclude_keywords = exclude_keywords
         self._verify_ssl = verify_ssl
-
-    def update(self):
+    
+    async def update(self):
         info_url = 'http{0}://{1}:{2}'.format(
             self._ssl,
             self._host,
@@ -49,18 +53,20 @@ def update(self):
         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,
-            },
-            verify=self._verify_ssl,
-            timeout=10)
-            try:
-                root = ElementTree.fromstring(info_res.text)
-            except:
-                _LOGGER.error(info_res.text)
-                raise ElementTree.ParseError
+            info_res = await self._hass.async_add_executor_job(
+                requests.get,
+                f'{info_url}?X-Plex-Token={self._token}', 
+                {
+                    "headers":{
+                        "User-agent": USER_AGENT,
+                        "Accept": ACCEPTS,
+                    },
+                    "verify":self._verify_ssl,
+                    "timeout":10
+                }
+            )
+            check_headers(info_res)
+            root = ElementTree.fromstring(info_res.text)
             identifier = root.get("machineIdentifier")
         except OSError as e:
             raise FailedToLogin
@@ -74,18 +80,20 @@ def update(self):
         sections = []
         libs = []
         try:
-            libraries = requests.get(all_libraries, headers={
-                "X-Plex-Token": self._token,
-                "User-agent": USER_AGENT,
-                "Accepts": ACCEPTS,
-            },
-            verify=self._verify_ssl,
-            timeout=10)
-            try:
-                root = ElementTree.fromstring(libraries.text)
-            except:
-                _LOGGER.error(libraries.text)
-                raise ElementTree.ParseError
+            libraries = await self._hass.async_add_executor_job(
+                requests.get,
+                f'{all_libraries}?X-Plex-Token={self._token}', 
+                {
+                    "headers":{
+                        "User-agent": USER_AGENT,
+                        "Accept": ACCEPTS,
+                    },
+                    "verify":self._verify_ssl,
+                    "timeout":10
+                }
+            )
+            check_headers(libraries)
+            root = ElementTree.fromstring(libraries.text)
             for lib in root.findall("Directory"):
                 libs.append(lib.get("title"))
                 if lib.get("type") in self._section_types and (len(self._section_libraries) == 0 or lib.get("title") in self._section_libraries):
@@ -97,18 +105,20 @@ def update(self):
         data = []
         for library in sections:
             recent_or_deck = on_deck if self._on_deck else recently_added
-            sub_sec = requests.get(recent_or_deck.format(library, self._max * 2), headers={
-                "X-Plex-Token": self._token,
-                "User-agent": USER_AGENT,
-                "Accepts": ACCEPTS,
-            },
-            verify=self._verify_ssl, 
-            timeout=10)
-            try:
-                root = ElementTree.fromstring(sub_sec.text)
-            except:
-                _LOGGER.error(sub_sec.text)
-                raise ElementTree.ParseError
+            sub_sec = await self._hass.async_add_executor_job(
+                requests.get,
+                f'{recent_or_deck.format(library, self._max * 2)}&X-Plex-Token={self._token}', 
+                {
+                    "headers":{
+                        "User-agent": USER_AGENT,
+                        "Accept": ACCEPTS,
+                    },
+                    "verify":self._verify_ssl,
+                    "timeout":10
+                }
+            )
+            check_headers(sub_sec)
+            root = ElementTree.fromstring(sub_sec.text)
             data += parse_library(root)
 
         return {