Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

date is None or str #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions mopidy_subsonic/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def __init__(self, hostname, port, username, password, ssl, context):
self.api_port = port
self.api_user = username
self.api_pass = password
if ssl:
if ssl:
self.api_hostname = "https://" + hostname
else:
self.api_hostname = "http://" + hostname
Expand Down Expand Up @@ -214,7 +214,7 @@ def get_song(self, id):

@cache(ctl=16)
def get_track(self, data):
track = self._convert_data(data)
track = self._convert_data(data)
return track

def _convert_data(self, data):
Expand Down Expand Up @@ -250,9 +250,9 @@ def _convert_data(self, data):
track_kwargs['name'] = data['title']

if 'year' in data:
track_kwargs['date'] = data['year']
track_kwargs['date'] = str(data['year'])
else:
track_kwargs['date'] = 'none'
track_kwargs['date'] = None

if artist_kwargs:
artist = Artist(**artist_kwargs)
Expand Down Expand Up @@ -349,9 +349,9 @@ def search_tracks(self, artist, album, title, any):
# MPD doesn't like /, \n, or \r in names
# should only necessary until next release of mopidy
def fix_playlist_name(self, name):
_invalid_playlist_chars = re.compile(r'[\n\r/]')
_invalid_playlist_chars = re.compile(r'[\n\r/]')
fixed_name = _invalid_playlist_chars.sub('-', name)
return fixed_name
return fixed_name

def get_user_playlists(self):
results = self.api.getPlaylists().get('playlists')
Expand Down