pynintendoparental 2.0.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

pynintendoparental/_version.py

@@ -1 +1 @@
-__version__ = "2.0.0"
+__version__ = "2.1.1"

pynintendoparental/api.py

@@ -112,12 +112,6 @@ class Api:
         # now return the resp dict
         return resp
 
-    async def async_get_account_details(self) -> dict:
-        """Get account details."""
-        return await self.send_request(
-            endpoint="get_account_details", ACCOUNT_ID=self.account_id
-        )
-
     async def async_get_account_devices(self) -> dict:
         """Get account devices."""
         return await self.send_request(endpoint="get_account_devices")
@@ -146,14 +140,6 @@ class Api:
             endpoint="get_device_parental_control_setting", DEVICE_ID=device_id
         )
 
-    async def async_get_device_parental_control_setting_state(
-        self, device_id: str
-    ) -> dict:
-        """Get device parental control setting state."""
-        return await self.send_request(
-            endpoint="get_device_parental_control_setting_state", DEVICE_ID=device_id
-        )
-
     async def async_get_device_monthly_summary(
         self, device_id: str, year: int, month: int
     ) -> dict:

pynintendoparental/const.py

@@ -6,8 +6,8 @@ import logging
 _LOGGER = logging.getLogger(__package__)
 CLIENT_ID = "54789befb391a838"
 MOBILE_APP_PKG = "com.nintendo.znma"
-MOBILE_APP_VERSION = "2.2.0"
-MOBILE_APP_BUILD = "560"
+MOBILE_APP_VERSION = "2.3.0"
+MOBILE_APP_BUILD = "600"
 OS_NAME = "ANDROID"
 OS_VERSION = "34"
 OS_STR = f"{OS_NAME} {OS_VERSION}"

pynintendoparental/device.py

@@ -32,8 +32,9 @@ class Device:
         self._api: Api = api
         self.daily_summaries: dict = {}
         self.parental_control_settings: dict = {}
-        self.players: list[Player] = []
+        self.players: dict[str, Player] = {}
         self.limit_time: int | float | None = 0
+        self.extra_playing_time: int | None = None
         self.timer_mode: DeviceTimerMode | None = None
         self.today_playing_time: int | float = 0
         self.today_time_remaining: int | float = 0
@@ -66,6 +67,13 @@ class Device:
         """Return the generation."""
         return self.extra.get("platformGeneration", None)
 
+    @property
+    def last_sync(self) -> float | None:
+        """Return the last time this device was synced."""
+        return self.extra.get("synchronizedParentalControlSetting", {}).get(
+            "synchronizedAt", None
+        )
+
     async def update(self):
         """Update data."""
         _LOGGER.debug(">> Device.update()")
@@ -76,11 +84,8 @@ class Device:
             self.get_monthly_summary(),
             self._get_extras(),
         )
-        if not self.players:
-            self.players = Player.from_device_daily_summary(self.daily_summaries)
-        else:
-            for player in self.players:
-                player.update_from_daily_summary(self.daily_summaries)
+        for player in self.players.values():
+            player.update_from_daily_summary(self.daily_summaries)
         await self._execute_callbacks()
 
     def add_device_callback(self, callback):
@@ -321,6 +326,14 @@ class Device:
         today_reg = self._get_today_regulation(now)
         limit_time = today_reg.get("timeToPlayInOneDay", {}).get("limitTime")
         self.limit_time = limit_time if limit_time is not None else -1
+        extra_playing_time_data = (
+            pcs.get("ownedDevice", {}).get("device", {}).get("extraPlayingTime")
+        )
+        self.extra_playing_time = None
+        if extra_playing_time_data:
+            self.extra_playing_time = extra_playing_time_data.get("inOneDay", {}).get(
+                "duration"
+            )
 
         bedtime_setting = today_reg.get("bedtime", {})
         if bedtime_setting.get("enabled"):
@@ -527,6 +540,15 @@ class Device:
             )
             if latest:
                 self.last_month_summary = summary = response["json"]["summary"]
+                # Generate player objects
+                for player in response.get("json", {}).get("summary", {}).get("players", []):
+                    profile = player.get("profile")
+                    if not profile or not profile.get("playerId"):
+                        continue
+                    player_id = profile["playerId"]
+                    if player_id not in self.players:
+                        self.players[player_id] = Player.from_profile(profile)
+                    self.players[player_id].month_summary = player.get("summary", {})
                 return summary
             return response["json"]["summary"]
 
