Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8a66f5f864 | ||
|
|
299cc3209f | ||
|
|
46771aefc8 | ||
|
|
eb745eab6f | ||
|
|
9ff181ae6e | ||
|
|
d90c5bac41 | ||
|
|
e62a8a80cb | ||
|
|
a5afd975f0 | ||
|
|
03e0396ac0 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -3,6 +3,7 @@ config.yml
|
||||
config.yaml
|
||||
.cache*
|
||||
.session.yml
|
||||
songs not found.txt
|
||||
|
||||
# Byte-compiled / optimized / DLL files
|
||||
__pycache__/
|
||||
|
||||
@@ -2,7 +2,7 @@ spotify:
|
||||
client_id: your_client_id
|
||||
client_secret: your_client_secret
|
||||
username: your_spotify_username
|
||||
redirect_uri: http://localhost:8888/callback
|
||||
redirect_uri: http://127.0.0.1:8888/callback
|
||||
open_browser: True # Set to False if using a headless server environment
|
||||
|
||||
|
||||
|
||||
@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "spotify_to_tidal"
|
||||
version = "1.0.4"
|
||||
version = "1.0.7"
|
||||
requires-python = ">= 3.10"
|
||||
|
||||
dependencies = [
|
||||
"spotipy~=2.24.0",
|
||||
"tidalapi==0.7.6",
|
||||
"spotipy~=2.24",
|
||||
"tidalapi~=0.8.10",
|
||||
"pyyaml~=6.0",
|
||||
"tqdm~=4.64",
|
||||
"sqlalchemy~=2.0",
|
||||
|
||||
@@ -19,6 +19,7 @@ Setup
|
||||
Usage
|
||||
----
|
||||
To synchronize all of your Spotify playlists with your Tidal account run the following from the project root directory
|
||||
Windows ignores python module paths by default, but you can run them using `python3 -m spotify_to_tidal`
|
||||
|
||||
```bash
|
||||
spotify_to_tidal
|
||||
|
||||
@@ -184,7 +184,11 @@ async def get_tracks_from_spotify_playlist(spotify_session: spotipy.Spotify, spo
|
||||
print(f"Loading tracks from Spotify playlist '{spotify_playlist['name']}'")
|
||||
items = await repeat_on_request_error( _fetch_all_from_spotify_in_chunks, lambda offset: _get_tracks_from_spotify_playlist(offset=offset, playlist_id=spotify_playlist["id"]))
|
||||
track_filter = lambda item: item.get('type', 'track') == 'track' # type may be 'episode' also
|
||||
sanity_filter = lambda item: 'album' in item and 'name' in item['album'] and 'artists' in item['album'] and len(item['album']['artists']) > 0
|
||||
sanity_filter = lambda item: ('album' in item
|
||||
and 'name' in item['album']
|
||||
and 'artists' in item['album']
|
||||
and len(item['album']['artists']) > 0
|
||||
and item['album']['artists'][0]['name'] is not None)
|
||||
return list(filter(sanity_filter, filter(track_filter, items)))
|
||||
|
||||
def populate_track_match_cache(spotify_tracks_: Sequence[t_spotify.SpotifyTrack], tidal_tracks_: Sequence[tidalapi.Track]):
|
||||
@@ -277,7 +281,9 @@ async def search_new_tracks_on_tidal(tidal_session: tidalapi.Session, spotify_tr
|
||||
color = ('\033[91m', '\033[0m')
|
||||
print(color[0] + "Could not find the track " + song404[-1] + color[1])
|
||||
file_name = "songs not found.txt"
|
||||
header = f"==========================\nPlaylist: {playlist_name}\n==========================\n"
|
||||
with open(file_name, "a", encoding="utf-8") as file:
|
||||
file.write(header)
|
||||
for song in song404:
|
||||
file.write(f"{song}\n")
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ def test_open_spotify_session(mocker):
|
||||
"username": "test_user",
|
||||
"client_id": "test_client_id",
|
||||
"client_secret": "test_client_secret",
|
||||
"redirect_uri": "http://localhost/",
|
||||
"redirect_uri": "http://127.0.0.1/",
|
||||
"open_browser": True,
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ def test_open_spotify_session(mocker):
|
||||
scope=SPOTIFY_SCOPES,
|
||||
client_id="test_client_id",
|
||||
client_secret="test_client_secret",
|
||||
redirect_uri="http://localhost/",
|
||||
redirect_uri="http://127.0.0.1/",
|
||||
requests_timeout=2,
|
||||
open_browser=True,
|
||||
)
|
||||
@@ -64,7 +64,7 @@ def test_open_spotify_session_oauth_error(mocker):
|
||||
"username": "test_user",
|
||||
"client_id": "test_client_id",
|
||||
"client_secret": "test_client_secret",
|
||||
"redirect_uri": "http://localhost/",
|
||||
"redirect_uri": "http://127.0.0.1/",
|
||||
}
|
||||
|
||||
# Mock sys.exit to prevent the test from exiting
|
||||
|
||||
Reference in New Issue
Block a user