added playlists support and fixed bugs

GUI/backend.py

@@ -52,9 +52,6 @@ def artist(uri):
 
     lf_artist_info = lastfm.getArtistsInfo(sp_artist_info['name'])
 
-    print(len(sp_artist_alb))
-    print(len(sp_artist_alb_full))
-
     #creating tags
     name = str(sp_artist_info['name']).replace(' ','')
 
@@ -176,7 +173,6 @@ def search(q):
 
     query = ' '.join(str(q).split('+'))
 
-    print(query)
 
     results = user.search(query)
 
@@ -222,7 +218,6 @@ def song(uri):
 def album(uri):
 
     sp_album_data = user.getAlbumInfo(uri)[0]
-    print(sp_album_data['art_id'])
     sp_artist_alb = user.getArtistsAlbums(sp_album_data['art_id'])
     sp_artist_r_a = user.getArtistsRelatedArtists(sp_album_data['art_id'])
 
@@ -295,6 +290,21 @@ def downloadAlbum(uri):
             }
         )
 
+@app.route("/downloadPlaylist/<uri>", methods=['GET','POST'])
+def downloadPlaylist(uri):
+
+    if request.method == 'POST':
+
+        music = expanduser("~") + '/Music'
+
+        subprocess.Popen(["python3", f"{os.getcwd()}/main.py", '-sp', f'https://open.spotify.com/playlist/{uri}', '-p', music])
+
+        return json.dumps(
+            {
+                'status': True
+            }
+        )
+
 @app.route('/login', methods=['GET','POST'])
 def login():
 

GUI/spotify.py

@@ -1187,8 +1187,5 @@ def getAlbum(self, uri):
         except: return None
 
 if __name__ == '__main__':
-    u = Spotify.User()
-    s = Spotify()
-
-    res = u.search('Love')
-    print(res)
+
+    u = Spotify.User()

GUI/templates/home.html

@@ -227,7 +227,7 @@ <h2>Songs</h2>
 
 
 <div class='conc-main-slider lazy' style='width:80%; margin-left: 18%;' >
-  <a class='no-link' href='jsdfhsa.html'>
+  <a class='no-link' href='{{ url_for('new_releases')}}'>
     <div class="line cursor-pointer-all-obj">
 
       <div class="image-shadow-line" style="background: rgb(251,111,74);
@@ -306,4 +306,4 @@ <h2><p class="item-text-20">@SpotifyMusicDownloaderBot</p></h2>
    </div>
 
 
-{% endblock %}
+{% endblock %}

GUI/templates/login.html

@@ -11,8 +11,7 @@
     width:100%;
 }
 body{
-    background: rgb(38,38,38);
-background: linear-gradient(180deg, rgba(38,38,38,1) 0%, rgba(21,21,21,1) 37%, rgba(0,0,0,1) 92%);
+    background:rgb(28,28,30);
 }
 .container-fluid{
     height: 100%;
@@ -74,42 +73,11 @@ <h1 class='logo-text'>SMD</h1>
         <h6 class='desc'>Linux v1.6.8-dev</h6>
         </div>
         <div class="text-center">
-            <h5>Loading</h5>
+
             <div class="lds-ripple"><div></div><div></div></div>
         </div>
     </div>
-
-
-<script>
-  $(document).ready(function(){
-    $.post(
-          'http://0.0.0.0:8050/shutdown',
-          function(data) {
-
-        })
-  };
-
-    $('#search').keypress(function(e) {
-
-      if(e.which == 10 || e.which == 13) {
-
-        window.location.replace("http://0.0.0.0:8050/search/"+$('#search').val().replace(/ /g,'+'));
-
-      }
-
-  });
-    $(function() {
-      $(".download-link").on("click",function(e) {
-        e.preventDefault(); // cancel the link itself
-
-        $.post(
-          this.href,
-          function(data) {
-
-        });
-      });
-    });
-
+
 </script>
 </body>
 </html>

GUI/templates/playlist.html

@@ -22,7 +22,7 @@
         <span class="badge badge-success download-button-song">
               <i class="fab fa-spotify"></i> Listen on Spotify
         </span>
-        <a class='no-link download-link' href="{{ url_for('downloadAlbum', uri=info.alb_id)}}">
+        <a class='no-link download-link' href="{{ url_for('downloadPlaylist', uri=info.id)}}">
         <span class="badge badge-primary download-button-song">
           <i class="fas fa-arrow-alt-circle-down"></i> Download
         </span>

GUI/templates/playlists.html

@@ -25,7 +25,7 @@
                         <i class="fab fa-spotify"></i> Listen on Spotify
                       </span>
                     </a>
-                    <a class='no-link' href='https://open.spotify.com/'>
+                    <a class='no-link  download-link' href="{{ url_for('downloadPlaylist', uri=album.id) }}">
                       <span class="btn btn-outline-primary download-button" style='padding: 2px 2px 2px 2px;border: 0px solid #fff;'>
                         <i class="fas fa-arrow-alt-circle-down"></i> Download full playlist
                       </span>

main.py

@@ -72,6 +72,7 @@ def downloadBySpotifyUri(self, uri, path):
             notify.send(f'{info["artist"][0]} - {info["name"]}', downloaded=False)
 
             info['uri'] = str(info['uri']).split('/')[-1]
+            info['uri'] = str(info['uri']).split('?')[0]
 
             fixed_name = f'{info["artist"][0]} - {info["name"]}'
             fixed_name = fixed_name.replace('.','')
@@ -205,6 +206,9 @@ def downloadBySpotifyUriPlaylistMode(self, playlist_uri, path):
         for info, i in zip(playlist,range(len(playlist))):
 
             print(f'Downloading {i+1} of {len(playlist)}')
+
+            info['uri'] = str(info['uri']).split('/')[-1]
+            info['uri'] = str(info['uri']).split('?')[0]
 
             notify.send(f'{info["artist"][0]} - {info["name"]}', downloaded=False)
 
@@ -255,6 +259,7 @@ def downloadBySpotifyUriAlbumMode(self, album_uri, path):
         for info, i in zip(playlist['tracks'],range(len(playlist['tracks']))):
 
             info['uri'] = str(info['uri']).split('/')[-1]
+            info['uri'] = str(info['uri']).split('?')[0]
 
             notify.send(f'{info["artist"][0]} - {info["name"]}', downloaded=False)
 
@@ -534,7 +539,7 @@ def help():
         CLI.logo()
 
         print('\t\t       Spotify Music Downloader')
-        print('\t\t          version  1.6.0-dev\n')
+        print('\t\t          version  1.6.8-dev\n')
 
         print(' ./main.py [argument][value] - startup with arguments\n')
 

run.sh

@@ -1,2 +1,3 @@
-#!/usr/bin/bash
-python3 GUI/qtw.py & python3 GUI/backend.py
+#!/bin/bash
+python3 GUI/spotify.py 2>/dev/null
+python3 GUI/qtw.py 2>/dev/null & python3 GUI/backend.py 2>/dev/null