Merge pull request #42 from Galarzaa90/feat-revealed-gems

Add revealed gems to auction details

Author: Galarzaa90

tibiapy/builders/bazaar.py

@@ -4,7 +4,7 @@
 from typing import List, Optional, TYPE_CHECKING
 
 from tibiapy.models import Auction, CharacterBazaar
-from tibiapy.models.bazaar import AuctionDetails
+from tibiapy.models.bazaar import AuctionDetails, RevealedGem
 
 if TYPE_CHECKING:
     import datetime
@@ -210,6 +210,7 @@ def __init__(self):
         self._achievements = None
         self._bestiary_progress = None
         self._bosstiary_progress = None
+        self._revealed_gems = []
 
     def hit_points(self, hit_points: int) -> Self:
         self._hit_points = hit_points
@@ -394,6 +395,10 @@ def bosstiary_progress(self, bosstiary_progress: List[BestiaryEntry]) -> Self:
         self._bosstiary_progress = bosstiary_progress
         return self
 
+    def add_revealed_gem(self, gem: RevealedGem) -> Self:
+        self._revealed_gems.append(gem)
+        return self
+
     def build(self):
         return AuctionDetails(
             hit_points=self._hit_points,
@@ -441,4 +446,5 @@ def build(self):
             achievements=self._achievements,
             bestiary_progress=self._bestiary_progress,
             bosstiary_progress=self._bosstiary_progress,
+            revealed_gems=self._revealed_gems,
         )

tibiapy/models/bazaar.py

@@ -353,6 +353,13 @@ class SkillEntry(BaseModel):
     """The percentage of progress for the next level."""
 
 
+class RevealedGem(BaseModel):
+    gem_type: str
+    """The type of gem."""
+    mods: List[str]
+    """The mods or effects the gem has."""
+
+
 class AuctionDetails(BaseModel):
     """The details of an auction."""
 
@@ -446,6 +453,8 @@ class AuctionDetails(BaseModel):
     """The bestiary progress of the character."""
     bosstiary_progress: List[BestiaryEntry]
     """The bosstiary progress of the character."""
+    revealed_gems: List[RevealedGem]
+    """The gems that have been revealed by the character."""
 
     @property
     def completed_bestiary_entries(self) -> List[BestiaryEntry]:

tibiapy/parsers/bazaar.py

@@ -13,6 +13,7 @@
 from tibiapy.models import (AchievementEntry, AjaxPaginator, Auction, AuctionFilters, BestiaryEntry, BlessingEntry,
                             CharacterBazaar, CharmEntry, FamiliarEntry, Familiars, ItemEntry, ItemSummary, MountEntry,
                             Mounts, OutfitEntry, OutfitImage, Outfits, SalesArgument, SkillEntry)
+from tibiapy.models.bazaar import RevealedGem
 from tibiapy.utils import (clean_text, convert_line_breaks, get_rows, parse_form_data, parse_integer, parse_pagination,
                            parse_tibia_datetime, parse_tibiacom_content, try_enum)
 
@@ -216,6 +217,9 @@ def from_content(cls, content: str, auction_id: int = 0, skip_details: bool = Fa
         if "BosstiaryProgress" in details_tables:
             cls._parse_bestiary_table(builder, details_tables["BosstiaryProgress"], True)
 
+        if "RevealedGems" in details_tables:
+            cls._parse_revealed_gems_table(builder, details_tables["RevealedGems"])
+
         auction.details = builder.build()
         return auction
 
@@ -682,6 +686,19 @@ def _parse_displayed_familiar(cls, item_box):
 
         return familiar
 
+    @classmethod
+    def _parse_revealed_gems_table(cls, builder: AuctionDetailsBuilder, table: bs4.Tag):
+        table_content = table.select_one("table.TableContent")
+        _, *rows = get_rows(table_content)
+        for row in rows:
+            gem_tag = row.select_one("div.Gem")
+            gem_type = gem_tag["title"]
+            effects = [t.text for t in row.select("span")]
+            builder.add_revealed_gem(RevealedGem(
+                gem_type=gem_type,
+                mods=effects,
+            ))
+
     @classmethod
     def _parse_page_items(cls, content, paginator: AjaxPaginator):
         parsed_content = parse_tibiacom_content(content, builder="html5lib")