Make rate-limiting a switch that can be toggled, closes #80

pylast.py

@@ -169,6 +169,7 @@ class _Network(object):
         self.proxy_enabled = False
         self.proxy = None
         self.last_call_time = 0
+        self.limit_rate = False
 
         #generate a session_key if necessary
         if (self.api_key and self.api_secret) and not self.session_key and (self.username and self.password_hash):
@@ -288,21 +289,21 @@ class _Network(object):
 
     def _get_ws_auth(self):
         """
-            Returns a (API_KEY, API_SECRET, SESSION_KEY) tuple.
+            Returns an (API_KEY, API_SECRET, SESSION_KEY) tuple.
         """
         return (self.api_key, self.api_secret, self.session_key)
 
     def _delay_call(self):
         """
-            Makes sure that web service calls are at least a second apart
+            Makes sure that web service calls are at least 0.2 seconds apart.
         """
 
-        # delay time in seconds
+        # Delay time in seconds from section 4.4 of http://www.last.fm/api/tos
-        DELAY_TIME = 1.0
+        DELAY_TIME = 0.2
         now = time.time()
 
         if (now - self.last_call_time) < DELAY_TIME:
-            time.sleep(1)
+            time.sleep(now - self.last_call_time - DELAY_TIME)
 
         self.last_call_time = now
 
@@ -392,6 +393,18 @@ class _Network(object):
 
         return self.proxy
 
+    def enable_rate_limit(self):
+        """Enables rate limiting for this network"""
+        self.limit_rate = True
+
+    def disable_rate_limit(self):
+        """Disables rate limiting for this network"""
+        self.limit_rate = False
+
+    def is_rate_limited(self):
+        """Return True if web service calls are rate limited"""
+        return self.limit_rate
+
     def enable_caching(self, file_path = None):
         """Enables caching request-wide for all cachable calls.
         In choosing the backend used for caching, it will try _SqliteCacheBackend first if
@@ -820,8 +833,8 @@ class _Request(object):
     def _download_response(self):
         """Returns a response body string from the server."""
 
-        # Delay the call if necessary
+        if self.network.limit_rate:
-        #self.network._delay_call()    # enable it if you want.
+            self.network._delay_call()
 
         data = []
         for name in self.params.keys():

test_pylast.py

@@ -535,6 +535,29 @@ class TestPyLast(unittest.TestCase):
         self.assertTrue(hasattr(track, 'album'))
 
 
+    def test_enable_rate_limiting(self):
+        # Arrange
+        self.assertFalse(self.network.is_rate_limited())
+
+        # Act
+        self.network.enable_rate_limit()
+
+        # Assert
+        self.assertTrue(self.network.is_rate_limited())
+
+
+    def test_disable_rate_limiting(self):
+        # Arrange
+        self.network.enable_rate_limit()
+        self.assertTrue(self.network.is_rate_limited())
+
+        # Act
+        self.network.disable_rate_limit()
+
+        # Assert
+        self.assertFalse(self.network.is_rate_limited())
+
+
 if __name__ == '__main__':
 
     # For quick testing of a single case (eg. test = "test_scrobble")