v3.0

lyricsgenius/api/api.py

@@ -526,11 +526,17 @@ def __init__(
         retries=0,
         **kwargs
     ):
+
+        # If PublicAPI was instantiated directly
+        # there is no need for a token anymore
+        public_api_constructor = False if 'Genius' in str(self) else True
+
         # Genius PublicAPI Constructor
         super().__init__(
             response_format=response_format,
             timeout=timeout,
             sleep_time=sleep_time,
             retries=retries,
+            public_api_constructor=public_api_constructor,
             **kwargs
         )

lyricsgenius/api/base.py

@@ -19,7 +19,8 @@ def __init__(
         response_format='plain',
         timeout=5,
         sleep_time=0.2,
-        retries=0
+        retries=0,
+        public_api_constructor=False,
     ):
         self._session = requests.Session()
         self._session.headers = {
@@ -29,11 +30,14 @@ def __init__(
         if access_token is None:
             access_token = os.environ.get('GENIUS_ACCESS_TOKEN')
 
-        if not access_token or not isinstance(access_token, str):
-            raise TypeError('Invalid token')
+        if public_api_constructor:
+            self.authorization_header = {}
+        else:
+            if not access_token or not isinstance(access_token, str):
+                raise TypeError('Invalid token')
+            self.access_token = 'Bearer ' + access_token
+            self.authorization_header = {'authorization': self.access_token}
 
-        self.access_token = 'Bearer ' + access_token
-        self.authorization_header = {'authorization': self.access_token}
         self.response_format = response_format.lower()
         self.timeout = timeout
         self.sleep_time = sleep_time

lyricsgenius/api/public_methods/misc.py

@@ -96,7 +96,7 @@ def page_data(self, album=None, song=None, artist=None):
             page_type = 'songs'
 
             # item path becomes something like: Artist/Song
-            item_path = song.replace(artist, artist + '/').replace('-lyrics', '')
+            item_path = song[1:].replace(artist + '-', artist + '/').replace('-lyrics', '')
 
         page_path = '/{page_type}/{item_path}'.format(page_type=page_type,
                                                       item_path=item_path)