Merge branch 'main' into liked_songs

Author: couldbejake

README.md

@@ -1,8 +1,6 @@
 <div align="center">
 
-  <img src="assets/logo.png" alt="logo" width="200" height="auto" />
-  <h1>spotify2mp3</h1>
-  
+  <img src="assets/logo.png" alt="logo" width="250" height="auto" />  
   <p>
     Simple, free, and unlimited Spotify MP3 downloads
   </p>

apis/youtube.py

@@ -51,21 +51,26 @@ def search(self, search_query, max_length, min_view_count, search_count = 1):
 
     def download(self, url, audio_bitrate):
         youtube_video = pytubeYouTube(url)
+
         if youtube_video.age_restricted:
             youtube_video.bypass_age_gate()
-        youtube_video_streams = youtube_video.streams.filter(only_audio=True, file_extension='mp4')
+        youtube_video_streams = youtube_video.streams.filter(only_audio=True)
 
         correctIndex = 0
 
         selected_bitrate_normalised = audio_bitrate / 1000
 
+        #select the best audio quality
+        finalKbps = 0
+        correctIndex = 0
         for i,vid in enumerate(youtube_video_streams):
             currKbps = int(re.sub("[^0-9]", "", vid.abr))
-            if currKbps < selected_bitrate_normalised:
+            if currKbps <= selected_bitrate_normalised:
                 correctIndex = i
+                finalKbps = currKbps
 
         video_stream = youtube_video_streams[correctIndex]
 
         yt_tmp_out = video_stream.download(output_path="./temp/")
 
-        return yt_tmp_out
+        return yt_tmp_out, finalKbps

assets/logo.png

@@ -1,6 +1,7 @@
 from enum import Enum
 import sys
 import string
+import os
 
 def supports_24bit_color():
     """Determine if the terminal supports 24-bit color."""

const.py

@@ -26,6 +26,8 @@ def __init__(self, spotify: Spotify, youtube: YouTube, audio_quality=1000000, ma
         self.min_view_count = min_view_count
 
     def download_album(self, playlist_url):
+        
+        skipped_songs = 0
 
         print(f"\n{colours.OKBLUE}[!] Retrieving spotify album")
 
@@ -38,6 +40,7 @@ def download_album(self, playlist_url):
             tracks = album.get_tracks()
 
             print(f"\n{colours.OKBLUE}[!] Found {len(tracks)} tracks in album.")
+            
             time.sleep(3)
 
             output_path = "downloads/albums/" + album.get_title(True) + "/"
@@ -46,6 +49,7 @@ def download_album(self, playlist_url):
             return True
 
         except SpotifyAlbumNotFound as e:
+            
             print(f"\n{colours.FAIL}Error: {colours.ENDC}{colours.WARNING}It's probably that this album does not exist {colours.ENDC} (e: {e}).{colours.ENDC}\n")
             sys.exit(1)
 
@@ -120,13 +124,13 @@ def download_tracks(self, output_path, tracks):
 
             except ConfigVideoMaxLength as e:
 
-                print(f"   - {colours.WARNING}[!] Skipped a song - {e}, {colours.ENDC}(use the command line to increase this).{colours.ENDC}\n")
+                print(f"\n{colours.WARNING}[!] Skipped a song - The found song was longer than the configured max song length, {colours.ENDC}(use the cli to increase this).{colours.ENDC}\n")
 
                 skipped_tracks.append((track, e))
 
             except ConfigVideoLowViewCount as e:
 
-                print(f"   - {colours.WARNING}[!] Skipped a song - {e}, {colours.ENDC}(use the command line to increase this).\n")
+                print(f"\n{colours.WARNING}[!] Skipped a song - The found song had less views than the minimum view count, {colours.ENDC}(use the cli to increase this).\n")
 
                 skipped_tracks.append((track, e))
 
@@ -182,13 +186,13 @@ def download_track(self, track_url = None, track = None, idx = 0, idx_max = 0, o
 
             print(f"{colours.ENDC}   - Downloading, please wait{colours.ENDC}")
 
-            video_downloaded_path = self.youtube_client.download(youtube_link, self.audio_quality)
+            video_downloaded_path, self.audio_quality = self.youtube_client.download(youtube_link, self.audio_quality)
 
             # consider updating searchable name to something nicer for the end user
 
             print(f"{colours.ENDC}   - Converting the song and adding metadata{colours.ENDC}")
 
-            resave_audio_clip_with_metadata(video_downloaded_path, track.get_metadata(), track_path)
+            resave_audio_clip_with_metadata(video_downloaded_path, track.get_metadata(), output_path + track.get_title(True) + ".mp3", self.audio_quality)
 
             print(f"{colours.ENDC}   - Done!")
 
@@ -204,14 +208,14 @@ def download_track(self, track_url = None, track = None, idx = 0, idx_max = 0, o
 
         except ConfigVideoMaxLength as e:
             if(not as_sub_function):
-                print(f"\n{colours.FAIL}Error: {colours.ENDC}The found song was longer than the configured max song length (use the command line to increase this) {colours.ENDC} (e: {e}).{colours.ENDC}\n")
+                print(f"\n{colours.FAIL}Error: {colours.ENDC}The found song was longer than the configured max song length (use the cli to increase this) {colours.ENDC} (e: {e}).{colours.ENDC}\n")
                 return False
             else:
                 raise e
 
         except ConfigVideoLowViewCount as e:
             if(not as_sub_function):
-                print(f"\n{colours.FAIL}Error: {colours.ENDC}The found song had less views than the minimum view count (use the command line to increase this){colours.ENDC} (e: {e}).{colours.ENDC}\n")
+                print(f"\n{colours.FAIL}Error: {colours.ENDC}The found song had less views than the minimum view count (use the cli to increase this){colours.ENDC} (e: {e}).{colours.ENDC}\n")
                 return False
             else:
                 raise e

downloader.py

@@ -16,7 +16,7 @@ packaging==21.3
 Pillow==9.1.1
 proglog==0.1.10
 pyparsing==3.0.9
-pytube
+pytube==15.0.0
 requests==2.27.1
 soupsieve==2.3.2.post1
 toml==0.10.2

requirements.txt

@@ -22,7 +22,7 @@ def get_bitrate_from_quality(quality):
     elif quality == "medium":
         return 80000
     elif quality == "high":
-        return 160000
+        return 256000
     else:
         return int(quality)
 
@@ -32,7 +32,7 @@ def validate_quality(quality):
         return quality
     try:
         bitrate = int(quality)
-        if 64 <= bitrate <= 320000:  # Typical YouTube bitrate ranges
+        if 48000 <= bitrate <= 256000:  # Typical YouTube bitrate ranges
             return quality
         else:
             raise argparse.ArgumentTypeError(f"Bitrate outside of typical YouTube range (64 kbps to 320 kbps): {quality}")

spotify2mp3.py

@@ -35,12 +35,12 @@ def random_string(length=10):
     letters = string.ascii_letters  # This includes both lowercase and uppercase letters.
     return ''.join(random.choice(letters) for i in range(length))
 
-def resave_audio_clip_with_metadata(audio_input_path, song_metadata, song_output_path):
+def resave_audio_clip_with_metadata(audio_input_path, song_metadata, song_output_path, audio_quality):
 
     temporary_audio_path = "./temp/" + random_string(20) + ".mp3"
 
     clip = AudioFileClip(audio_input_path)
-    clip.write_audiofile(temporary_audio_path, logger=None)
+    clip.write_audiofile(temporary_audio_path, logger=None, bitrate=f'{audio_quality}k')
 
     audiofile = eyed3.load(temporary_audio_path)