Fix bug caused by recent change in inventory HTML.

Now items in the inventory can be found again.
fwereade · Dec 24, 2009 · b35d5b4 · b35d5b4
1 parent 4d1cb76
commit b35d5b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/kol/data/Patterns.py b/src/kol/data/Patterns.py
@@ -37,8 +37,8 @@
 	"isCookingIngredient" : r'<br>\(Cooking ingredient\)<br>',
 	"isJewelrymakingComponent" : r'<br>\(Jewelrymaking component\)<br>',
 	"isMeatsmithingComponent" : r'<br>\(Meatsmithing component\)<br>',
-	"inventorySingleItem" : r'<img [^>]*descitem\(([0-9]+)\)[^>]*></td><td[^>]*><b>([^<>]+)</b> <',
-	"inventoryMultipleItems" : r'<img [^>]*descitem\(([0-9]+)\)[^>]*></td><td[^>]*><b>([^<>]+)</b> +\(([0-9]+)\)',
+	"inventorySingleItem" : r'<img [^>]*descitem\(([0-9]+)\)[^>]*></td><td[^>]*><b>([^<>]+)</b>&nbsp;<span><\/span>',
+	"inventoryMultipleItems" : r'<img [^>]*descitem\(([0-9]+)\)[^>]*></td><td[^>]*><b>([^<>]+)</b>&nbsp;<span>\(([0-9]+)\)<\/span>',
 	"itemAutosell" : r'<br>Selling Price: <b>(\d*) Meat\.<\/b>',
 	"itemImage" : r'<img src="http:\/\/images\.kingdomofloathing\.com\/itemimages\/(.*?)"',
 	"itemName" : r'<b>([^<>]+?)<\/b>',

diff --git a/src/kol/manager/MailboxManager.py b/src/kol/manager/MailboxManager.py
@@ -1,6 +1,7 @@
 from kol.request.GetMessagesRequest import GetMessagesRequest
 from kol.request.InventoryRequest import InventoryRequest
 from kol.request.UseItemRequest import UseItemRequest
+from kol.util import Report
 
 class MailboxManager(object):
 	"""
@@ -107,6 +108,7 @@ def getAllMessages(self, box="Inbox", openGiftPackages=False, removeGiftPackages
 		return messages
 
 	def openAllGiftPackages(self):
+		Report.trace("kmail", "Opening gift package(s).")
 		giftPackages = {}
 
 		# Get a list of all gift packages in our inventory.