Merge remote-tracking branch 'upstream/main'

zspotify/app.py

@@ -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 termoutput import Printer, PrintChannel
 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
 
 SEARCH_URL = 'https://api.spotify.com/v1/search'
@@ -256,7 +256,7 @@ def search(search_term):
         print('NO RESULTS FOUND - EXITING...')
     else:
         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('> OR PARTICULAR OPTIONS BY ADDING A COMMA BETWEEN ID\'s\n')
         while len(selection) == 0:

zspotify/config.py

@@ -1,8 +1,6 @@
 import json
 import os
-import sys
 from typing import Any
-from enum import Enum
 
 CONFIG_FILE_PATH = '../zs_config.json'
 

zspotify/playlist.py

@@ -1,7 +1,7 @@
 from const import ITEMS, ID, TRACK, NAME
 from termoutput import Printer
 from track import download_track
-from utils import fix_filename, split_input
+from utils import split_input
 from zspotify import ZSpotify
 
 MY_PLAYLISTS_URL = 'https://api.spotify.com/v1/me/playlists'

zspotify/podcast.py

@@ -1,7 +1,6 @@
 import os
 from typing import Optional, Tuple
 
-from librespot.audio.decoders import VorbisOnlyAudioQuality
 from librespot.metadata import EpisodeId
 
 from const import (ERROR, ID, ITEMS, NAME, SHOW)

zspotify/track.py

@@ -1,4 +1,3 @@
-import math
 import os
 import re
 import time

zspotify/utils.py

@@ -4,7 +4,6 @@ import os
 import platform
 import re
 import subprocess
-import time
 from enum import Enum
 from typing import List, Tuple
 

zspotify/zspotify.py

@@ -6,18 +6,16 @@ It's like youtube-dl, but for Spotify.
 
 (Made by Deathmonger/Footsiefat - @doomslayer117:matrix.org)
 """
-import json
 import os
 import os.path
 from getpass import getpass
-from typing import Any
 
 import requests
 from librespot.audio.decoders import VorbisOnlyAudioQuality
 from librespot.core import Session
 
 from const import TYPE, \
-    PREMIUM, USER_READ_EMAIL, AUTHORIZATION, OFFSET, LIMIT, \
+    PREMIUM, USER_READ_EMAIL, OFFSET, LIMIT, \
     PLAYLIST_READ_PRIVATE, USER_LIBRARY_READ
 from config import Config