Merge pull request #40 from Galarzaa90/38-rented_regex-in-house-parser-is-specifically-searching-for-houses-wrongly-parsing-guildhalls

Fix house regex not handling guildhalls

Author: Galarzaa90

tibiapy/builders/house.py

@@ -240,6 +240,7 @@ def build(self):
             beds=self._beds,
             owner=self._owner,
             owner_sex=self._owner_sex,
+            paid_until=self._paid_until,
             transfer_recipient=self._transfer_recipient,
             transfer_price=self._transfer_price,
             transfer_date=self._transfer_date,

tibiapy/parsers/house.py

@@ -24,14 +24,15 @@
 id_regex = re.compile(r"house_(\d+)\.")
 bed_regex = re.compile(r"This (?P<type>\w+) can have up to (?P<beds>[\d-]+) bed")
 info_regex = (
-    re.compile(r"The house has a size of (?P<size>\d+) square meters?. "
-               r"The monthly rent is (?P<rent>\d+k?) gold and will be debited to the bank account on (?P<world>\w+).")
+    re.compile(r"The (?:house|guildhall) has a size of (?P<size>\d+) square meters?. "
+               r"The monthly rent is (?P<rent>\d+k+) gold and will be debited to the bank account on (?P<world>\w+).")
 )
 
-rented_regex = re.compile(r"The house has been rented by (?P<owner>[^.]+)\."
+rented_regex = re.compile(r"The (?:house|guildhall) has been rented by (?P<owner>[^.]+)\."
                           r" (?P<pronoun>\w+) has paid the rent until (?P<paid_until>[^.]+)\.")
 transfer_regex = re.compile(r"\w+ will move out on (?P<transfer_date>[^(]+)\([^)]+\)(?: and (?P<verb>wants to|will)"
-                            r" pass the house to (?P<transferee>[\w\s]+) for (?P<transfer_price>\d+) gold coin)?")
+                            r" pass the (?:house|guildhall) to (?P<transferee>[\w\s]+) for "
+                            r"(?P<transfer_price>\d+) gold coin)?")
 moving_regex = re.compile(r"\w+ will move out on (?P<move_date>[^(]+)")
 bid_regex = (
     re.compile(r"The highest bid so far is (?P<highest_bid>\d+) gold and has been submitted by (?P<bidder>[^.]+)")