MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Exclude federated files from library endpoint

This commit is contained in:
Eliot Berriot 2018-04-07 16:26:07 +02:00
parent 98381a00c8
commit e19fbf5436
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/federation/views.py
View File

@ -121,7 +121,7 @@ class MusicFilesViewSet(FederationMixin, viewsets.GenericViewSet):
qs = TrackFile.objects.order_by('-creation_date').select_related( qs = TrackFile.objects.order_by('-creation_date').select_related(
'track__artist', 'track__artist',
'track__album__artist' 'track__album__artist'
) ).filter(library_track__isnull=True)
if page is None: if page is None:
conf = { conf = {
'id': utils.full_url(reverse('federation:music:files-list')), 'id': utils.full_url(reverse('federation:music:files-list')),

12
api/tests/federation/test_views.py
View File

@ -116,6 +116,18 @@ def test_audio_file_list_actor_page(
assert response.status_code == 200 assert response.status_code == 200
assert response.data == expected assert response.data == expected
def test_audio_file_list_actor_page_exclude_federated_files(
db, settings, api_client, factories):
settings.FEDERATION_MUSIC_NEEDS_APPROVAL = False
library = actors.SYSTEM_ACTORS['library'].get_actor_instance()
tfs = factories['music.TrackFile'].create_batch(size=5, federation=True)
url = reverse('federation:music:files-list')
response = api_client.get(url)
assert response.status_code == 200
assert response.data['totalItems'] == 0
def test_audio_file_list_actor_page_error( def test_audio_file_list_actor_page_error(
db, settings, api_client, factories): db, settings, api_client, factories):