pynintendoparental 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

pynintendoparental/_version.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.0.3"

pynintendoparental/api.py

@@ -192,3 +192,22 @@ class Api:
                 "unlockCode": new_code
             }
         )
+
+    async def async_update_extra_playing_time(
+        self,
+        device_id: str,
+        additional_time: int
+    ) -> dict:
+        """Update device extra playing time."""
+        body = {
+            "deviceId": device_id,
+            "additionalTime": additional_time,
+            "status": "TO_ADDED"
+        }
+        if additional_time == -1:
+            body["status"] = "TO_INFINITY"
+            body.pop("additionalTime")
+        return await self.send_request(
+            endpoint="update_extra_playing_time",
+            body=body
+        )

pynintendoparental/const.py

@@ -5,8 +5,8 @@ import logging
 
 _LOGGER = logging.getLogger(__package__)
 MOBILE_APP_PKG = "com.nintendo.znma"
-MOBILE_APP_VERSION = "2.0.0"
-MOBILE_APP_BUILD = "502"
+MOBILE_APP_VERSION = "2.1.1"
+MOBILE_APP_BUILD = "540"
 OS_NAME = "ANDROID"
 OS_VERSION = "33"
 OS_STR = f"{OS_NAME} {OS_VERSION}"
@@ -52,5 +52,9 @@ ENDPOINTS = {
     "get_device_monthly_summary": {
         "url": "{BASE_URL}/actions/playSummary/fetchMonthlySummary?deviceId={DEVICE_ID}&year={YEAR}&month={MONTH}&containLatest=false",
         "method": "GET"
+    },
+    "update_extra_playing_time": {
+        "url": "{BASE_URL}/actions/device/updateExtraPlayingTime",
+        "method": "POST"
     }
 }

pynintendoparental/device.py

@@ -63,11 +63,7 @@ class Device:
         else:
             for player in self.players:
                 player.update_from_daily_summary(self.daily_summaries)
-        for cb in self._callbacks:
-            if is_awaitable(cb):
-                await cb()
-            else:
-                cb()
+        await self._execute_callbacks()
 
     def add_device_callback(self, callback):
         """Add a callback to the device."""
@@ -83,6 +79,14 @@ class Device:
         if callback in self._callbacks:
             self._callbacks.remove(callback)
 
+    async def _execute_callbacks(self):
+        """Execute all callbacks."""
+        for cb in self._callbacks:
+            if is_awaitable(cb):
+                await cb()
+            else:
+                cb()
+
     async def set_new_pin(self, pin: str):
         """Updates the pin for the device."""
         _LOGGER.debug(">> Device.set_new_pin(pin=REDACTED)")
@@ -92,6 +96,17 @@ class Device:
             device_id=self.device_id
         )
         self._parse_parental_control_setting(response["json"])
+        await self._execute_callbacks()
+
+    async def add_extra_time(self, minutes: int):
+        """Add extra time to the device."""
+        _LOGGER.debug(">> Device.add_extra_time(minutes=%s)", minutes)
+        await self._api.async_update_extra_playing_time(
+            device_id=self.device_id,
+            additional_time=minutes
+        )
+        await self._execute_callbacks()
+
 
     async def set_restriction_mode(self, mode: RestrictionMode):
         """Updates the restriction mode of the device."""
@@ -104,6 +119,7 @@ class Device:
             }
         )
         self._parse_parental_control_setting(response["json"])
+        await self._execute_callbacks()
 
     async def set_bedtime_alarm(self, end_time: time = None, enabled: bool = True):
         """Update the bedtime alarm for the device."""
@@ -134,6 +150,8 @@ class Device:
             }
         )
         self._parse_parental_control_setting(response["json"])
+        self._calculate_times()
+        await self._execute_callbacks()
 
     async def update_max_daily_playtime(self, minutes: int = 0):
         """Updates the maximum daily playtime of a device."""
@@ -176,6 +194,8 @@ class Device:
             }
         )
         self._parse_parental_control_setting(response["json"])
+        self._calculate_times()
+        await self._execute_callbacks()
 
     def _update_applications(self):
         """Updates applications from daily summary."""
@@ -229,31 +249,22 @@ class Device:
         self._update_day_of_week_regulations()
         self._update_applications()
 
