pypetkitapi 1.10.1__tar.gz → 1.10.2__tar.gz

{pypetkitapi-1.10.1 → pypetkitapi-1.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypetkitapi
-Version: 1.10.1
+Version: 1.10.2
 Summary: Python client for PetKit API
 License: MIT
 Author: Jezza34000

{pypetkitapi-1.10.1 → pypetkitapi-1.10.2}/pypetkitapi/__init__.py

@@ -51,7 +51,7 @@ from .media import DownloadDecryptMedia, MediaCloud, MediaFile, MediaManager
 from .purifier_container import Purifier
 from .water_fountain_container import WaterFountain
 
-__version__ = "1.10.1"
+__version__ = "1.10.2"
 
 __all__ = [
     "CTW3",

{pypetkitapi-1.10.1 → pypetkitapi-1.10.2}/pypetkitapi/litter_container.py

@@ -451,7 +451,7 @@ class Litter(BaseModel):
     service_status: int | None = Field(None, alias="serviceStatus")
     total_time: int | None = Field(None, alias="totalTime")
     with_k3: int | None = Field(None, alias="withK3")
-    User: UserDevice | None = None
+    user: UserDevice | None = None
     device_records: list[LitterRecord] | None = None
     device_stats: LitterStats | None = None
     device_pet_graph_out: list[PetOutGraph] | None = None

{pypetkitapi-1.10.1 → pypetkitapi-1.10.2}/pypetkitapi/media.py

@@ -102,7 +102,6 @@ class MediaManager:
         self, storage_path: Path, device_id: int
     ) -> None:
         """Construct the media file table for disk storage."""
-
         self.media_table.clear()
 
         today_str = datetime.now().strftime("%Y%m%d")
@@ -114,7 +113,7 @@ class MediaManager:
             video_path = record_path / "video"
 
             # Regex pattern to match valid filenames
-            valid_pattern = re.compile(rf"^{device_id}_\d+\.(jpg|avi)$")
+            valid_pattern = re.compile(rf"^(?:\d+_)?{device_id}_\d+\.(jpg|avi)$")
 
             # Populate the media table with event_id from filenames
             for subdir in [snapshot_path, video_path]:
@@ -130,7 +129,7 @@ class MediaManager:
                     if entry.is_file() and valid_pattern.match(entry.name):
                         _LOGGER.debug("Entries found: %s", entry.name)
                         event_id = Path(entry.name).stem
-                        timestamp = Path(entry.name).stem.split("_", 1)[1]
+                        timestamp = self._extraire_timestamp(str(entry.name))
                         media_type_str = Path(entry.name).suffix.lstrip(".")
                         try:
                             media_type = MediaType(media_type_str)
@@ -148,6 +147,13 @@ class MediaManager:
                             )
                         )
 
+    @staticmethod
+    def _extraire_timestamp(nom_fichier: str) -> int:
+        match = re.search(r"_(\d+)\.[a-zA-Z0-9]+$", nom_fichier)
+        if match:
+            return int(match.group(1))
+        return 0
+
     async def prepare_missing_files(
         self,
         media_cloud_list: list[MediaCloud],

{pypetkitapi-1.10.1 → pypetkitapi-1.10.2}/pyproject.toml

@@ -187,7 +187,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pypetkitapi"
-version = "1.10.1"
+version = "1.10.2"
 description = "Python client for PetKit API"
 authors = ["Jezza34000 <info@mail.com>"]
 readme = "README.md"
@@ -209,7 +209,7 @@ ruff = "^0.8.1"
 types-aiofiles = "^24.1.0.20240626"
 
 [tool.bumpver]
-current_version = "1.10.1"
+current_version = "1.10.2"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"