Fix SearchResult model.

1 files changed, 14 insertions, 1 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: