Handle IOErrors and ValueErrors when attempting to register ads.

2 files changed, 33 insertions, 5 deletions

diff --git a/pandora/models/pandora.py b/pandora/models/pandora.py
index 40b368a..6abd3a7 100644
--- a/pandora/models/pandora.py
+++ b/pandora/models/pandora.py
@@ -130,6 +130,8 @@ class PlaylistModel(PandoraModel):
         return cls.get_audio_field(data, "bitrate", preferred_quality)
 
     def get_is_playable(self):
+        if not self.audio_url:
+            return False
         return self._api_client.transport.test_url(self.audio_url)
 
     def prepare_playback(self):
@@ -223,11 +225,26 @@ class AdItem(PlaylistModel):
     def is_ad(self):
         return True
 
-    def register_ad(self, station_id):
-        self._api_client.register_ad(station_id, self.tracking_tokens)
+    def register_ad(self, station_id=None):
+        if not station_id:
+            station_id = self.station_id
+        if self.tracking_tokens:
+            self._api_client.register_ad(station_id, self.tracking_tokens)
+        else:
+            raise ValueError('No ad tracking tokens available for '
+                             'registration.')
 
     def prepare_playback(self):
-        self.register_ad(self.station_id)
+        try:
+            self.register_ad(self.station_id)
+        except ValueError as e:
+            if not self.tracking_tokens:
+                # Ignore registration attempts if no ad tracking tokens are
+                # available
+                pass
+            else:
+                # Unexpected error, re-raise.
+                raise e
         return super(AdItem, self).prepare_playback()
 
 
diff --git a/pandora/transport.py b/pandora/transport.py
index 1a2ee69..62f426a 100644
--- a/pandora/transport.py
+++ b/pandora/transport.py
@@ -9,6 +9,7 @@ exception.
 
 API consumers should use one of the API clients in the pandora.client package.
 """
+import logging
 import random
 import time
 import json
@@ -22,8 +23,10 @@ from .errors import PandoraException
 
 DEFAULT_API_HOST = "tuner.pandora.com/services/json/"
 
+logger = logging.getLogger(__name__)
 
-def retries(max_tries, exceptions=(Exception,)):
+
+def retries(max_tries, exceptions=(IOError,)):
     """Function decorator implementing retrying logic.
 
     exceptions: A tuple of exception classes; default (Exception,)
@@ -46,7 +49,11 @@ def retries(max_tries, exceptions=(Exception,)):
                     retries_left -= 1
                     return func(*args, **kwargs)
 
-                except exceptions:
+                except exceptions as e:
+                    # Don't retry for PandoraExceptions - unlikely that result
+                    # will change for same set of input parameters.
+                    if isinstance(e, PandoraException):
+                        continue
                     if retries_left > 0:
                         time.sleep(delay_exponential(
                             0.5, 2, max_tries - retries_left))
@@ -227,9 +234,13 @@ class APITransport(object):
         self._start_request(method)
 
         url = self._build_url(method)
+        log_data = data
         data = self._build_data(method, data)
         params = self._build_params(method)
+        logger.info('TRANSPORT: \nMETHOD: {}\nPARAMS: {}\nDATA: {}\nURL: {}'
+                    .format(method, params, log_data, url))
         result = self._make_http_request(url, data, params)
+        logger.info('TRANSPORT: \nRESULT: {}\n'.format(result))
 
         return self._parse_response(result)