@@ -564,7 +586,7 @@ class Device:
 
     def get_player(self, player_id: str) -> Player:
         """Returns a player."""
-        player = next((p for p in self.players if p.player_id == player_id), None)
+        player = self.players.get(player_id)
         if player:
             return player
         raise ValueError(f"Player with id {player_id} not found.")

pynintendoparental/exceptions.py

@@ -2,12 +2,14 @@
 
 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 NoDevicesFoundException(Exception):
     """No devices were found for the account."""
 

pynintendoparental/player.py

@@ -8,22 +8,22 @@ class Player:
 
     def __init__(self):
         """Init a player."""
-        self.player_image: str = None
-        self.nickname: str = None
+        self.player_image: str | None = None
+        self.nickname: str | None = None
         self.apps: list = []
-        self.player_id: str = None
-        self.playing_time: int = None
+        self.month_summary: dict = {}
+        self.player_id: str | None = None
+        self.playing_time: int = 0
 
     def update_from_daily_summary(self, raw: list[dict]):
         """Update the current instance of the player from the daily summery"""
         _LOGGER.debug("Updating player %s daily summary", self.player_id)
-        for player in raw[0].get("devicePlayers", []):
-            if self.player_id is player["profile"].get("playerId"):
-                self.player_id = player["profile"].get("playerId")
+        for player in raw[0].get("players", []):
+            if self.player_id == player["profile"].get("playerId"):
                 self.player_image = player["profile"].get("imageUri")
                 self.nickname = player["profile"].get("nickname")
                 self.playing_time = player.get("playingTime")
-                self.apps = player.get("playedApps")
+                self.apps = player.get("playedGames")
                 break
 
     @classmethod
@@ -41,3 +41,12 @@ class Player:
             players.append(parsed)
             _LOGGER.debug("Built player %s", parsed.player_id)
         return players
+
+    @classmethod
+    def from_profile(cls, raw: dict) -> "Player":
+        """Converts a profile response into a player."""
+        parsed = cls()
+        parsed.player_id = raw.get("playerId")
+        parsed.player_image = raw.get("imageUri")
+        parsed.nickname = raw.get("nickname")
+        return parsed

