Fix SearchResult model.

2 files changed, 32 insertions, 7 deletions

diff --git a/pandora/models/pandora.py b/pandora/models/pandora.py
index a3a83b7..d42fe0d 100644
--- a/pandora/models/pandora.py
+++ b/pandora/models/pandora.py
@@ -1,3 +1,5 @@
+import re
+
 from .. import BaseAPIClient
 from . import with_metaclass, ModelMetaClass
 from . import Field, PandoraModel, PandoraListModel, PandoraDictListModel
@@ -292,7 +294,18 @@ class SearchResultItem(PandoraModel):
 
     @property
     def is_song(self):
-        return self.song_name is not None
+        # Song result tokens start with 'S', followed by seven digits.
+        return re.compile('^([S])(\d{7})$').match(self.token)
+
+    @property
+    def is_artist(self):
+        # Artist result tokens start with 'R', followed by six digits.
+        return re.compile('^([R])(\d{6})$').match(self.token)
+
+    @property
+    def is_composer(self):
+        # Composer result tokens start with 'C', followed by five digits.
+        return re.compile('^([C])(\d{5})$').match(self.token)
 
     def create_station(self):
         if self.is_song:
diff --git a/tests/test_pandora/test_models.py b/tests/test_pandora/test_models.py
index 1ab7cd5..7383d85 100644
--- a/tests/test_pandora/test_models.py
+++ b/tests/test_pandora/test_models.py
@@ -294,12 +294,24 @@ class TestSearchResultItem(TestCase):
                     "song_name='song_name_mock', token='S0000000')")
         self.assertEqual(expected, repr(self.result))
 
-    def test_is_song_true(self):
-        assert self.result.is_song is True
+    def test_is_song(self):
+        assert self.result.is_song
+
+        self.result.token = 'R123456'
+        assert not self.result.is_song
+
+    def test_is_artist(self):
+        assert not self.result.is_artist
+
+        self.result.token = 'R123456'
+        assert self.result.is_artist
+
+    def test_is_composer(self):
+        assert not self.result.is_composer
+
+        self.result.token = 'C12345'
+        assert self.result.is_composer
 
-    def test_is_song_false(self):
-        self.result.song_name = None
-        assert self.result.is_song is False
 
     def test_create_station_song(self):
         self.result._api_client.create_station = Mock()
@@ -308,7 +320,7 @@ class TestSearchResultItem(TestCase):
         self.result._api_client.create_station.assert_called_with(track_token=self.result.token)
 
     def test_create_station_artist(self):
-        self.result.song_name = None
+        self.result.token = 'R123456'
         self.result._api_client.create_station = Mock()
 
         self.result.create_station()