Fix image fallback for expired URLs (#2)

Author: wolfgangbures

custom_components/sharepoint_photos/image.py

@@ -40,6 +40,8 @@ def __init__(self, coordinator, config_entry: ConfigEntry) -> None:
             self.access_tokens = []
         if not self.access_tokens:
             self.async_update_token()
+        self._last_content: bytes | None = None
+        self._last_content_type: str | None = None
         self._config_entry = config_entry
         site_name = config_entry.data.get("site_url", "").replace("https://", "").replace("/", "_")
         self._attr_unique_id = f"{DOMAIN}_{site_name}_current_image"
@@ -76,26 +78,40 @@ async def async_image(self) -> Optional[bytes]:
         api_client = self.coordinator._api_client
         content, content_type, status_code = await api_client.fetch_image_content(download_url)
 
-        if status_code == 401:
-            _LOGGER.info("Image URL expired, refreshing coordinator data")
+        if status_code in (401, 403):
+            _LOGGER.info("Image URL expired (status=%s), refreshing coordinator data", status_code)
             await self.coordinator.async_request_refresh()
             photo = self._get_current_photo()
             if not photo:
-                return None
+                return self._last_content
             download_url = photo.get("download_url")
             if not download_url:
-                return None
+                return self._last_content
             content, content_type, status_code = await api_client.fetch_image_content(download_url)
 
         if status_code == 200 and content:
             if content_type:
                 self._attr_content_type = content_type
+            self._last_content = content
+            self._last_content_type = self._attr_content_type
             return content
 
+        if self._last_content:
+            if self._last_content_type:
+                self._attr_content_type = self._last_content_type
+            _LOGGER.debug(
+                "Returning cached image after fetch failed (status=%s)",
+                status_code,
+            )
+            return self._last_content
+
         _LOGGER.debug("Failed to fetch image content (status=%s)", status_code)
         return None
 
     @property
     def available(self) -> bool:
         """Return if entity is available."""
-        return self.coordinator.last_update_success and self.coordinator.data is not None
+        return (
+            (self.coordinator.last_update_success and self.coordinator.data is not None)
+            or self._last_content is not None
+        )

custom_components/sharepoint_photos/manifest.json

@@ -13,5 +13,5 @@
     "aiohttp>=3.8.0",
     "msal>=1.20.0"
   ],
-  "version": "1.1.4"
+  "version": "1.1.5"
 }