-    async def _get_parental_control_setting(self):
-        """Retreives parental control settings from the API."""
-        _LOGGER.debug(">> Device._get_parental_control_setting()")
-        response = await self._api.async_get_device_parental_control_setting(
-            device_id=self.device_id
-        )
-        self._parse_parental_control_setting(response["json"])
-
-    async def _get_daily_summaries(self):
-        """Retrieve daily summaries."""
-        _LOGGER.debug(">> Device._get_daily_summaries()")
-        response = await self._api.async_get_device_daily_summaries(
-            device_id = self.device_id
-        )
-        self.daily_summaries = response["json"]["dailySummaries"]
-        _LOGGER.debug("New daily summary %s", self.daily_summaries)
-        try:
-            today_playing_time = self.get_date_summary()[0].get("playingTime", 0)
-            self.today_playing_time = 0 if today_playing_time is None else today_playing_time
-            today_disabled_time = self.get_date_summary()[0].get("disabledTime", 0)
-            self.today_disabled_time = 0 if today_disabled_time is None else today_disabled_time
-            today_exceeded_time = self.get_date_summary()[0].get("exceededTime", 0)
-            self.today_exceeded_time = 0 if today_exceeded_time is None else today_exceeded_time
-            _LOGGER.debug("Cached playing, disabled and exceeded time for today for device %s",
+    def _calculate_times(self):
+        """Calculate times from parental control settings."""
+        if not isinstance(self.daily_summaries, list) or not self.daily_summaries:
+            return
+        if len(self.daily_summaries) == 0:
+            return
+        _LOGGER.debug(">> Device._calculate_times()")
+        today_playing_time = self.daily_summaries[0].get("playingTime", 0)
+        self.today_playing_time = 0 if today_playing_time is None else today_playing_time
+        today_disabled_time = self.daily_summaries[0].get("disabledTime", 0)
+        self.today_disabled_time = 0 if today_disabled_time is None else today_disabled_time
+        today_exceeded_time = self.daily_summaries[0].get("exceededTime", 0)
+        self.today_exceeded_time = 0 if today_exceeded_time is None else today_exceeded_time
+        _LOGGER.debug("Cached playing, disabled and exceeded time for today for device %s",
                         self.device_id)
+        try:
             now = datetime.now()
             current_minutes_past_midnight = now.hour * 60 + now.minute
             minutes_in_day = 1440 # 24 * 60
@@ -328,6 +339,25 @@ class Device:
             _LOGGER.debug("Unable to retrieve applications for device %s: %s", self.name, err)
             self.application_update_failed = True
 
+    async def _get_parental_control_setting(self):
+        """Retreives parental control settings from the API."""
+        _LOGGER.debug(">> Device._get_parental_control_setting()")
+        response = await self._api.async_get_device_parental_control_setting(
+            device_id=self.device_id
+        )
+        self._parse_parental_control_setting(response["json"])
+        self._calculate_times()
+
+    async def _get_daily_summaries(self):
+        """Retrieve daily summaries."""
+        _LOGGER.debug(">> Device._get_daily_summaries()")
+        response = await self._api.async_get_device_daily_summaries(
+            device_id = self.device_id
+        )
+        self.daily_summaries = response["json"]["dailySummaries"]
+        _LOGGER.debug("New daily summary %s", self.daily_summaries)
+        self._calculate_times()
+
     async def _get_extras(self):
         """Retrieve extra properties."""
         _LOGGER.debug(">> Device._get_extras()")
@@ -343,26 +373,42 @@ class Device:
                       self.alarms_enabled,
                       self.device_id)
 
-    async def get_monthly_summary(self, search_date: datetime = None):
+    async def get_monthly_summary(self, search_date: datetime = None) -> dict | None:
         """Gets the monthly summary."""
         _LOGGER.debug(">> Device.get_monthly_summary(search_date=%s)", search_date)
         latest = False
         if search_date is None:
-            response = await self._api.async_get_device_monthly_summaries(
-                device_id=self.device_id
-            )
-            _LOGGER.debug("Available monthly summaries: %s", response["json"]["available"])
-            response = response["json"]["available"][0]
-            search_date = datetime.strptime(f"{response['year']}-{response['month']}-01", "%Y-%m-%d")
-            _LOGGER.debug("Using search date %s for monthly summary request", search_date)
-            latest = True
+            try:
+                response = await self._api.async_get_device_monthly_summaries(
+                    device_id=self.device_id
+                )
+            except HttpException as exc:
+                _LOGGER.debug("Could not retrieve monthly summaries: %s", exc)
+                return
+            else:
+                available_summaries = response["json"]["available"]
+                _LOGGER.debug("Available monthly summaries: %s", available_summaries)
+                if not available_summaries:
+                    _LOGGER.debug("No monthly summaries available for device %s", self.device_id)
+                    return None
+                # Use the most recent available summary
+                available_summary = available_summaries[0]
+                search_date = datetime.strptime(f"{available_summary['year']}-{available_summary['month']}-01", "%Y-%m-%d")
+                _LOGGER.debug("Using search date %s for monthly summary request", search_date)
+                latest = True
 
         try:
             response = await self._api.async_get_device_monthly_summary(
-                device_id = self.device_id,
+                device_id=self.device_id,
                 year=search_date.year,
                 month=search_date.month
             )
+        except HttpException as exc:
+            _LOGGER.warning("HTTP Exception raised while getting monthly summary for device %s: %s",
+                            self.device_id,
+                            exc)
+            return None
+        else:
             _LOGGER.debug("Monthly summary query complete for device %s: %s",
                         self.device_id,
                         response["json"]["summary"])
@@ -370,10 +416,7 @@ class Device:
                 self.last_month_summary = summary = response["json"]["summary"]
                 return summary
             return response["json"]["summary"]
-        except HttpException as exc:
-            _LOGGER.warning("HTTP Exception raised while getting monthly summary for device %s: %s",
-                            self.device_id,
-                            exc)
+
 
     def get_date_summary(self, input_date: datetime = datetime.now()) -> dict:
         """Returns usage for a given date."""

