From 45d338ba3d292f5f6b397059c109d1887ab865a6 Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Wed, 6 Jul 2016 22:30:03 -0400
Subject: [PATCH] Add price to item compare (#673)

---
 gui/itemStats.py  | 11 +++++++++++
 service/market.py |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gui/itemStats.py b/gui/itemStats.py
index 6f2087172..87ec947dc 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -29,6 +29,7 @@ from gui.utils.numberFormatter import formatAmount
 import service
 import config
 from gui.contextMenu import ContextMenu
+from gui.utils.numberFormatter import formatAmount
 
 try:
     from collections import OrderedDict
@@ -551,6 +552,10 @@ class ItemCompare(wx.Panel):
         self.UpdateList()
         event.Skip()
 
+    def processPrices(self, prices):
+        for i, price in enumerate(prices):
+            self.paramList.SetStringItem(i, len(self.attrs)+1, formatAmount(price.price, 3, 3, 9, currency=True))
+
     def PopulateList(self):
         self.paramList.InsertColumn(0, "Item")
         self.paramList.SetColumnWidth(0, 200)
@@ -560,6 +565,12 @@ class ItemCompare(wx.Panel):
             self.paramList.InsertColumn(i+1, name)
             self.paramList.SetColumnWidth(i+1, 120)
 
+        self.paramList.InsertColumn(len(self.attrs)+1, "Price")
+        self.paramList.SetColumnWidth(len(self.attrs)+1, 60)
+
+        sMkt = service.Market.getInstance()
+        sMkt.getPrices([x.ID for x in self.items], self.processPrices)
+
         for item in self.items:
             i = self.paramList.InsertStringItem(sys.maxint, item.name)
             for x, attr in enumerate(self.attrs.keys()):
diff --git a/service/market.py b/service/market.py
index 65725a70e..6c6578b58 100644
--- a/service/market.py
+++ b/service/market.py
@@ -757,7 +757,7 @@ class Market():
         def cb():
             try:
                 callback(requests)
-            except:
+            except Exception, e:
                 pass
             eos.db.commit()