bid update defId fix, remove add auction def and combine with update

Author: hunterjm

core/bid.py

@@ -137,7 +137,7 @@ def bid(q, api, playerList, settings):
                 q.put('%s    Updating watched items...\n' % (time.strftime('%Y-%m-%d %H:%M:%S')))
                 for item in api.tradeStatus([tradeId for tradeId in trades]):
                     item['resourceId'] = trades[item['tradeId']]
-                    baseId = str(api.baseId(item['resourceId']))
+                    baseId = str(abs(item['resourceId'] + 0x80000000))
                     if baseId not in bidDetails:
                         continue
                     maxBid = bidDetails[baseId]['maxBid']
@@ -148,15 +148,14 @@ def bid(q, api, playerList, settings):
 
                     tradeId = item['tradeId']
                     if tradeId not in trades:
-                        break
+                        continue
 
                     asset = api.cardInfo(trades[tradeId])
                     displayName = asset['Item']['CommonName'] if asset['Item']['CommonName'] else asset['Item']['LastName']
                     card = PlayerCard(item, displayName)
 
                     # Handle Expired Items
                     if item['expires'] == -1:
-
                         if (item['bidState'] == 'highest' or (item['tradeState'] == 'closed' and item['bidState'] == 'buyNow')):
 
                             # We won! Send to Pile!
@@ -191,7 +190,6 @@ def bid(q, api, playerList, settings):
                                 del trades[tradeId]
 
                     elif item['bidState'] != 'highest':
-
                         # Continue if we already have too many listed or we don't have enough credits
                         if listed >= settings['maxPlayer'] or api.credits < settings['minCredits']:
                             continue
@@ -218,7 +216,7 @@ def bid(q, api, playerList, settings):
             # buy now goes directly to unassigned now
             if binWon:
                 for item in api.unassigned():
-                    baseId = str(api.baseId(item['resourceId']))
+                    baseId = str(abs(item['resourceId'] + 0x80000000))
                     if baseId not in bidDetails:
                         continue
                     maxBid = bidDetails[baseId]['maxBid']
@@ -262,7 +260,7 @@ def bid(q, api, playerList, settings):
                 if not settings['relistAll'] or relistFailed:
                     q.put('%s    Manually re-listing %d players.\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), expired))
                     for i in tradepile:
-                        baseId = str(api.baseId(i['resourceId']))
+                        baseId = str(abs(item['resourceId'] + 0x80000000))
                         if baseId in bidDetails:
                             sell = i['startingBid'] if settings['relistAll'] else bidDetails[baseId]['sell']
                             binPrice = i['buyNowPrice'] if settings['relistAll'] else bidDetails[baseId]['binPrice']

frames/misc/auctions.py

@@ -56,15 +56,11 @@ def __init__(self, frame):
     def get_view(self):
         return self.view
 
-    def add_auction(self, card, timestamp, currbid, index='end', tag=''):
+    def update_status(self, card, timestamp, currbid, tag=''):
         if not card.cardid in self.cards:
-            return self.tree.insert("", index, card.cardid, text=card.cardname, values=(timestamp, card.startingBid,
+            self.tree.insert("", 'end', card.cardid, text=card.cardname, values=(timestamp, card.startingBid,
                                                                                         currbid, card.buyNowPrice,
                                                                                         card.expires), tags=(tag,))
-
-    def update_status(self, card, timestamp, currbid, tag=''):
-        if not card.cardid in self.cards:
-            self.add_auction(card, timestamp, currbid, 'end', tag)
         else:
             options = self.tree.item(card.cardid)
             options['values'] = (timestamp, card.startingBid,