From 1c419c0873535c8a441c84a12f3a19c214ea40f8 Mon Sep 17 00:00:00 2001 From: yiannisha Date: Tue, 9 Nov 2021 18:46:28 +0200 Subject: [PATCH] Name changes --- zspotify/const.py | 4 ++-- zspotify/track.py | 8 ++++---- zspotify/utils.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zspotify/const.py b/zspotify/const.py index cb34ae8..317d1e2 100644 --- a/zspotify/const.py +++ b/zspotify/const.py @@ -88,7 +88,7 @@ ROOT_PODCAST_PATH = 'ROOT_PODCAST_PATH' SKIP_EXISTING_FILES = 'SKIP_EXISTING_FILES' -SKIP_ALL_TIME_INSTALLED = 'SKIP_ALL_TIME_INSTALLED' +SKIP_PREVIOUSLY_DOWNLOADED = 'SKIP_PREVIOUSLY_DOWNLOADED' DOWNLOAD_FORMAT = 'DOWNLOAD_FORMAT' @@ -130,7 +130,7 @@ CONFIG_DEFAULT_SETTINGS = { 'ROOT_PATH': '../ZSpotify Music/', 'ROOT_PODCAST_PATH': '../ZSpotify Podcasts/', 'SKIP_EXISTING_FILES': True, - 'SKIP_ALL_TIME_INSTALLED': False, + 'SKIP_PREVIOUSLY_DOWNLOADED': False, 'DOWNLOAD_FORMAT': 'ogg', 'FORCE_PREMIUM': False, 'ANTI_BAN_WAIT_TIME': 1, diff --git a/zspotify/track.py b/zspotify/track.py index 1f11219..35f7bd6 100644 --- a/zspotify/track.py +++ b/zspotify/track.py @@ -12,9 +12,9 @@ from tqdm import tqdm from const import TRACKS, ALBUM, NAME, ITEMS, DISC_NUMBER, TRACK_NUMBER, IS_PLAYABLE, ARTISTS, IMAGES, URL, \ RELEASE_DATE, ID, TRACKS_URL, SAVED_TRACKS_URL, TRACK_STATS_URL, SPLIT_ALBUM_DISCS, ROOT_PATH, DOWNLOAD_FORMAT, \ CHUNK_SIZE, SKIP_EXISTING_FILES, ANTI_BAN_WAIT_TIME, OVERRIDE_AUTO_WAIT, BITRATE, CODEC_MAP, EXT_MAP, DOWNLOAD_REAL_TIME, \ - SKIP_ALL_TIME_INSTALLED + SKIP_PREVIOUSLY_DOWNLOADED from utils import fix_filename, set_audio_tags, set_music_thumbnail, create_download_directory, \ - get_directory_song_ids, add_to_directory_song_ids, get_all_time_installed, add_to_archive + get_directory_song_ids, add_to_directory_song_ids, get_previously_downloaded, add_to_archive from zspotify import ZSpotify @@ -94,7 +94,7 @@ def download_track(track_id: str, extra_paths='', prefix=False, prefix_value='', check_name = os.path.isfile(filename) and os.path.getsize(filename) check_id = scraped_song_id in get_directory_song_ids(download_directory) - check_all_time = scraped_song_id in get_all_time_installed(scraped_song_id, ZSpotify.get_config(ROOT_PATH)) + check_all_time = scraped_song_id in get_previously_downloaded(scraped_song_id, ZSpotify.get_config(ROOT_PATH)) # a song with the same name is installed if not check_id and check_name: @@ -118,7 +118,7 @@ def download_track(track_id: str, extra_paths='', prefix=False, prefix_value='', print('\n### SKIPPING:', song_name, '(SONG ALREADY EXISTS) ###') - elif check_all_time and ZSpotify.get_config(SKIP_ALL_TIME_INSTALLED): + elif check_all_time and ZSpotify.get_config(SKIP_PREVIOUSLY_DOWNLOADED): print('\n### SKIPPING:', song_name, '(SONG ALREADY INSTALLED ONCE) ###') diff --git a/zspotify/utils.py b/zspotify/utils.py index e22700a..6c67c6b 100644 --- a/zspotify/utils.py +++ b/zspotify/utils.py @@ -27,8 +27,8 @@ def create_download_directory(download_path: str) -> None: with open(hidden_file_path, 'w', encoding='utf-8') as f: pass -def get_all_time_installed(song_id: str, archive_directory: str) -> List[str]: - """ Returns list of all time installed songs """ +def get_previously_downloaded(song_id: str, archive_directory: str) -> List[str]: + """ Returns list of all time downloaded songs """ ids = [] archive_path = os.path.join(archive_directory, '.song_archive')