silas/spotify-to-tidal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16 from vaosilva/master

Browse Source 
Added a ISRC matcher
This commit is contained in:
Tim Rae
2022-12-21 11:33:22 +13:00
committed by GitHub
parent e8f5cd174f 55f61de435
commit 083ad135a5
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sync.py
View File

@@ -22,6 +22,11 @@ def simple(input_string):
# only take the first part of a string before any hyphens or brackets to account for different versions # only take the first part of a string before any hyphens or brackets to account for different versions
return input_string.split('-')[0].strip().split('(')[0].strip().split('[')[0].strip() return input_string.split('-')[0].strip().split('(')[0].strip().split('[')[0].strip()
def isrc_match(tidal_track, spotify_track):
if "isrc" in spotify_track["external_ids"]:
return tidal_track.isrc == spotify_track["external_ids"]["isrc"]
return False
def duration_match(tidal_track, spotify_track, tolerance=2): def duration_match(tidal_track, spotify_track, tolerance=2):
# the duration of the two tracks must be the same to within 2 seconds # the duration of the two tracks must be the same to within 2 seconds
return abs(tidal_track.duration - spotify_track['duration_ms']/1000) < tolerance return abs(tidal_track.duration - spotify_track['duration_ms']/1000) < tolerance
@@ -77,7 +82,12 @@ def artist_match(tidal_track, spotify_track):
return get_tidal_artists(tidal_track, True).intersection(get_spotify_artists(spotify_track, True)) != set() return get_tidal_artists(tidal_track, True).intersection(get_spotify_artists(spotify_track, True)) != set()
def match(tidal_track, spotify_track): def match(tidal_track, spotify_track):
return duration_match(tidal_track, spotify_track) and name_match(tidal_track, spotify_track) and artist_match(tidal_track, spotify_track) return isrc_match(tidal_track, spotify_track) or (
duration_match(tidal_track, spotify_track)
and name_match(tidal_track, spotify_track)
and artist_match(tidal_track, spotify_track)
)
def tidal_search(spotify_track_and_cache, tidal_session): def tidal_search(spotify_track_and_cache, tidal_session):
spotify_track, cached_tidal_track = spotify_track_and_cache spotify_track, cached_tidal_track = spotify_track_and_cache
@@ -142,7 +152,10 @@ def call_async_with_progress(function, values, description, num_processes, **kwa
def get_tracks_from_spotify_playlist(spotify_session, spotify_playlist): def get_tracks_from_spotify_playlist(spotify_session, spotify_playlist):
output = [] output = []
results = spotify_session.playlist_tracks(spotify_playlist['id'], fields="next,items(track(name,album(name,artists),artists,track_number,duration_ms,id))") results = spotify_session.playlist_tracks(
spotify_playlist["id"],
fields="next,items(track(name,album(name,artists),artists,track_number,duration_ms,id,external_ids(isrc)))",
)
while True: while True:
output.extend([r['track'] for r in results['items'] if r['track'] is not None]) output.extend([r['track'] for r in results['items'] if r['track'] is not None])
# move to the next page of results if there are still tracks remaining in the playlist # move to the next page of results if there are still tracks remaining in the playlist