{pynintendoparental-2.0.0.dist-info → pynintendoparental-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pynintendoparental
-Version: 2.0.0
+Version: 2.1.1
 Summary: A Python module to interact with Nintendo Parental Controls
 Home-page: http://github.com/pantherale0/pynintendoparental
 Author: pantherale0
@@ -11,16 +11,20 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pynintendoauth~=1.0.0
+Requires-Dist: pynintendoauth==1.0.0
 Provides-Extra: dev
+Requires-Dist: aiofiles<26,>=23; extra == "dev"
 Requires-Dist: bandit<1.9,>=1.7; extra == "dev"
 Requires-Dist: black<26,>=23; extra == "dev"
 Requires-Dist: build<1.4,>=0.10; extra == "dev"
+Requires-Dist: Faker<39,>=38; extra == "dev"
 Requires-Dist: flake8<8,>=6; extra == "dev"
 Requires-Dist: isort<7,>=5; extra == "dev"
-Requires-Dist: mypy<1.19,>=1.5; extra == "dev"
+Requires-Dist: mypy<1.20,>=1.5; extra == "dev"
 Requires-Dist: pytest<9,>=7; extra == "dev"
 Requires-Dist: pytest-cov<8,>=4; extra == "dev"
+Requires-Dist: pytest-asyncio<1.0,>=0.21; extra == "dev"
+Requires-Dist: syrupy<6,>=5; extra == "dev"
 Requires-Dist: twine<7,>=4; extra == "dev"
 Dynamic: author
 Dynamic: classifier

pynintendoparental-2.1.1.dist-info/RECORD

@@ -0,0 +1,17 @@
+pynintendoparental/__init__.py,sha256=gO3rH9gukrFoACVkdqj_liqcgtHxSZlitE0PrVQZGok,2334
+pynintendoparental/_version.py,sha256=zPJIgPGcoSNiD0qme18OnYJYE3A9VVytlhO-V5DaAW0,22
+pynintendoparental/api.py,sha256=cVL17wmkCA4AHnVAGzMkNA-40t9M9Q7iZYNFWxu-Oa8,6534
+pynintendoparental/application.py,sha256=8zTisF3_COgIzKCLIgLpYdHcX4OiwRQU5NH2WUngvxc,3995
+pynintendoparental/authenticator.py,sha256=WPAEAUKmIymIiQUXILYt4B2_3UgYRKEVi6btJRwzjmM,430
+pynintendoparental/const.py,sha256=bKfv1O-eFbzvhz0EE2Cj6Px2b5yoq8HL7itMP4TWmwo,2174
+pynintendoparental/device.py,sha256=CiW-SXYGvjsZzW10Sf1Xu0PA6hkduabpWyWPIxgzKng,25541
+pynintendoparental/enum.py,sha256=NlkfrZTfiur6vTqqwHxeiM7wPQZ-1Y1PlY4Jh_gq4NQ,605
+pynintendoparental/exceptions.py,sha256=zOGZHlBFfdcBNNWHA7t_Ix2Qgd3ON2-SVjmA9dHs578,883
+pynintendoparental/player.py,sha256=Zh3vi0IdOHtn5KW0tT9JigB315ftjQ4uEQylF3D4LWs,2084
+pynintendoparental/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pynintendoparental/utils.py,sha256=gLMibsEOnKUZJgCQKF4Zk517fawZ3mBqMK6MS2g-Um0,199
+pynintendoparental-2.1.1.dist-info/licenses/LICENSE,sha256=zsxHgHVMnyWq121yND8zBl9Rl9H6EF2K9N51B2ZSm_k,1071
+pynintendoparental-2.1.1.dist-info/METADATA,sha256=jM_7IdBkIF0pNrQgyDCGVK8L974XMZo2ypvEc9c5MVg,2125
+pynintendoparental-2.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pynintendoparental-2.1.1.dist-info/top_level.txt,sha256=QQ5bAl-Ljso16P8KLf1NHrFmKk9jLT7bVJG_rVlIXWk,19
+pynintendoparental-2.1.1.dist-info/RECORD,,

pynintendoparental-2.0.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-pynintendoparental/__init__.py,sha256=gO3rH9gukrFoACVkdqj_liqcgtHxSZlitE0PrVQZGok,2334
-pynintendoparental/_version.py,sha256=_7OlQdbVkK4jad0CLdpI0grT-zEAb-qgFmH5mFzDXiA,22
-pynintendoparental/api.py,sha256=LmZei8WPzEhCEoVLXXHiaKRbDEbmGyD6CyfPS4fXxnc,7047
-pynintendoparental/application.py,sha256=8zTisF3_COgIzKCLIgLpYdHcX4OiwRQU5NH2WUngvxc,3995
-pynintendoparental/authenticator.py,sha256=WPAEAUKmIymIiQUXILYt4B2_3UgYRKEVi6btJRwzjmM,430
-pynintendoparental/const.py,sha256=2fq0VmqFetwLq1YBXatlb7tFaDeR0pnsdja4MLFdbDA,2174
-pynintendoparental/device.py,sha256=VSK1-fKcXA2AoGCKaVGyhy32T6VXYowuo7upNivaWyk,24521
-pynintendoparental/enum.py,sha256=NlkfrZTfiur6vTqqwHxeiM7wPQZ-1Y1PlY4Jh_gq4NQ,605
-pynintendoparental/exceptions.py,sha256=8a_7ocrlB0PwPM36Q4FqR-W0lkGXihOs79gGqQIWZoo,881
-pynintendoparental/player.py,sha256=rXYgUiy7DhBjosQlADr7Fa_HVdA1e-04oPZiC4Y68oM,1787
-pynintendoparental/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pynintendoparental/utils.py,sha256=gLMibsEOnKUZJgCQKF4Zk517fawZ3mBqMK6MS2g-Um0,199
-pynintendoparental-2.0.0.dist-info/licenses/LICENSE,sha256=zsxHgHVMnyWq121yND8zBl9Rl9H6EF2K9N51B2ZSm_k,1071
-pynintendoparental-2.0.0.dist-info/METADATA,sha256=5LTsNbTAUk98bovyA4h57PuFT6-iC470Hk98ErArp7Q,1931
-pynintendoparental-2.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pynintendoparental-2.0.0.dist-info/top_level.txt,sha256=QQ5bAl-Ljso16P8KLf1NHrFmKk9jLT7bVJG_rVlIXWk,19
-pynintendoparental-2.0.0.dist-info/RECORD,,