pynintendoparental 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

pynintendoparental/_version.py

@@ -1 +1 @@
-__version__ = "1.1.0"
+__version__ = "1.1.2"

pynintendoparental/device.py

@@ -8,7 +8,7 @@ from typing import Callable
 
 from .api import Api
 from .const import _LOGGER, DAYS_OF_WEEK
-from .exceptions import HttpException, BedtimeOutOfRangeError
+from .exceptions import HttpException, BedtimeOutOfRangeError, DailyPlaytimeOutOfRangeError
 from .enum import AlarmSettingState, RestrictionMode
 from .player import Player
 from .utils import is_awaitable
@@ -49,6 +49,20 @@ class Device:
         self._callbacks: list[Callable] = []
         _LOGGER.debug("Device init complete for %s", self.device_id)
 
+    @property
+    def model(self) -> str:
+        """Return the model."""
+        model_map = {
+            "P00": "Switch",
+            "P01": "Switch 2"
+        }
+        return model_map.get(self.generation, "Unknown")
+
+    @property
+    def generation(self) -> str | None:
+        """Return the generation."""
+        return self.extra.get("platformGeneration", None)
+
     async def update(self):
         """Update data."""
         _LOGGER.debug(">> Device.update()")
@@ -158,12 +172,14 @@ class Device:
         self._calculate_times()
         await self._execute_callbacks()
 
-    async def update_max_daily_playtime(self, minutes: int = 0):
+    async def update_max_daily_playtime(self, minutes: int | float = 0):
         """Updates the maximum daily playtime of a device."""
         _LOGGER.debug(">> Device.update_max_daily_playtime(minutes=%s)",
                       minutes)
-        if minutes > 360:
-            raise ValueError("Only values up to 360 minutes (6 hours) are accepted.")
+        if isinstance(minutes, float):
+            minutes = int(minutes)
+        if minutes > 360 or minutes < -1:
+            raise DailyPlaytimeOutOfRangeError(minutes)
         ttpiod = True
         if minutes == -1:
             ttpiod = False
@@ -219,10 +235,12 @@ class Device:
         current_day = day_of_week_regs.get(DAYS_OF_WEEK[datetime.now().weekday()], {})
         self.timer_mode = self.parental_control_settings["playTimerRegulations"]["timerMode"]
         if self.timer_mode == "EACH_DAY_OF_THE_WEEK":
-            self.limit_time = current_day.get("timeToPlayInOneDay", {}).get("limitTime", None)
+            regulations = current_day
         else:
-            self.limit_time = self.parental_control_settings.get("playTimerRegulations", {}).get(
-                "dailyRegulations", {}).get("timeToPlayInOneDay", {}).get("limitTime", None)
+            regulations = self.parental_control_settings.get("playTimerRegulations", {}).get("dailyRegulations", {})
+
+        limit_time = regulations.get("timeToPlayInOneDay", {}).get("limitTime")
+        self.limit_time = limit_time if limit_time is not None else -1
 
         if self.timer_mode == "EACH_DAY_OF_THE_WEEK":
             if current_day["bedtime"]["enabled"]:
@@ -230,7 +248,7 @@ class Device:
                                         current_day["bedtime"]["endingTime"]["hour"],
                                         minute=current_day["bedtime"]["endingTime"]["minute"])
             else:
-                self.bedtime_alarm = None
+                self.bedtime_alarm = time(hour=0, minute=0)
         else:
             bedtime_alarm = self.parental_control_settings["playTimerRegulations"]["dailyRegulations"]["bedtime"]
             if bedtime_alarm["enabled"]:
@@ -238,7 +256,7 @@ class Device:
                                         bedtime_alarm["endingTime"]["hour"],
                                         minute=bedtime_alarm["endingTime"]["minute"])
             else:
-                self.bedtime_alarm = None
+                self.bedtime_alarm = time(hour=0, minute=0)
         return True
 
     def _parse_parental_control_setting(self, pcs: dict):
@@ -277,7 +295,7 @@ class Device:
             # 1. Calculate remaining time based on play limit
 
             time_remaining_by_play_limit = 0.0
-            if self.limit_time is None:
+            if self.limit_time in (-1, None):
                 # No specific play limit, effectively limited by end of day for this calculation step.
                 time_remaining_by_play_limit = float(minutes_in_day - current_minutes_past_midnight)
             elif self.limit_time == 0:
@@ -291,7 +309,7 @@ class Device:
             effective_remaining_time = time_remaining_by_play_limit
 
             # 2. Factor in bedtime alarm, if any, to further constrain remaining time
-            if self.bedtime_alarm is not None:
+            if self.bedtime_alarm not in (None, time(hour=0, minute=0)):
                 bedtime_dt = datetime.combine(now.date(), self.bedtime_alarm)
                 time_remaining_by_bedtime = 0.0
                 if bedtime_dt > now: # Bedtime is in the future today

pynintendoparental/exceptions.py

@@ -1,6 +1,12 @@
 """Nintendo Parental exceptions."""
 
