jellyfin/mopidy-jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/mopidy-jellyfin.git synced 2024-11-26 23:20:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #106 from mcarlton00/include-bitrates

Browse Source 
Include bitrates for tracks
This commit is contained in:
mcarlton00 2021-05-21 19:59:56 -04:00 committed by GitHub
commit 9bb7772ddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mopidy_jellyfin/remote.py
View File

@ -205,7 +205,10 @@ class JellyfinHandler(object):
return raw_playlists.get('Items') return raw_playlists.get('Items')
def get_playlist_contents(self, playlist_id): def get_playlist_contents(self, playlist_id):
url_params = { 'UserId': self.user_id } url_params = {
'UserId': self.user_id,
'fields': 'MediaSources'
}
url = self.api_url('/Playlists/{}/Items'.format(playlist_id), url_params) url = self.api_url('/Playlists/{}/Items'.format(playlist_id), url_params)
data = self.http.get(url).get('Items', []) data = self.http.get(url).get('Items', [])
@ -308,6 +311,7 @@ class JellyfinHandler(object):
url_params = { url_params = {
'Recursive': 'true', 'Recursive': 'true',
'Filters': 'IsFavorite', 'Filters': 'IsFavorite',
'fields': 'MediaSources'
} }
fav_items_url = self.api_url(f'/Users/{self.user_id}/Items', url_params) fav_items_url = self.api_url(f'/Users/{self.user_id}/Items', url_params)
@ -396,7 +400,8 @@ class JellyfinHandler(object):
url_params = { url_params = {
'UserId': self.user_id, 'UserId': self.user_id,
'IncludeItemTypes': 'MusicAlbum', 'IncludeItemTypes': 'MusicAlbum',
'Recursive': 'true' 'Recursive': 'true',
'fields': 'MediaSources'
} }
if self.albumartistsort: if self.albumartistsort:
url_params['AlbumArtistIds'] = artist_id url_params['AlbumArtistIds'] = artist_id
@ -524,7 +529,8 @@ class JellyfinHandler(object):
""" """
url_params= { url_params= {
'ParentId': id, 'ParentId': id,
'SortOrder': 'Ascending' 'SortOrder': 'Ascending',
'fields': 'MediaSources'
} }
url = self.api_url('/Users/{}/Items'.format(self.user_id), url_params) url = self.api_url('/Users/{}/Items'.format(self.user_id), url_params)
return self.http.get(url) return self.http.get(url)
@ -558,15 +564,24 @@ class JellyfinHandler(object):
""" """
# TODO: add more metadata # TODO: add more metadata
name = track.get('Name') name = track.get('Name')
bitrate = 0
if self.watched_status and track.get('Type') == 'AudioBook': if self.watched_status and track.get('Type') == 'AudioBook':
if track['UserData'].get('PlayCount'): if track['UserData'].get('PlayCount'):
name = f'[X] - {name}' name = f'[X] - {name}'
else: else:
name = f'[] - {name}' name = f'[] - {name}'
for source in track.get('MediaSources', []):
for stream in source.get('MediaStreams', []):
if stream.get('Type') == 'Audio':
# Server returns bitrate in bits/sec, we need kbits
bitrate = int(stream.get('BitRate', 0) / 1000)
break
return models.Track( return models.Track(
uri='jellyfin:track:{}'.format(track.get('Id')), uri='jellyfin:track:{}'.format(track.get('Id')),
name=name, name=name,
bitrate=bitrate,
track_no=track.get('IndexNumber', 0), track_no=track.get('IndexNumber', 0),
disc_no=track.get('ParentIndexNumber'), disc_no=track.get('ParentIndexNumber'),
genre=','.join(track.get('Genres', [])), genre=','.join(track.get('Genres', [])),
@ -741,7 +756,8 @@ class JellyfinHandler(object):
url_params = { url_params = {
'IncludeItemTypes': 'MusicAlbum', 'IncludeItemTypes': 'MusicAlbum',
'Recursive': 'true', 'Recursive': 'true',
'UserId': self.user_id 'UserId': self.user_id,
'fields': 'MediaSources'
} }
# Get album list # Get album list
@ -790,7 +806,8 @@ class JellyfinHandler(object):
'IncludeItemTypes': 'MusicAlbum', 'IncludeItemTypes': 'MusicAlbum',
'IncludeMedia': 'true', 'IncludeMedia': 'true',
'Recursive': 'true', 'Recursive': 'true',
'searchTerm': album_name 'searchTerm': album_name,
'fields': 'MediaSources'
} }
url = self.api_url('/Users/{}/Items'.format(self.user_id), url_params) url = self.api_url('/Users/{}/Items'.format(self.user_id), url_params)
album_data = self.http.get(url).get('Items') album_data = self.http.get(url).get('Items')
@ -825,7 +842,8 @@ class JellyfinHandler(object):
'IncludeItemTypes': 'Audio', 'IncludeItemTypes': 'Audio',
'Recursive': 'true', 'Recursive': 'true',
'AlbumIds': album_id, 'AlbumIds': album_id,
'UserId': self.user_id 'UserId': self.user_id,
'fields': 'MediaSources'
} }
url = self.api_url('/Items', url_params) url = self.api_url('/Items', url_params)
@ -871,7 +889,8 @@ class JellyfinHandler(object):
url_params = { url_params = {
'SortOrder': 'Ascending', 'SortOrder': 'Ascending',
'Recursive': 'true', 'Recursive': 'true',
'IncludeItemTypes': 'Audio' 'IncludeItemTypes': 'Audio',
'fields': 'MediaSources'
} }
if self.albumartistsort: if self.albumartistsort:
url_params['AlbumArtistIds'] = artist_id url_params['AlbumArtistIds'] = artist_id