mirror of
				https://github.com/THIS-IS-NOT-A-BACKUP/zspotify.git
				synced 2025-11-04 05:20:34 +00:00 
			
		
		
		
	Merge remote-tracking branch 'upstream/main'
This commit is contained in:
		
						commit
						a25dbfe4e4
					
				@ -9,7 +9,7 @@ from playlist import get_playlist_songs, get_playlist_info, download_from_user_p
 | 
				
			|||||||
from podcast import download_episode, get_show_episodes
 | 
					from podcast import download_episode, get_show_episodes
 | 
				
			||||||
from termoutput import Printer, PrintChannel
 | 
					from termoutput import Printer, PrintChannel
 | 
				
			||||||
from track import download_track, get_saved_tracks
 | 
					from track import download_track, get_saved_tracks
 | 
				
			||||||
from utils import fix_filename, splash, split_input, regex_input_for_urls
 | 
					from utils import splash, split_input, regex_input_for_urls
 | 
				
			||||||
from zspotify import ZSpotify
 | 
					from zspotify import ZSpotify
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SEARCH_URL = 'https://api.spotify.com/v1/search'
 | 
					SEARCH_URL = 'https://api.spotify.com/v1/search'
 | 
				
			||||||
@ -256,7 +256,7 @@ def search(search_term):
 | 
				
			|||||||
        print('NO RESULTS FOUND - EXITING...')
 | 
					        print('NO RESULTS FOUND - EXITING...')
 | 
				
			||||||
    else:
 | 
					    else:
 | 
				
			||||||
        selection = ''
 | 
					        selection = ''
 | 
				
			||||||
        print('\n> SELECT A DOWNLOAD OPTION BY ID')
 | 
					        print('> SELECT A DOWNLOAD OPTION BY ID')
 | 
				
			||||||
        print('> SELECT A RANGE BY ADDING A DASH BETWEEN BOTH ID\'s')
 | 
					        print('> SELECT A RANGE BY ADDING A DASH BETWEEN BOTH ID\'s')
 | 
				
			||||||
        print('> OR PARTICULAR OPTIONS BY ADDING A COMMA BETWEEN ID\'s\n')
 | 
					        print('> OR PARTICULAR OPTIONS BY ADDING A COMMA BETWEEN ID\'s\n')
 | 
				
			||||||
        while len(selection) == 0:
 | 
					        while len(selection) == 0:
 | 
				
			||||||
 | 
				
			|||||||
@ -1,8 +1,6 @@
 | 
				
			|||||||
import json
 | 
					import json
 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
import sys
 | 
					 | 
				
			||||||
from typing import Any
 | 
					from typing import Any
 | 
				
			||||||
from enum import Enum
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
CONFIG_FILE_PATH = '../zs_config.json'
 | 
					CONFIG_FILE_PATH = '../zs_config.json'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
from const import ITEMS, ID, TRACK, NAME
 | 
					from const import ITEMS, ID, TRACK, NAME
 | 
				
			||||||
from termoutput import Printer
 | 
					from termoutput import Printer
 | 
				
			||||||
from track import download_track
 | 
					from track import download_track
 | 
				
			||||||
from utils import fix_filename, split_input
 | 
					from utils import split_input
 | 
				
			||||||
from zspotify import ZSpotify
 | 
					from zspotify import ZSpotify
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MY_PLAYLISTS_URL = 'https://api.spotify.com/v1/me/playlists'
 | 
					MY_PLAYLISTS_URL = 'https://api.spotify.com/v1/me/playlists'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,6 @@
 | 
				
			|||||||
import os
 | 
					import os
 | 
				
			||||||
from typing import Optional, Tuple
 | 
					from typing import Optional, Tuple
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from librespot.audio.decoders import VorbisOnlyAudioQuality
 | 
					 | 
				
			||||||
from librespot.metadata import EpisodeId
 | 
					from librespot.metadata import EpisodeId
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from const import (ERROR, ID, ITEMS, NAME, SHOW)
 | 
					from const import (ERROR, ID, ITEMS, NAME, SHOW)
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,3 @@
 | 
				
			|||||||
import math
 | 
					 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
import re
 | 
					import re
 | 
				
			||||||
import time
 | 
					import time
 | 
				
			||||||
 | 
				
			|||||||
@ -4,7 +4,6 @@ import os
 | 
				
			|||||||
import platform
 | 
					import platform
 | 
				
			||||||
import re
 | 
					import re
 | 
				
			||||||
import subprocess
 | 
					import subprocess
 | 
				
			||||||
import time
 | 
					 | 
				
			||||||
from enum import Enum
 | 
					from enum import Enum
 | 
				
			||||||
from typing import List, Tuple
 | 
					from typing import List, Tuple
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -6,18 +6,16 @@ It's like youtube-dl, but for Spotify.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
(Made by Deathmonger/Footsiefat - @doomslayer117:matrix.org)
 | 
					(Made by Deathmonger/Footsiefat - @doomslayer117:matrix.org)
 | 
				
			||||||
"""
 | 
					"""
 | 
				
			||||||
import json
 | 
					 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
import os.path
 | 
					import os.path
 | 
				
			||||||
from getpass import getpass
 | 
					from getpass import getpass
 | 
				
			||||||
from typing import Any
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
import requests
 | 
					import requests
 | 
				
			||||||
from librespot.audio.decoders import VorbisOnlyAudioQuality
 | 
					from librespot.audio.decoders import VorbisOnlyAudioQuality
 | 
				
			||||||
from librespot.core import Session
 | 
					from librespot.core import Session
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from const import TYPE, \
 | 
					from const import TYPE, \
 | 
				
			||||||
    PREMIUM, USER_READ_EMAIL, AUTHORIZATION, OFFSET, LIMIT, \
 | 
					    PREMIUM, USER_READ_EMAIL, OFFSET, LIMIT, \
 | 
				
			||||||
    PLAYLIST_READ_PRIVATE, USER_LIBRARY_READ
 | 
					    PLAYLIST_READ_PRIVATE, USER_LIBRARY_READ
 | 
				
			||||||
from config import Config
 | 
					from config import Config
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user