pypetkitapi 1.6.0__py3-none-any.whl → 1.6.1__py3-none-any.whl

pypetkitapi/medias.py

@@ -25,6 +25,7 @@ class MediasFiles:
     record_type: str
     url: str
     aes_key: str
+    timestamp: str | None = None
 
 
 async def extract_filename_from_url(url: str) -> str:
@@ -70,49 +71,46 @@ class MediaHandler:
         """Process individual records and return media info."""
         media_files = []
 
+        async def process_item(record_items, reversed_order=False):
+            items = reversed(record_items) if reversed_order else record_items
+            last_item = next(
+                (item for item in items if item.preview and item.aes_key),
+                None,
+            )
+            if last_item:
+                filename = await extract_filename_from_url(last_item.preview)
+                await self.media_download_decode.get_file(
+                    last_item.preview, last_item.aes_key
+                )
+
+                timestamp = (
+                    last_item.eat_start_time
+                    or last_item.completed_at
+                    or last_item.timestamp
+                    or None
+                )
+
+                media_files.append(
+                    MediasFiles(
+                        record_type=record_type,
+                        filename=filename,
+                        url=last_item.preview,
+                        aes_key=last_item.aes_key,
+                        timestamp=timestamp,
+                    )
+                )
+
         if record_type == "feed":
             for record in reversed(records):
                 if record.items:
-                    last_item = next(
-                        (
-                            item
-                            for item in reversed(record.items)
-                            if item.preview and item.aes_key
-                        ),
-                        None,
-                    )
-                    if last_item:
-                        filename = await extract_filename_from_url(last_item.preview)
-                        await self.media_download_decode.get_file(
-                            last_item.preview, last_item.aes_key
-                        )
-                        media_files.append(
-                            MediasFiles(
-                                record_type=record_type,
-                                filename=filename,
-                                url=last_item.preview,
-                                aes_key=last_item.aes_key,
-                            )
-                        )
+                    await process_item(record.items, reversed_order=True)
+                    if media_files:  # Stop processing if a media file is added
                         return media_files
         else:
             for record in records:
                 if record.items:
-                    last_item = record.items[-1]
-                    preview_url = last_item.preview
-                    aes_key = last_item.aes_key
-
-                    if preview_url and aes_key:
-                        filename = await extract_filename_from_url(preview_url)
-                        await self.media_download_decode.get_file(preview_url, aes_key)
-                        media_files.append(
-                            MediasFiles(
-                                record_type=record_type,
-                                filename=filename,
-                                url=preview_url,
-                                aes_key=aes_key,
-                            )
-                        )
+                    await process_item(record.items)
+
         return media_files
 
 

{pypetkitapi-1.6.0.dist-info → pypetkitapi-1.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypetkitapi
-Version: 1.6.0
+Version: 1.6.1
 Summary: Python client for PetKit API
 Home-page: https://github.com/Jezza34000/pypetkit
 License: MIT

{pypetkitapi-1.6.0.dist-info → pypetkitapi-1.6.1.dist-info}/RECORD

@@ -6,10 +6,10 @@ pypetkitapi/containers.py,sha256=zj0MBEYA7wp2Nieu1oW4JROs_r7il9VZN8AUyQv-gJs,419
 pypetkitapi/exceptions.py,sha256=NWmpsI2ewC4HaIeu_uFwCeuPIHIJxZBzjoCP7aNwvhs,1139
 pypetkitapi/feeder_container.py,sha256=28GXZ8Nbs08PnFZZI4ENBe3UJ63gsXT3rFa151KrPxo,13310
 pypetkitapi/litter_container.py,sha256=UmgIE1iYNFetHjnTXfM6jhRnOk_0Ubdyr697-6SGKqc,18042
-pypetkitapi/medias.py,sha256=2cVgB8eiTxTHCUExPrl2Hon9lg-GLEuqL_Rpay7A4P8,7363
+pypetkitapi/medias.py,sha256=wutuX2w3Jz6k8F3u25Ryublf5hQtTFg1yKNNCEbtfgg,7033
 pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypetkitapi/water_fountain_container.py,sha256=j6FQEgbZAbsPXDVhcIB05RsNnQJftcWUJKmzuX4TrjM,6712
-pypetkitapi-1.6.0.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
-pypetkitapi-1.6.0.dist-info/METADATA,sha256=qxsGx-CErdYdR3YAN4ixrfS4-XtLcu4SAATOxWS8QTM,4636
-pypetkitapi-1.6.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pypetkitapi-1.6.0.dist-info/RECORD,,
+pypetkitapi-1.6.1.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
+pypetkitapi-1.6.1.dist-info/METADATA,sha256=kSyY6TSSWwNyXHa7APUmOoeMp_VPiI9dv6zftPg7zp0,4636
+pypetkitapi-1.6.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pypetkitapi-1.6.1.dist-info/RECORD,,