Fixed changes in auction tooltips

Author: Galarzaa90

tests/resources/bazaar/tibiacom_auction_finished.txt

@@ -88,28 +88,28 @@ def test_character_bazaar_from_content_history(self):
 
         self.assertIsNotNone(bazaar)
         self.assertEqual(1, bazaar.page)
-        self.assertEqual(777, bazaar.total_pages)
-        self.assertEqual(19407, bazaar.results_count)
+        self.assertEqual(1449, bazaar.total_pages)
+        self.assertEqual(36219, bazaar.results_count)
         self.assertEqual(25, len(bazaar.entries))
         self.assertIsNotNone(bazaar.url)
 
         auction = bazaar.entries[0]
-        self.assertEqual(1060, auction.auction_id)
-        self.assertEqual(752, auction.bid)
-        self.assertEqual("Maroze Loth", auction.name)
-        self.assertEqual(130, auction.level)
-        self.assertEqual("Pyra", auction.world)
-        self.assertEqual(Vocation.ELITE_KNIGHT, auction.vocation)
+        self.assertEqual(325058, auction.auction_id)
+        self.assertEqual(900, auction.bid)
+        self.assertEqual("Rcrazy Illuminati", auction.name)
+        self.assertEqual(255, auction.level)
+        self.assertEqual("Celebra", auction.world)
+        self.assertEqual(Vocation.MASTER_SORCERER, auction.vocation)
         self.assertEqual(Sex.MALE, auction.sex)
         self.assertEqual(BidType.WINNING, auction.bid_type)
         self.assertIsNotNone(auction.character_url)
-        self.assertEqual(2, len(auction.displayed_items))
-        self.assertEqual(128, auction.outfit.outfit_id)
+        self.assertEqual(1, len(auction.displayed_items))
+        self.assertEqual(143, auction.outfit.outfit_id)
 
         first_item = auction.displayed_items[0]
-        self.assertEqual(391, first_item.count)
-        self.assertEqual(268, first_item.item_id)
-        self.assertEqual("mana potion", first_item.name)
+        self.assertEqual(1, first_item.count)
+        self.assertEqual(25700, first_item.item_id)
+        self.assertEqual("dream blossom staff", first_item.name)
         self.assertIsNotNone(first_item.image_url)
 
         self.assertIsNone(bazaar.filters)
@@ -161,8 +161,8 @@ def test_auction_details_from_content_finished(self):
         self.assertIsInstance(auction.creation_date, datetime.datetime)
         self.assertEqual(26006721711, auction.experience)
         self.assertEqual(41893, auction.gold)
-        self.assertEqual(540, auction.achievement_points)
-        self.assertIsInstance(auction.regular_world_transfer_available_date, datetime.datetime)
+        self.assertEqual(553, auction.achievement_points)
+        self.assertIsNone(auction.regular_world_transfer_available_date)
         self.assertEqual(110, auction.available_charm_points)
         self.assertEqual(5800, auction.spent_charm_points)
 
@@ -227,7 +227,7 @@ def test_auction_details_from_content_finished(self):
         self.assertEqual(8, len(auction.charms))
         self.assertEqual(0, len(auction.completed_cyclopedia_map_areas))
         self.assertEqual(16, len(auction.titles))
-        self.assertEqual(214, len(auction.achievements))
+        self.assertEqual(217, len(auction.achievements))
         self.assertEqual(509, len(auction.bestiary_progress))
         self.assertEqual(205, len(auction.completed_bestiary_entries))
 

tests/resources/bazaar/tibiacom_history.txt

@@ -45,7 +45,7 @@
 id_addon_regex = re.compile(r'(\d+)_(\d)\.gif')
 id_regex = re.compile(r'(\d+).(?:gif|png)')
 description_regex = re.compile(r'"(?:an?\s)?([^"]+)"')
-quotes = re.compile(r'"([^"]+)"')
+amount_regex = re.compile(r'([\d,]+)x')
 
 log = logging.getLogger("tibiapy")
 
@@ -468,9 +468,6 @@ def _parse_image_box(cls, item_box):
         img_tag = item_box.find("img")
         if not img_tag:
             return None
-        m = quotes.search(description)
-        if m:
-            description = m.group(1)
         return cls(image_url=img_tag["src"], name=description)
 
 
@@ -514,19 +511,19 @@ def _parse_image_box(cls, item_box):
         img_tag = item_box.find("img")
         if not img_tag:
             return None
-        amount_text = item_box.find("div", attrs={"class": "ObjectAmount"})
-        amount = parse_tibia_money(amount_text.text) if amount_text else 1
+        m = amount_regex.match(title_text)
+        amount = 1
+        if m:
+            amount = parse_integer(m.group(1))
+            title_text = amount_regex.sub("", title_text, 1).strip()
         item_id = 0
-        name = None
         description = None
-        if "\n" in title_text:
-            description = title_text.split("\n", 1)[1]
+        name, *desc = title_text.split("\n")
+        if desc:
+            description = desc[0]
         m = id_regex.search(img_tag["src"])
         if m:
             item_id = int(m.group(1))
-        m = description_regex.search(title_text)
-        if m:
-            name = m.group(1)
         return DisplayItem(image_url=img_tag["src"], name=name, count=amount, item_id=item_id, description=description)
 
 
@@ -593,6 +590,8 @@ def __repr__(self):
     @classmethod
     def _parse_image_box(cls, item_box):
         outfit = super()._parse_image_box(item_box)
+        name = outfit.name.split("(")[0].strip()
+        outfit.name = name
         m = id_addon_regex.search(outfit.image_url)
         if m:
             outfit.outfit_id = int(m.group(1))
@@ -750,7 +749,7 @@ def _parse_auction(cls, auction_row, auction_id=0):
         auction.auction_end = parse_tibia_datetime(end_date_tag.text.replace('\xa0', ' '))
         bids_container = auction_row.find("div", {"class": "ShortAuctionDataBidRow"})
         bid_tag = bids_container.find("div", {"class", "ShortAuctionDataValue"})
-        bid_type_tag = bids_container.find_all("div", {"class", "ShortAuctionDataLabel"})[-1]
+        bid_type_tag = bids_container.find_all("div", {"class", "ShortAuctionDataLabel"})[0]
         bid_type_str = bid_type_tag.text.replace(":", "").strip()
         auction.bid_type = try_enum(BidType, bid_type_str)
         auction.bid = parse_integer(bid_tag.text)