Skip to content

Commit fdd9934

Browse files
authored
Fixed get_next_feed not skipping disabled feed plans (#161)
1 parent a23a273 commit fdd9934

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

custom_components/petlibro/devices/feeders/air_smart_feeder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ def get_next_feed(self) -> dict:
256256
for feed in self.feeding_plan_data.values():
257257
feed: dict
258258

259-
if not (feed.get("id") or feed.get("enable") or ":" in feed.get("executionTime", "")):
259+
if not (feed.get("id") and feed.get("enable") and ":" in feed.get("executionTime", "")):
260260
continue
261261

262262
timezone = ZoneInfo(feed.get("timezone", "UTC"))

custom_components/petlibro/devices/feeders/granary_smart_camera_feeder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def get_next_feed(self) -> dict:
278278
for feed in self.feeding_plan_data.values():
279279
feed: dict
280280

281-
if not (feed.get("id") or feed.get("enable") or ":" in feed.get("executionTime", "")):
281+
if not (feed.get("id") and feed.get("enable") and ":" in feed.get("executionTime", "")):
282282
continue
283283

284284
timezone = ZoneInfo(feed.get("timezone", "UTC"))

custom_components/petlibro/devices/feeders/granary_smart_feeder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ def get_next_feed(self) -> dict:
254254
for feed in self.feeding_plan_data.values():
255255
feed: dict
256256

257-
if not (feed.get("id") or feed.get("enable") or ":" in feed.get("executionTime", "")):
257+
if not (feed.get("id") and feed.get("enable") and ":" in feed.get("executionTime", "")):
258258
continue
259259

260260
timezone = ZoneInfo(feed.get("timezone", "UTC"))

custom_components/petlibro/devices/feeders/one_rfid_smart_feeder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def get_next_feed(self) -> dict:
280280
for feed in self.feeding_plan_data.values():
281281
feed: dict
282282

283-
if not (feed.get("id") or feed.get("enable") or ":" in feed.get("executionTime", "")):
283+
if not (feed.get("id") and feed.get("enable") and ":" in feed.get("executionTime", "")):
284284
continue
285285

286286
timezone = ZoneInfo(feed.get("timezone", "UTC"))

custom_components/petlibro/devices/feeders/space_smart_feeder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ def get_next_feed(self) -> dict:
268268
for feed in self.feeding_plan_data.values():
269269
feed: dict
270270

271-
if not (feed.get("id") or feed.get("enable") or ":" in feed.get("executionTime", "")):
271+
if not (feed.get("id") and feed.get("enable") and ":" in feed.get("executionTime", "")):
272272
continue
273273

274274
timezone = ZoneInfo(feed.get("timezone", "UTC"))

0 commit comments

Comments
 (0)