Merge pull request #20 from elbryan/improvements

Slight improvements

Author: hunterjm

core/bid.py

@@ -112,7 +112,7 @@ def bid(q, api, playerList, settings):
                     for item in api.searchAuctions('player', defId=defId, max_price=bidDetails[defId]['maxBid']-subtract, start=0, page_size=50):
                         # player safety checks for every possible bid
                         # Let's look at last 5 minutes for now and bid on 5 players max
-                        if item['expires'] > 600 or bidon >= 5 or listed >= settings['maxPlayer'] or api.credits < settings['minCredits']:
+                        if item['expires'] > 300 or bidon >= 5 or listed >= settings['maxPlayer'] or api.credits < settings['minCredits']:
                             break
 
                         # No Dups
@@ -165,6 +165,9 @@ def bid(q, api, playerList, settings):
                     displayName = asset['Item']['CommonName'] if asset['Item']['CommonName'] else asset['Item']['LastName']
                     card = PlayerCard(item, displayName)
 
+                    # Update the card, regardless what will happen
+                    q.put((card, EventType.UPDATE, api.credits))
+
                     # Handle Expired Items
                     if item['expires'] == -1:
                         if (item['bidState'] == 'highest' or (item['tradeState'] == 'closed' and item['bidState'] == 'buyNow')):
@@ -221,9 +224,6 @@ def bid(q, api, playerList, settings):
                             else:
                                 q.put('%s    Bid Error: You are not allowed to bid on this trade\n' % (time.strftime('%Y-%m-%d %H:%M:%S')))
 
-                    else:
-                        q.put((card, EventType.UPDATE, api.credits))
-
             # buy now goes directly to unassigned now
             if binWon:
                 for item in api.unassigned():

frames/bid.py

@@ -330,7 +330,7 @@ def checkQueue(self):
                     elif msg[1] == EventType.SOLD:
                         self.auctionStatus.update_status(msg[0], time.strftime('%Y-%m-%d %H:%M:%S'), msg[0].currentBid, tag='sold')
                     elif msg[1] == EventType.UPDATE:
-                        self.auctionStatus.update_status(msg[0], time.strftime('%Y-%m-%d %H:%M:%S'), msg[0].currentBid)
+                        self.auctionStatus.update_status(msg[0], time.strftime('%Y-%m-%d %H:%M:%S'), msg[0].currentBid, highlight=False)
                     self.controller.status.set_credits(msg[2])
                 else:
                     # Auction Results

frames/misc/auctions.py

@@ -56,7 +56,7 @@ def __init__(self, frame):
     def get_view(self):
         return self.view
 
-    def update_status(self, card, timestamp, currbid, tag=''):
+    def update_status(self, card, timestamp, currbid, tag='', highlight=True):
         if not card.cardid in self.cards:
             self.tree.insert("", 'end', card.cardid, text=card.cardname, values=(timestamp, card.startingBid,
                                                                                         currbid, card.buyNowPrice,
@@ -69,10 +69,16 @@ def update_status(self, card, timestamp, currbid, tag=''):
             if tag:
                 options['tags'] = (tag,)
             self.tree.item(card.cardid, text=options['text'], values=options['values'], tags=options['tags'])
-        self.tree.see(card.cardid)
-        self.tree.selection_set([card.cardid])
+
+        # Highlight the row and make sure it is visible
+        if highlight:
+            self.tree.see(card.cardid)
+            self.tree.selection_set([card.cardid])
+
+        # Update the cards dictionary with the new entry
         self.cards[card.cardid] = card
 
+
     def decreaseExpires(self):
         for cardid in self.cards:
             card = self.cards[cardid]