-from datetime import time
+from enum import StrEnum
+
+class RangeErrorKeys(StrEnum):
+    """Keys for range errors."""
+
+    DAILY_PLAYTIME = "daily_playtime_out_of_range"
+    BEDTIME = "bedtime_alarm_out_of_range"
 
 class HttpException(Exception):
     """A HTTP error occured"""
@@ -27,11 +33,16 @@ class InputValidationError(Exception):
     value: object
     error_key: str
 
+    def __init__(self, value: object) -> None:
+        super().__init__(f"{self.__doc__} Received value: {value}")
+        self.value = value
+
 class BedtimeOutOfRangeError(InputValidationError):
     """Bedtime is outside of the allowed range."""
 
-    error_key = "bedtime_alarm_out_of_range"
+    error_key = RangeErrorKeys.BEDTIME
 
-    def __init__(self, value: object) -> None:
-        super().__init__()
-        self.value = value
+class DailyPlaytimeOutOfRangeError(InputValidationError):
+    """Daily playtime is outside of the allowed range."""
+
+    error_key = RangeErrorKeys.DAILY_PLAYTIME

{pynintendoparental-1.1.0.dist-info → pynintendoparental-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pynintendoparental
-Version: 1.1.0
+Version: 1.1.2
 Summary: A Python module to interact with Nintendo Parental Controls
 Home-page: http://github.com/pantherale0/pynintendoparental
 Author: pantherale0

{pynintendoparental-1.1.0.dist-info → pynintendoparental-1.1.2.dist-info}/RECORD

@@ -1,18 +1,18 @@
 pynintendoparental/__init__.py,sha256=pNcBsHRa4B85USP7uzwPEGF9fu3MA9YgW_hI82F_NXQ,2460
-pynintendoparental/_version.py,sha256=LGVQyDsWifdACo7qztwb8RWWHds1E7uQ-ZqD8SAjyw4,22
+pynintendoparental/_version.py,sha256=5SgGjThsHu_ITn8V83BvCziqCwxdXxTQqcC3KQMHPfM,22
 pynintendoparental/api.py,sha256=hMXq0eNIgFELlNZJtN0rK3plKyu9nirvwiUPNlkjOCY,7013
 pynintendoparental/application.py,sha256=l-oVwM4hrVVUf_2djQ7rJVya7LQP38yhaLPAWt8V8TY,3941
 pynintendoparental/const.py,sha256=sQZqU0f1NSClMPfCSJonlCunLdbPPiXjL-JS2LMZGd4,2101
-pynintendoparental/device.py,sha256=x9cKlZRzYWLagXWAfCwqiZcISmOjoNYVYu4goJGDeNY,22396
+pynintendoparental/device.py,sha256=EEQfnab96CIGlB2n1gePQBn5SWx7cck8tX_qz8xAHjc,22956
 pynintendoparental/enum.py,sha256=lzacGti7fcQqAOROjB9782De7bOMYKSEM61SQd6aYG4,401
-pynintendoparental/exceptions.py,sha256=DGguLw1QwjRtKKglnd_ZD9ekUyGeXHN_beVeVvGBKwM,1092
+pynintendoparental/exceptions.py,sha256=-KuRBoMtzWKycjdgIsRYPzSVi_uzPjROq7blJSgq-iw,1450
 pynintendoparental/player.py,sha256=WDl0pspHgrV9lGhDp-NKlfP8DV4Yxe02aYaGg9wTTeg,1785
 pynintendoparental/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pynintendoparental/utils.py,sha256=5-EP_rmPnSSWtbi18Y226GtjLhF3PLONKwmRdiy7m2c,198
 pynintendoparental/authenticator/__init__.py,sha256=MZdA6qqHV0i7rspNL9Z9xl7aRy-EJEm3NIapiIgEJBA,7688
 pynintendoparental/authenticator/const.py,sha256=_nUJVC0U64j_n1LaQd_KDg0EWFcezb87bQyYYXpbPPY,917
-pynintendoparental-1.1.0.dist-info/licenses/LICENSE,sha256=zsxHgHVMnyWq121yND8zBl9Rl9H6EF2K9N51B2ZSm_k,1071
-pynintendoparental-1.1.0.dist-info/METADATA,sha256=Gr2N2CREOKvOwd1OmjzuDuzVQSObpcRy_8fQAmFAF2Y,1871
-pynintendoparental-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pynintendoparental-1.1.0.dist-info/top_level.txt,sha256=QQ5bAl-Ljso16P8KLf1NHrFmKk9jLT7bVJG_rVlIXWk,19
-pynintendoparental-1.1.0.dist-info/RECORD,,
+pynintendoparental-1.1.2.dist-info/licenses/LICENSE,sha256=zsxHgHVMnyWq121yND8zBl9Rl9H6EF2K9N51B2ZSm_k,1071
+pynintendoparental-1.1.2.dist-info/METADATA,sha256=wV4_2Gwy86YLWZe8SOu5svDLpH2VWsi5ORPCVfYzLKk,1871
+pynintendoparental-1.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pynintendoparental-1.1.2.dist-info/top_level.txt,sha256=QQ5bAl-Ljso16P8KLf1NHrFmKk9jLT7bVJG_rVlIXWk,19
+pynintendoparental-1.1.2.dist-info/RECORD,,