Merge branch 'custom-components:master' into master

Makhuta · web-flow · commit 803995be82eb · 2025-02-19T00:40:16.000+01:00
diff --git a/custom_components/plex_recently_added/__init__.py b/custom_components/plex_recently_added/__init__.py
@@ -6,9 +6,9 @@
     CONF_NAME,
     CONF_API_KEY, 
     CONF_HOST, 
-    CONF_PORT, 
+    CONF_PORT,
     CONF_SSL
-    )
+)
 
 from .const import (
     DOMAIN, 
@@ -17,10 +17,8 @@
     CONF_SECTION_TYPES,
     CONF_SECTION_LIBRARIES,
     CONF_EXCLUDE_KEYWORDS,
-    CONF_ON_DECK,
-    CONF_VERIFY_SSL
-    )
-
+    CONF_ON_DECK
+)
 
 from .coordinator import PlexDataCoordinator
 from .helpers import setup_client
@@ -29,7 +27,6 @@
 )
 from .redirect import ImagesRedirect
 
-
 PLATFORMS = [
     Platform.SENSOR
 ]
@@ -48,7 +45,6 @@ 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_VERIFY_SSL],
         )
     except FailedToLogin as err:
         raise ConfigEntryNotReady("Failed to Log-in") from err
diff --git a/custom_components/plex_recently_added/config_flow.py b/custom_components/plex_recently_added/config_flow.py
@@ -1,5 +1,4 @@
 from typing import Any
-
 import voluptuous as vol
 
 from homeassistant.helpers.selector import (
@@ -20,7 +19,7 @@
     CONF_HOST, 
     CONF_PORT, 
     CONF_SSL
-    )
+)
 
 from .const import (
     DOMAIN, 
@@ -32,9 +31,8 @@
     CONF_EXCLUDE_KEYWORDS,
     CONF_SECTION_LIBRARIES_LABEL,
     CONF_EXCLUDE_KEYWORDS_LABEL,
-    CONF_ON_DECK,
-    CONF_VERIFY_SSL
-    )
+    CONF_ON_DECK
+)
 
 from .helpers import setup_client
 from .plex_api import (
@@ -48,7 +46,6 @@
     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_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)),
@@ -85,7 +82,6 @@ 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_VERIFY_SSL],
                 )
             except FailedToLogin as err:
                 errors = {'base': 'failed_to_login'}
diff --git a/custom_components/plex_recently_added/helpers.py b/custom_components/plex_recently_added/helpers.py
@@ -13,9 +13,8 @@ async def setup_client(
     section_types: list,
     section_libraries: list,
     exclude_keywords: list,
-    verify_ssl: bool,
-    ):
-    client = PlexApi(hass, name, ssl, token, max, on_deck, host, port, section_types, section_libraries, exclude_keywords, verify_ssl)
+):
+    client = PlexApi(hass, name, ssl, token, max, on_deck, host, port, section_types, section_libraries, exclude_keywords)
 
     await client.update()
     return client
diff --git a/custom_components/plex_recently_added/manifest.json b/custom_components/plex_recently_added/manifest.json
@@ -9,5 +9,5 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/custom-components/sensor.plex_recently_added/issues",
   "requirements": [],
-  "version": "0.4.4"
+  "version": "0.4.8"
 }
diff --git a/custom_components/plex_recently_added/parser.py b/custom_components/plex_recently_added/parser.py
@@ -34,8 +34,10 @@ def parse_data(data, max, base_url, token, identifier, section_key, images_base_
 
     output = []
     for item in sorted_data:
-        thumb = item.get("thumb", item.get("parentThumb", item.get("grandparentThumb", None)))
-        art = item.get("art", item.get("grandparentArt", None))
+        media_type_map = {'movie': ('thumb', 'art'), 'episode': ('grandparentThumb', 'grandparentArt')}
+        thumb_key, art_key = media_type_map.get(item['type'], ('thumb', 'grandparentArt'))
+        thumb = item.get(thumb_key, item.get("parentThumb", item.get("grandparentThumb", None)))
+        art = item.get(art_key, item.get("grandparentArt", None))
         deep_link_position = -1
         if section_key == "artist":
             deep_link_position = -2
@@ -68,6 +70,7 @@ def parse_data(data, max, base_url, token, identifier, section_key, images_base_
         data_output["genres"] = ", ".join([genre['tag'] for genre in item.get('Genre', [])][:3])
         data_output["rating"] = ('\N{BLACK STAR} ' + str(item.get("rating"))) if int(float(item.get("rating", 0))) > 0 else ''
         data_output['summary'] = item.get('summary', '')
+        data_output['trailer'] = item.get('trailer')
         data_output["poster"] = (f'{images_base_url}?path={thumb}') if thumb else ""
         data_output["fanart"] = (f'{images_base_url}?path={art}') if art else ""
         data_output["deep_link"] = deep_link if identifier else None
@@ -90,4 +93,3 @@ def parse_data(data, max, base_url, token, identifier, section_key, images_base_
 
     return output
 
-
diff --git a/custom_components/plex_recently_added/plex_api.py b/custom_components/plex_recently_added/plex_api.py
@@ -6,7 +6,7 @@
 from homeassistant.core import HomeAssistant
 from .const import DEFAULT_PARSE_DICT, USER_AGENT, ACCEPTS
 from .parser import parse_data, parse_library
-
+from .tmdb_api import get_tmdb_trailer_url
 
 def check_headers(response):
     if 'text/xml' not in response.headers.get('Content-Type', '') and 'application/xml' not in response.headers.get('Content-Type', ''):
@@ -25,8 +25,7 @@ def __init__(
         port: int,
         section_types: list,
         section_libraries: list,
-        exclude_keywords: list,
-        verify_ssl: bool
+        exclude_keywords: list
     ):
         self._hass = hass
         self._ssl = 's' if ssl else ''
@@ -38,9 +37,8 @@ def __init__(
         self._section_types = section_types
         self._section_libraries = section_libraries
         self._exclude_keywords = exclude_keywords
-        self._verify_ssl = verify_ssl
         self._images_base_url = f'/{name.lower() + "_" if len(name) > 0 else ""}plex_recently_added'
-    
+
     async def update(self):
         info_url = 'http{0}://{1}:{2}'.format(
             self._ssl,
@@ -49,8 +47,6 @@ async def update(self):
         )
 
         """ Getting the server identifier """
-        if not self._verify_ssl:
-            requests.packages.urllib3.disable_warnings(category=InsecureRequestWarning)
         try:
             info_res = await self._hass.async_add_executor_job(
                 requests.get,
@@ -60,7 +56,6 @@ async def update(self):
                         "User-agent": USER_AGENT,
                         "Accept": ACCEPTS,
                     },
-                    "verify":self._verify_ssl,
                     "timeout":10
                 }
             )
@@ -87,7 +82,6 @@ async def update(self):
                         "User-agent": USER_AGENT,
                         "Accept": ACCEPTS,
                     },
-                    "verify":self._verify_ssl,
                     "timeout":10
                 }
             )
@@ -117,29 +111,42 @@ async def update(self):
                         "User-agent": USER_AGENT,
                         "Accept": ACCEPTS,
                     },
-                    "verify":self._verify_ssl,
                     "timeout":10
                 }
             )
             check_headers(sub_sec)
             root = ElementTree.fromstring(sub_sec.text)
             parsed_libs = parse_library(root)
+            
+            # Fetch trailer URLs for each item
+            for item in parsed_libs:
+                item['trailer'] = await get_tmdb_trailer_url(self._hass, item['title'], library['type'])
+            
             if library["type"] not in data['all']:
                 data['all'][library["type"]] = []
             data['all'][library["type"]] += parsed_libs
             data[library["type"]] += parsed_libs
 
         data_out = {}
         for k in data.keys():
-            data_out[k] = {'data': [DEFAULT_PARSE_DICT] + parse_data(data[k], self._max, info_url, self._token, identifier, k, self._images_base_url, k == "all")}
+            parsed_data = parse_data(data[k], self._max, info_url, self._token, identifier, k, self._images_base_url, k == "all")
+            
+            # Ensure trailer URLs are correctly set for the "all" sensor
+            if k == "all":
+                for item in parsed_data:
+                    if item.get('trailer') is None:
+                        item_type = 'movie' if item.get('episode') == '' else 'show'
+                        item['trailer'] = await get_tmdb_trailer_url(self._hass, item['title'], item_type)
+            
+            data_out[k] = {'data': [DEFAULT_PARSE_DICT] + parsed_data}
 
         return {
             "data": {**data_out},
             "online": True,
             "libraries": libs
         }
-    
+
 
 class FailedToLogin(Exception):
     "Raised when the Plex user fail to Log-in"
-    pass
+    pass
diff --git a/custom_components/plex_recently_added/tmdb_api.py b/custom_components/plex_recently_added/tmdb_api.py
@@ -0,0 +1,35 @@
+import aiohttp
+
+TMDB_API_KEY = '1f7708bb9a218ab891a5d438b1b63992'
+TMDB_SEARCH_URL = 'https://api.themoviedb.org/3/search/{media_type}?api_key={api_key}&query={query}'
+TMDB_DETAILS_URL = 'https://api.themoviedb.org/3/{media_type}/{tmdb_id}?api_key={api_key}&append_to_response=videos'
+
+async def get_tmdb_trailer_url(hass, title, media_type):
+    if media_type == 'show':
+        media_type = 'tv'
+    elif media_type == 'movie':
+        media_type = 'movie'
+    else:
+        return None
+
+    async with aiohttp.ClientSession() as session:
+        # Search for the movie or TV show
+        search_url = TMDB_SEARCH_URL.format(media_type=media_type, api_key=TMDB_API_KEY, query=title)
+        async with session.get(search_url) as response:
+            search_data = await response.json()
+            if not search_data.get('results'):
+                return None
+            
+            tmdb_id = search_data['results'][0]['id']
+
+        # Get details including videos
+        details_url = TMDB_DETAILS_URL.format(media_type=media_type, tmdb_id=tmdb_id, api_key=TMDB_API_KEY)
+        async with session.get(details_url) as response:
+            details_data = await response.json()
+            
+            videos = details_data.get('videos', {}).get('results', [])
+            for video in videos:
+                if video['type'] == 'Trailer' and video['site'] == 'YouTube':
+                    return f'https://www.youtube.com/watch?v={video["key"]}'
+
+    return None

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@`
`9`	`9`	`"iot_class": "local_polling",`
`10`	`10`	`"issue_tracker": "https://github.com/custom-components/sensor.plex_recently_added/issues",`
`11`	`11`	`"requirements": [],`
`12`		`- "version": "0.4.4"`
	`12`	`+ "version": "0.4.8"`
`13`	`13`	`}`