{pynintendoparental-1.0.1.dist-info → pynintendoparental-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pynintendoparental
-Version: 1.0.1
+Version: 1.0.3
 Summary: A Python module to interact with Nintendo Parental Controls
 Home-page: http://github.com/pantherale0/pynintendoparental
 Author: pantherale0
@@ -17,7 +17,7 @@ Requires-Dist: black<26,>=23; extra == "dev"
 Requires-Dist: build<1.3,>=0.10; extra == "dev"
 Requires-Dist: flake8<8,>=6; extra == "dev"
 Requires-Dist: isort<7,>=5; extra == "dev"
-Requires-Dist: mypy<1.17,>=1.5; extra == "dev"
+Requires-Dist: mypy<1.18,>=1.5; extra == "dev"
 Requires-Dist: pytest<9,>=7; extra == "dev"
 Requires-Dist: pytest-cov<7,>=4; extra == "dev"
 Requires-Dist: twine<7,>=4; extra == "dev"

{pynintendoparental-1.0.1.dist-info → pynintendoparental-1.0.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pynintendoparental/__init__.py,sha256=CDz2tdO25y3vO3lLA6VQZOJl2Np10wgPIl8oWA4aGdE,2039
-pynintendoparental/_version.py,sha256=d4QHYmS_30j0hPN8NmNPnQ_Z0TphDRbu4MtQj9cT9e8,22
-pynintendoparental/api.py,sha256=WW_2VqPH8qs09G8vIMDOcoEgXf-8yyOpmAH8wsYAC1w,6469
+pynintendoparental/_version.py,sha256=2plzdEEb24FLjE2I2XyBBcJEPYWHccNL4SgtLC_6erg,22
+pynintendoparental/api.py,sha256=WzsWhQQcexJ5PIdem0WrC5XZ4FtnIeA29XZmV6tfBp0,7027
 pynintendoparental/application.py,sha256=l-oVwM4hrVVUf_2djQ7rJVya7LQP38yhaLPAWt8V8TY,3941
-pynintendoparental/const.py,sha256=0ROFl98eEOTWqTJBu7ElPgdsILJOyXJi4Xp7Dk8LRUY,1967
-pynintendoparental/device.py,sha256=_vb71vG6SKC9OLSvPnnT4Hc5kjBfVO8vGCA4FTg7GMA,20604
+pynintendoparental/const.py,sha256=Ao38EeEXMOouY4DRgOfeytDY8Kwj3XAaiaCDteSJ7IE,2101
+pynintendoparental/device.py,sha256=ASyWcY8wwWPgq7mlJCnFIP7IeYw0HgSxgIktQUYp8Oo,22201
 pynintendoparental/enum.py,sha256=lzacGti7fcQqAOROjB9782De7bOMYKSEM61SQd6aYG4,401
 pynintendoparental/exceptions.py,sha256=5M3y0OLSRvX9Ly8D4981HqiKTNxxVqeyzPIuAekQ6J8,410
 pynintendoparental/player.py,sha256=WDl0pspHgrV9lGhDp-NKlfP8DV4Yxe02aYaGg9wTTeg,1785
@@ -11,8 +11,8 @@ pynintendoparental/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pynintendoparental/utils.py,sha256=5-EP_rmPnSSWtbi18Y226GtjLhF3PLONKwmRdiy7m2c,198
 pynintendoparental/authenticator/__init__.py,sha256=dnmp6YjBJ0fQ5YWhWGJsAjj1ROxLihPPGr0PVJtTsgI,7589
 pynintendoparental/authenticator/const.py,sha256=_nUJVC0U64j_n1LaQd_KDg0EWFcezb87bQyYYXpbPPY,917
-pynintendoparental-1.0.1.dist-info/licenses/LICENSE,sha256=zsxHgHVMnyWq121yND8zBl9Rl9H6EF2K9N51B2ZSm_k,1071
-pynintendoparental-1.0.1.dist-info/METADATA,sha256=rzybrmp9z0jtmmDLNfp-35fDXD-CRMDDZfG4xDiSb5w,1871
-pynintendoparental-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pynintendoparental-1.0.1.dist-info/top_level.txt,sha256=QQ5bAl-Ljso16P8KLf1NHrFmKk9jLT7bVJG_rVlIXWk,19
-pynintendoparental-1.0.1.dist-info/RECORD,,
+pynintendoparental-1.0.3.dist-info/licenses/LICENSE,sha256=zsxHgHVMnyWq121yND8zBl9Rl9H6EF2K9N51B2ZSm_k,1071
+pynintendoparental-1.0.3.dist-info/METADATA,sha256=T6pA0zeYr7UQRNqK9cdMFIaCTrWx-bXZgZxKayg86nE,1871
+pynintendoparental-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pynintendoparental-1.0.3.dist-info/top_level.txt,sha256=QQ5bAl-Ljso16P8KLf1NHrFmKk9jLT7bVJG_rVlIXWk,19
+pynintendoparental-1.0.3.dist-info/RECORD,,