Merge pull request #10 from Jurkash/develop

Develop

Author: Jurkash

.pre-commit-config.yaml

@@ -0,0 +1,33 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-ast
+      - id: check-builtin-literals
+      - id: check-case-conflict
+      - id: check-docstring-first
+      - id: check-executables-have-shebangs
+      - id: check-json
+      - id: check-shebang-scripts-are-executable
+      - id: check-symlinks
+      - id: check-toml
+      - id: check-yaml
+      - id: debug-statements
+      - id: destroyed-symlinks
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      - id: requirements-txt-fixer
+      - id: trailing-whitespace
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.4.10
+    hooks:
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: "v3.1.0"
+    hooks:
+      - id: prettier

custom_components/loe_outages/api.py

@@ -19,7 +19,7 @@ def __init__(self, group: str) -> None:
         self.group = group
         self.schedule = []
 
-    async def async_fetch_json_from_endpoint(self) -> dict:
+    async def async_fetch_latest_json(self) -> dict:
         """Fetch outages from the async API endpoint."""
         url = "https://lps.yuriishunkin.com/api/Schedule/latest"
         async with aiohttp.ClientSession() as session:
@@ -31,18 +31,34 @@ async def async_fetch_json_from_endpoint(self) -> dict:
                     LOGGER.error(f"Failed to fetch schedule: {response.status}")
                     return None
 
+    async def async_fetch_all_json(self) -> dict:
+        """Fetch outages from the async API endpoint."""
+        url = "https://lps.yuriishunkin.com/api/Schedule/all"
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url) as response:
+                if response.status == 200:
+                    data = await response.json()
+                    return data
+                else:
+                    LOGGER.error(f"Failed to fetch schedule: {response.status}")
+                    return None
+
     async def async_fetch_schedule(self) -> None:
         """Fetch outages from the JSON response."""
-        schedule_data = await self.async_fetch_json_from_endpoint()
-        schedule = OutageSchedule.from_dict(schedule_data)
         if len(self.schedule) == 0:
-            self.schedule.append(schedule)
+            schedule_data = await self.async_fetch_all_json()
+            schedules = OutageSchedule.from_list(schedule_data)
+            for schedule in sorted(schedules, key=lambda s: s.date):
+                self.schedule.append(schedule)
             return
-
-        if self.schedule[-1].id != schedule.id:
-            if self.schedule[-1].dateString == schedule.dateString:
-                self.schedule.remove(self.schedule[-1])
-            self.schedule.append(schedule)
+        else:
+            schedule_data = await self.async_fetch_latest_json()
+            schedule = OutageSchedule.from_dict(schedule_data)
+
+            if self.schedule[-1].id != schedule.id:
+                if self.schedule[-1].dateString == schedule.dateString:
+                    self.schedule.remove(self.schedule[-1])
+                self.schedule.append(schedule)
 
     def get_current_event(self, at: datetime) -> dict:
         """Get the current event."""

custom_components/loe_outages/calendar.py

@@ -53,6 +53,9 @@ def event(self) -> CalendarEvent | None:
         now = dt_utils.now()
         LOGGER.debug("Getting current event for %s", now)
         interval = self.coordinator.get_event_at(now)
+        if not interval:
+            return None
+
         return CalendarEvent(
             summary=interval.state,
             start=interval.startTime,

custom_components/loe_outages/models.py

@@ -58,7 +58,11 @@ def __init__(
         self.groups = groups
 
     @staticmethod
-    def from_dict(obj: dict) -> "OutageSchedule":
+    def from_list(obj_list: List[dict]) -> List["OutageSchedule"]:
+        return [OutageSchedule.from_dict(item) for item in obj_list]
+
+    @staticmethod
+    def from_dict(obj: dict) -> list["OutageSchedule"]:
         groups = [Group.from_dict(group) for group in obj.get("groups", [])]
         return OutageSchedule(
             id=obj.get("id"),

requirements.txt

@@ -1,4 +1,4 @@
 homeassistant==2024.7.0
 pip>=21.0,<24.2
 pre-commit>=3.7.1
-ruff==0.5.0
+ruff==0.5.0

scripts/develop

@@ -17,4 +17,4 @@ fi
 export PYTHONPATH="${PYTHONPATH}:${PWD}/custom_components"
 
 # Start Home Assistant
-hass --config "${PWD}/config" --debug
+hass --config "${PWD}/config" --debug

scripts/setup

@@ -6,4 +6,4 @@ cd "$(dirname "$0")/.."
 
 python3 -m pip install --requirement requirements.txt
 
-# pre-commit install
+pre-commit install