do not clean tradepile unless we have completed trades

hunterjm · hunterjm · commit c8b4d0366c94 · 2015-11-23T01:49:07.000-05:00
diff --git a/core/bid.py b/core/bid.py
@@ -228,17 +228,17 @@ def bid(q, api, playerList, settings, trades={}):
                 if tradeId > 0:
                     del trades[tradeId]
 
-            try:
-                # Clean up Trade Pile & relist items
-                sold = api.relist(clean=True)
-                if sold:
-                    q.put('%s    Trade Status: %d items sold\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), sold))
-                    pileFull = False
-            except InternalServerError:
-                # auto re-list is down.  We have to do this manually...
-                sold = 0
-                completedTrades = sum([i['tradeState'] in ('expired', 'closed') for i in tradepile])
-                if completedTrades > 0:
+            completedTrades = sum([i['tradeState'] in ('expired', 'closed') for i in tradepile])
+            sold = 0
+            if completedTrades > 0:
+                try:
+                    # Clean up Trade Pile & relist items
+                    sold = api.relist(clean=True)
+                    if sold:
+                        q.put('%s    Trade Status: %d items sold\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), sold))
+                        pileFull = False
+                except InternalServerError:
+                    # auto re-list is down.  We have to do this manually...
                     q.put('%s    Manually re-listing %d players.\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), completedTrades))
                     for i in tradepile:
                         baseId = str(api.baseId(i['resourceId']))
@@ -255,13 +255,12 @@ def bid(q, api, playerList, settings, trades={}):
                             if i['tradeState'] == 'expired' and sell and binPrice:
                                 api.sell(i['id'], sell, binPrice)
 
-                pass
+                    pass
 
             if pileFull:
 
                 # No use in trying more until min trade is done
-                selling = api.tradepile()
-                selling = sorted(selling, key=itemgetter('expires'), reverse=True)
+                selling = sorted(tradepile, key=itemgetter('expires'), reverse=True)
 
                 q.put('%s    Trade Pile Full! Resume bidding in %d seconds\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), selling[0]['expires']))
                 time.sleep(selling[0]['expires'])
