infinitode.py 1.1.4__tar.gz → 1.1.6__tar.gz

{infinitode.py-1.1.4 → infinitode.py-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: infinitode.py
-Version: 1.1.4
+Version: 1.1.6
 Summary: A python wrapper for the Infinitode 2 API.
 Home-page: https://github.com/Sprylos/infinitode.py
 Author: Sprylos

{infinitode.py-1.1.4 → infinitode.py-1.1.6}/infinitode/__init__.py

@@ -7,7 +7,7 @@ An asynchronous wrapper for the Infinitode API.
 
 __author__ = "Sprylos"
 __title__ = "infinitode.py"
-__version__ = "1.1.4"
+__version__ = "1.1.6"
 __license__ = """MIT License
 
 Copyright (c) 2025 Sprylos

{infinitode.py-1.1.4 → infinitode.py-1.1.6}/infinitode/core.py

@@ -51,7 +51,7 @@ def base_url(beta: bool = False) -> str:
 
 class Session:
     def __init__(self, session: Optional[aiohttp.ClientSession] = None) -> None:
-        self.__session = session or aiohttp.ClientSession()
+        self._session = session or aiohttp.ClientSession()
 
     # async enter and exit allow for the fancy "with" statements
     # useful so you don't have to close the session yourself
@@ -63,11 +63,10 @@ class Session:
 
     async def close(self):
         """Closes the internal ClientSession."""
-        await self.__session.close()
+        await self._session.close()
 
-    # Rough parameter checking, "*" makes params keyword only
     @staticmethod
-    def __kwarg_check(
+    def _kwarg_check(
         *,
         mapname: Optional[str] = None,
         playerid: Optional[str] = None,
@@ -87,13 +86,13 @@ class Session:
 
     # not being more specific with the payload type
     # so the typechecker stops annoying me
-    async def __post(
+    async def _post(
         self, arg: str, data: Optional[Dict[str, Any]] = None, *, beta: bool = False
     ) -> Dict[str, Any]:
         """Internal post method to communicate with Rainy's API"""
         url = base_url(beta) + f"?m=api&a={arg}&apiv=1&g=com.prineside.tdi2&v=282"
         LOG.info("Sending POST request %s with data %s", arg, data)
-        async with self.__session.post(url, data=data) as r:
+        async with self._session.post(url, data=data) as r:
             try:
                 r.raise_for_status()
             except aiohttp.ClientResponseError:
@@ -121,10 +120,10 @@ class Session:
         Retrieves a Score of the given player.
         A valid playerid needs to be specified.
         """
-        self.__kwarg_check(
+        self._kwarg_check(
             mapname=mapname, playerid=playerid, mode=mode, difficulty=difficulty
         )
-        payload = await self.__post(
+        payload = await self._post(
             "getLeaderboardsRank",
             data={
                 "gamemode": "BASIC_LEVELS",
@@ -153,11 +152,11 @@ class Session:
         Retrieves a Leaderboard.
         The leaderboard contains the top 200 scores of the specified map.
         """
-        self.__kwarg_check(
+        self._kwarg_check(
             mapname=mapname, playerid=playerid, mode=mode, difficulty=difficulty
         )
 
-        payload = await self.__post(
+        payload = await self._post(
             "getLeaderboards",
             data={
                 "gamemode": "BASIC_LEVELS",
@@ -189,10 +188,10 @@ class Session:
         A valid playerid needs to be specified.
         The leaderboard contains the top 200 scores and one Score for each top% of the specified map.
         """
-        self.__kwarg_check(
+        self._kwarg_check(
             mapname=mapname, playerid=playerid, mode=mode, difficulty=difficulty
         )
-        payload = await self.__post(
+        payload = await self._post(
             "getRuntimeLeaderboards",
             data={
                 "gamemode": "BASIC_LEVELS",
@@ -216,9 +215,9 @@ class Session:
         The leaderboard contains the top 3 skill point owners (looking at you, Eupho!).
         """
         if playerid is not None:
-            self.__kwarg_check(playerid=playerid)
+            self._kwarg_check(playerid=playerid)
 
-        payload = await self.__post(
+        payload = await self._post(
             "getSkillPointLeaderboard", data={"playerid": playerid}, beta=beta
         )
         lb = Leaderboard.from_payload(
@@ -248,7 +247,7 @@ class Session:
             date = date.strftime("%Y-%m-%d")
         else:
             try:
-                datetime.datetime.strptime(date, "%Y-%m-%d")
+                date_obj = datetime.datetime.strptime(date, "%Y-%m-%d")
             except ValueError:
                 if warning is True:
                     LOG.warning(
@@ -256,11 +255,13 @@ class Session:
                         date,
                     )
                 date = datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%d")
+            else:
+                date = date_obj.strftime("%Y-%m-%d")  # allows for missing leading zeros
 
         if playerid is not None:
-            self.__kwarg_check(playerid=playerid)
+            self._kwarg_check(playerid=playerid)
 
-        payload = await self.__post(
+        payload = await self._post(
             "getDailyQuestLeaderboards",
             data={"date": date, "playerid": playerid},
             beta=beta,
@@ -278,7 +279,7 @@ class Session:
         return lb
 
     @async_expiring_cache()
-    async def seasonal_leaderboard(self, beta: bool = False) -> Leaderboard:
+    async def seasonal_leaderboard(self, *, beta: bool = False) -> Leaderboard:
         """
         Retrieves the season Leaderboard.
         The leaderboard contains the top 100 scores in the season.
@@ -287,7 +288,7 @@ class Session:
         url = base_url(beta) + "xdx/?url=seasonal_leaderboard"
         LOG.info("Sending GET request to %s", url)
 
-        r = await self.__session.get(url=url)
+        r = await self._session.get(url=url)
         try:
             r.raise_for_status()
         except aiohttp.ClientResponseError:
@@ -317,16 +318,32 @@ class Session:
         return lb
 
     @async_expiring_cache()
-    async def player(self, playerid: str, beta: bool = False) -> Player:
+    async def player(
+        self,
+        playerid: str | None = None,
+        nickname: str | None = None,
+        *,
+        beta: bool = False,
+    ) -> Player:
         """
         Retrieves the Player.
         A valid playerid needs to be specified.
         """
-        self.__kwarg_check(playerid=playerid)
-        url = base_url(beta) + "xdx/index.php?url=profile/view&id=" + playerid
+        if playerid and nickname:
+            raise BadArgument("You can't specify both playerid and nickname.")
+
+        url = base_url(beta)
+        if nickname:
+            url = url + "xdx/index.php?url=profile/view&nickname=" + nickname
+        elif playerid:
+            self._kwarg_check(playerid=playerid)
+            url = url + "xdx/index.php?url=profile/view&id=" + playerid
+        else:
+            raise BadArgument("You need to specify either playerid or nickname.")
+
         LOG.info("Sending GET request to %s", url)
 
-        r = await self.__session.get(url=url)
+        r = await self._session.get(url=url)
         try:
             r.raise_for_status()
         except aiohttp.ClientResponseError:
@@ -335,31 +352,33 @@ class Session:
         loop = asyncio.get_event_loop()
         try:
             return await loop.run_in_executor(
-                None, self.__parse_player, await r.text(), playerid, beta
+                None, self._parse_player, await r.text(), beta
             )
         except Exception as exc:
-            raise BadArgument("Invalid playerid: " + playerid) from exc
+            raise BadArgument(
+                f"Invalid playerid/nickname: {playerid or nickname}"
+            ) from exc
 
     @classmethod
-    def __parse_player(cls, content: str, playerid: str, beta: bool) -> Player:
+    def _parse_player(cls, content: str, beta: bool) -> Player:
         data = BeautifulSoup(content, features="lxml")
 
         t: Dict[str, Any] = {}
-        t["playerid"] = playerid
         t["beta"] = beta
+        t["playerid"] = data.select_one("label:not([i18n],[font-min-size])").text  # type: ignore
         t["nickname"] = data.select_one("label:not([i18n])").text  # type: ignore
 
-        cls.__parse_totals(data, t)
-        cls.__parse_level_from_comments(data, t)
-        cls.__parse_xp_data(data, t)
-        cls.__parse_levels(data, t)
-        cls.__parse_badges(data, t)
-        cls.__parse_misc(data, t)
+        cls._parse_totals(data, t)
+        cls._parse_level_from_comments(data, t)
+        cls._parse_xp_data(data, t)
+        cls._parse_levels(data, t)
+        cls._parse_badges(data, t)
+        cls._parse_misc(data, t)
 
         return Player(**t)
 
     @staticmethod
-    def __parse_totals(data: BeautifulSoup, t: Dict[str, Any]) -> None:
+    def _parse_totals(data: BeautifulSoup, t: Dict[str, Any]) -> None:
         totals = data.select_one('div[width="522"][height="140"][align="center"]')
         if totals is None:
             t.update({"total_score": 0, "total_rank": 0, "total_top": 0})
@@ -374,7 +393,7 @@ class Session:
             t.update({"total_score": 0, "total_rank": 0, "total_top": "0%"})
 
     @staticmethod
-    def __parse_level_from_comments(data: BeautifulSoup, t: Dict[str, Any]) -> None:
+    def _parse_level_from_comments(data: BeautifulSoup, t: Dict[str, Any]) -> None:
         comments = data.findAll(text=lambda text: isinstance(text, Comment))
         for x in comments:
             if "Level:" in x:
@@ -384,7 +403,7 @@ class Session:
             t["level"] = 1
 
     @staticmethod
-    def __parse_xp_data(data: BeautifulSoup, t: Dict[str, Any]) -> None:
+    def _parse_xp_data(data: BeautifulSoup, t: Dict[str, Any]) -> None:
         xp_data = data.select_one('div[width="330"][height="64"]')
         xp_data = xp_data.select_one("label").text.split(" / ")  # type: ignore
         t["xp"] = int(xp_data[0])
@@ -409,7 +428,7 @@ class Session:
             t["season_level"] = int(season_level_data["data"].split(":")[1])  # type: ignore
 
     @staticmethod
-    def __parse_levels(data: BeautifulSoup, t: Dict[str, Any]) -> None:
+    def _parse_levels(data: BeautifulSoup, t: Dict[str, Any]) -> None:
         t["levels"] = {}
 
         for x in data.select('div[width="800"][height="40"]')[1:]:
@@ -437,7 +456,7 @@ class Session:
             )
 
     @staticmethod
-    def __parse_badges(data: BeautifulSoup, t: Dict[str, Any]) -> None:
+    def _parse_badges(data: BeautifulSoup, t: Dict[str, Any]) -> None:
         t["badges"] = {}
 
         icos = [
@@ -474,7 +493,7 @@ class Session:
                     t["badges"][ico] = (rar, col)
 
     @staticmethod
-    def __parse_misc(data: BeautifulSoup, t: Dict[str, Any]) -> None:
+    def _parse_misc(data: BeautifulSoup, t: Dict[str, Any]) -> None:
         labels = data.select('table[width="800"][align="center"]')[-1].select("label")
         replays = labels[-3].string.split(" ")  # type: ignore
         t["replays"] = 0 if len(replays) != 4 else int(replays[3])

{infinitode.py-1.1.4 → infinitode.py-1.1.6}/infinitode/score.py

@@ -67,10 +67,8 @@ class Score:
         self._nickname = nickname
         self._pinned_badge: Optional[Badge] = (
             Badge(**pinnedBadge) if pinnedBadge is not None else None
-        )  # nopep8
-        self._position: Optional[int] = (
-            int(position) if position is not None else None
-        )  # nopep8
+        )
+        self._position: Optional[int] = int(position) if position is not None else None
         self._top = top
         # apparently some payloads provide total, but i think it is pointless as a property
         # so i will keep it as a private attribute just in case it will ever be needed

{infinitode.py-1.1.4 → infinitode.py-1.1.6}/infinitode/utils.py

@@ -20,10 +20,7 @@ def try_int(string: str, /, *, default: int = 0) -> int:
 
 
 def async_expiring_cache(seconds: int = 60) -> Any:
-    """Decorator to cache coroutines return value for the given amount of seconds.
-    
-    It is not perfect because 
-    """
+    """Decorator to cache coroutines return value for the given amount of seconds."""
 
     def decorator(func: Callable[P, Coroutine[Any, Any, T]]) -> Callable[P, asyncio.Task[T]]:
         cache: Dict[Tuple[Any, ...], Tuple[asyncio.Task[T], float]] = {}

{infinitode.py-1.1.4 → infinitode.py-1.1.6}/infinitode.py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: infinitode.py
-Version: 1.1.4
+Version: 1.1.6
 Summary: A python wrapper for the Infinitode 2 API.
 Home-page: https://github.com/Sprylos/infinitode.py
 Author: Sprylos