Browse Source

Merge pull request #5 from weskerfoot/check-track-ids

Check track ids & refactoring
pull/6/head
Wesley Kerfoot 6 years ago
committed by GitHub
parent
commit
72450a2931
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      requirements.txt
  2. 20
      spotify_mpd_sync/msplaylist/spotify.py

1
requirements.txt

@ -9,6 +9,5 @@ idna==2.8
pycparser==2.19 pycparser==2.19
python-mpd2==1.0.0 python-mpd2==1.0.0
requests==2.21.0 requests==2.21.0
spotify-mpd-sync-weskerfoot==0.0.1
spotipy==2.4.4 spotipy==2.4.4
urllib3==1.24.2 urllib3==1.24.2

20
spotify_mpd_sync/msplaylist/spotify.py

@ -2,18 +2,17 @@
import gevent.monkey import gevent.monkey
gevent.monkey.patch_all() gevent.monkey.patch_all()
import spotipy from collections import defaultdict
from spotipy.oauth2 import SpotifyClientCredentials
from spotipy.util import prompt_for_user_token
from mpd import MPDClient from mpd import MPDClient
from mpd.base import CommandError from mpd.base import CommandError
from collections import defaultdict
from re import sub
from os import environ from os import environ
import spotipy.util as util from re import sub
import argparse
from spotify_mpd_sync.msplaylist.authenticate import prompt_for_user_token from spotify_mpd_sync.msplaylist.authenticate import prompt_for_user_token
from spotipy.oauth2 import SpotifyClientCredentials
from sys import stderr
import argparse
import spotipy
import spotipy.util as util
class Spotify(): class Spotify():
def __init__(self, host="localhost", port=6600): def __init__(self, host="localhost", port=6600):
@ -48,10 +47,13 @@ class Spotify():
for track in self.sp.user_playlist(self.username, for track in self.sp.user_playlist(self.username,
playlist["id"], playlist["id"],
fields="tracks,next")["tracks"]["items"]: fields="tracks,next")["tracks"]["items"]:
try:
self._playlists[self.sanitize_playlist(playlist["name"])].append( self._playlists[self.sanitize_playlist(playlist["name"])].append(
self.fmt_track(track["track"]["id"]) self.fmt_track(track["track"]["id"])
) )
except BaseException:
stderr.write("Error parsing track {0}".format(track["track"]["id"]))
continue
if playlists["next"]: if playlists["next"]:
playlists = self.sp.next(playlists) playlists = self.sp.next(playlists)

Loading…
Cancel
Save