cache cardInfo calls so we don't flood the server

Author: hunterjm

api/delayedcore.py

@@ -9,8 +9,9 @@
 class DelayedCore(fut.Core):
     def __init__(self, email, passwd, secret_answer, platform='pc', code=None, emulate=None, debug=False, cookies=cookies_file):
         # Set initial delay
-        self.delayInterval = 2
+        self.delayInterval = 4
         self.delay = time()
+        self.cardInfoCache = {}
         super(DelayedCore, self).__init__(email, passwd, secret_answer, platform, code, emulate, debug, cookies)
 
     def setRequestDelay(self, delay):
@@ -41,15 +42,28 @@ def __request__(self, method, url, *args, **kwargs):
         return super(DelayedCore, self).__request__(method, url, *args, **kwargs)
 
     def bid(self, trade_id, bid):
-        # no delay between getting trade info and bidding
+        # no delay between getting trade info and bidding, but still want a delay before both
+        if self.delay > time():
+            sleep(self.delay - time())
         delayInterval = self.delayInterval
         self.delayInterval = 0
         try:
             result = super(DelayedCore, self).bid(trade_id, bid)
         except fut.exceptions.PermissionDenied as e:
             if e.code == '461':
                 result = False
-            raise
-        self.delayInterval = delayInterval
-        self.delay = time() + (self.delayInterval * random.uniform(0.75, 1.25))
+            else:
+                raise
+        finally:
+            self.delayInterval = delayInterval
+            self.delay = time() + (self.delayInterval * random.uniform(0.75, 1.25))
+        return result
+
+    def cardInfo(self, resource_id):
+        """Returns card info."""
+        if resource_id in self.cardInfoCache:
+            result = self.cardInfoCache[resource_id]
+        else:
+            result = super(DelayedCore, self).cardInfo(resource_id)
+            self.cardInfoCache[resource_id] = result
         return result