Merge pull request #162 from sindrig/fix-web-api-login

Fix web api login for users that have not authenticated.

Author: sindrig

spoppy/__init__.py

@@ -10,7 +10,7 @@
 
 
 def get_version():
-    return '2.1.2'
+    return '2.1.3'
 
 
 if click:

spoppy/loaders/loader.py

@@ -1,6 +1,7 @@
 import logging
 import threading
 
+from appdirs import user_cache_dir
 from .search import Search
 
 logger = logging.getLogger(__name__)
@@ -28,10 +29,10 @@ def __getitem__(self, key):
     'probably due to your access token being expired. I\'ve attempted to '
     'automatically refresh you access, so you can retry this operation. '
     'If that didn\'t work, try restarting spoppy, and if that doesn\'t work '
-    'try removing the file ~/.cache/spoppy/spotipy_token.cache, restart '
+    'try removing the file %s/spotipy_token.cache, restart '
     'spoppy and log in to spotify web API again. For more information on this '
     'issue, see https://github.com/sindrig/spoppy/issues/127'
-)
+) % (user_cache_dir(appname='spoppy'), )
 
 
 class Loader(Search):

spoppy/menus.py

@@ -270,14 +270,6 @@ class MainMenu(Menu):
 
     def get_options(self):
         res = {
-            'vp': MenuValue(
-                'View playlists',
-                MyPlaylists(self.navigator)
-            ),
-            'fp': MenuValue(
-                'Featured playlists',
-                FeaturedPlaylists(self.navigator)
-            ),
             'st': MenuValue(
                 'Search for tracks',
                 TrackSearch(self.navigator)
@@ -295,11 +287,20 @@ def get_options(self):
                 ArtistSearch(self.navigator)
             ),
         }
-        if not self.navigator.spotipy_client:
+        if not self.navigator.spotipy_client.is_authenticated():
             res['li'] = MenuValue(
                 'Log in to spotify web api',
                 LogIntoSpotipy(self.navigator)
             )
+        else:
+            res['vp'] = MenuValue(
+                'View playlists',
+                MyPlaylists(self.navigator)
+            )
+            res['fp'] = MenuValue(
+                'Featured playlists',
+                FeaturedPlaylists(self.navigator)
+            )
         return res
 
 
@@ -1089,7 +1090,7 @@ def get_ui(self):
         else:
             res = [
                 (
-                    'Opening an authorization page in your browser, please'
+                    'Opening an authorization page in your browser, please '
                     'follow the instructions there to finalize the '
                     'authorization process'
                 )

spoppy/navigation.py

@@ -40,7 +40,10 @@ def __init__(self, username, password):
         logger.debug('Leifur initialized')
 
     def refresh_spotipy_client(self):
-        self.spotipy_client = self.lifecycle.refresh_and_get_spotipy_client()
+        self.spotipy_client = SpotipyWrapper(
+            self,
+            self.lifecycle.refresh_and_get_spotipy_client()
+        )
 
     def refresh_spotipy_client_and_token(self):
         self.lifecycle.check_spotipy_logged_in()

spoppy/radio.py

@@ -2,6 +2,7 @@
 import random
 import threading
 
+from appdirs import user_cache_dir
 from spotify.track import Track
 
 from .loaders.search import Search
@@ -31,10 +32,10 @@ def __getitem__(self, key):
     'probably due to your access token being expired. I\'ve attempted to '
     'automatically refresh you access, so you can retry this operation. '
     'If that didn\'t work, try restarting spoppy, and if that doesn\'t work '
-    'try removing the file ~/.cache/spoppy/spotipy_token.cache, restart '
+    'try removing the file %s/spotipy_token.cache, restart '
     'spoppy and log in to spotify web API again. For more information on this '
     'issue, see https://github.com/sindrig/spoppy/issues/127'
-)
+) % (user_cache_dir(appname='spoppy'), )
 
 
 class Recommendations(Search):

spoppy/spotipy_wrapper.py

@@ -8,6 +8,9 @@ def __init__(self, navigator, client):
         self.client = client
         self.navigator = navigator
 
+    def is_authenticated(self):
+        return bool(self.client._auth)
+
     def __getattr__(self, func_name):
         def wrapped(*args, **kwargs):
             try: