Merge pull request #92 from Makhuta/master

Author: mkanet

custom_components/plex_recently_added/const.py

@@ -1,6 +1,7 @@
 from typing import Final
 
 DOMAIN: Final = "plex_recently_added"
+TIMEOUT_MINUTES: Final = 10
 
 
 DEFAULT_NAME: Final = 'Plex Recently Added'

custom_components/plex_recently_added/coordinator.py

@@ -6,7 +6,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryError
 
-from .const import DOMAIN
+from .const import DOMAIN, TIMEOUT_MINUTES
 from .plex_api import (
     PlexApi,
     FailedToLogin,
@@ -23,7 +23,7 @@ def __init__(self, hass: HomeAssistant, client: PlexApi):
             _LOGGER,
             name=DOMAIN,
             update_method=self._async_update_data,
-            update_interval=timedelta(minutes=10),
+            update_interval=timedelta(minutes=TIMEOUT_MINUTES),
         )
 
     async def _async_update_data(self) -> Dict[str, Any]:

custom_components/plex_recently_added/parser.py

@@ -6,11 +6,11 @@
 import aiofiles
 import re
 import math
-from datetime import datetime
+from datetime import datetime, timedelta
+from homeassistant.core import HomeAssistant
+from homeassistant.components.http.auth import async_sign_path
 
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-CACHE_FOLDER = os.path.join(SCRIPT_DIR, "images_cache")
-os.makedirs(CACHE_FOLDER, exist_ok=True)
+from .const import TIMEOUT_MINUTES
 
 import logging
 _LOGGER = logging.getLogger(__name__)
@@ -30,34 +30,17 @@ def parse_library(root):
 
     return output
 
-def get_image_filename(url):
-    """Generate a unique filename from the URL while keeping the original extension."""
-    parsed_url = urlparse(url)
-    ext = os.path.splitext(parsed_url.path)[-1]
-    if not ext:
-        ext = ".jpg"
-    return hashlib.md5(url.encode()).hexdigest() + ext
-
-async def download_image(url):
-    """Download an image asynchronously and save it to the cache folder without blocking the event loop."""
-    filename = get_image_filename(url)
-    file_path = os.path.join(CACHE_FOLDER, filename)
-
-    async with aiohttp.ClientSession() as session:
-        async with session.get(url) as response:
-            if response.status == 200:
-                async with aiofiles.open(file_path, "wb") as file:  # ✅ Non-blocking file write
-                    await file.write(await response.read())  # ✅ Async file writing
-                return filename
-    return None
-
-def cleanup_old_images(valid_filenames):
-    """Delete images that are not in the updated list."""
-    for filename in os.listdir(CACHE_FOLDER):
-        if filename not in valid_filenames:
-            os.remove(os.path.join(CACHE_FOLDER, filename))
-
-async def parse_data(data, max, base_url, token, identifier, section_key, images_base_url, is_all = False):
+def extract_metadata_and_type(path):
+    pattern = re.compile(r"/library/metadata/(\d+)/(thumb|art)/(\d+)")
+    match = pattern.search(path)
+    
+    if match:
+        metadata_id = match.group(1)
+        art_type = match.group(2)
+        art_id = match.group(3)
+        return metadata_id, art_type, art_id
+
+def parse_data(hass: HomeAssistant, data, max, base_url, token, identifier, section_key, images_base_url, is_all = False):
     if is_all:
         sorted_data = []
         for k in data.keys():
@@ -109,16 +92,12 @@ async def parse_data(data, max, base_url, token, identifier, section_key, images
         data_output['trailer'] = item.get('trailer')
 
 
-        thumb_filename = await download_image(f'{base_url}{thumb}?X-Plex-Token={token}')
-        if thumb_filename:
-            valid_images.add(thumb_filename)
-        data_output["poster"] = (f'{images_base_url}?filename={thumb_filename}') if thumb_filename else ""
+        thumb_IDs = extract_metadata_and_type(thumb)
+        data_output["poster"] = async_sign_path(hass, f'{images_base_url}?metadata={thumb_IDs[0]}&thumb={thumb_IDs[2]}', timedelta(minutes=TIMEOUT_MINUTES)) if thumb_IDs else ""
 
 
-        art_filename = await download_image(f'{base_url}{art}?X-Plex-Token={token}')
-        if art_filename:
-            valid_images.add(art_filename)
-        data_output["fanart"] = (f'{images_base_url}?filename={art_filename}') if art_filename else ""
+        art_IDs = extract_metadata_and_type(art)
+        data_output["fanart"] = async_sign_path(hass, f'{images_base_url}?metadata={art_IDs[0]}&art={art_IDs[2]}', timedelta(minutes=TIMEOUT_MINUTES)) if art_IDs else ""
 
 
         data_output["deep_link"] = deep_link if identifier else None

custom_components/plex_recently_added/plex_api.py

@@ -129,7 +129,7 @@ async def update(self):
 
         data_out = {}
         for k in data.keys():
-            parsed_data = await parse_data(data[k], self._max, info_url, self._token, identifier, k, self._images_base_url, k == "all")
+            parsed_data = parse_data(self._hass, 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":

custom_components/plex_recently_added/redirect.py

@@ -4,9 +4,6 @@
 import requests
 import os
 
-from .parser import CACHE_FOLDER
-os.makedirs(CACHE_FOLDER, exist_ok=True)
-
 from homeassistant.const import (
     CONF_API_KEY, 
     CONF_NAME, 
@@ -18,23 +15,31 @@
 from .const import DOMAIN
 
 class ImagesRedirect(HomeAssistantView):
-    requires_auth = False
-
     def __init__(self, config_entry: ConfigEntry):
         super().__init__()
         self._token = config_entry.data[CONF_API_KEY]
+        self._base_url = f'http{'s' if config_entry.data[CONF_SSL] else ''}://{config_entry.data[CONF_HOST]}:{config_entry.data[CONF_PORT]}'
         self.name = f'{self._token}_Plex_Recently_Added'
         self.url = f'/{config_entry.data[CONF_NAME].lower() + "_" if len(config_entry.data[CONF_NAME]) > 0 else ""}plex_recently_added'
 
     async def get(self, request):
-        filename = request.query.get("filename")
-        if not filename:
-            return web.Response(status=404)
-        file_path = os.path.join(CACHE_FOLDER, filename)
-
-        if not os.path.isfile(file_path):
-            return web.Response(status=404)
-
-        return web.FileResponse(file_path)
+        metadataId = int(request.query.get("metadata", 0))
+        thumbId = int(request.query.get("thumb", 0))
+        artId = int(request.query.get("art", 0))
+        
+        if metadataId == 0:
+            return web.HTTPNotFound()
+        image_type = "thumb" if thumbId != 0 else "art"
+        image_id = thumbId if thumbId != 0 else artId if artId != 0 else ""
+
+        url = f'{self._base_url}/library/metadata/{metadataId}/{image_type}/{image_id}?X-Plex-Token={self._token}'
+
+        async with ClientSession() as session:
+            async with session.get(url) as res:
+                if res.ok:
+                    content = await res.read()
+                    return web.Response(body=content, content_type=res.content_type)
+
+                return web.HTTPNotFound()