Now store remote library tracks in a dedicated model, this is much simpler
This commit is contained in:
Eliot Berriot
parent
f273faf9de
commit
b29ca44797
17 changed files with 555 additions and 394 deletions
|
|
@ -1,3 +1,4 @@
|
|||
import arrow
|
||||
import pytest
|
||||
import uuid
|
||||
|
||||
|
|
@ -10,7 +11,6 @@ from funkwhale_api.federation import actors
|
|||
from funkwhale_api.federation import models
|
||||
from funkwhale_api.federation import serializers
|
||||
from funkwhale_api.federation import utils
|
||||
from funkwhale_api.music import models as music_models
|
||||
|
||||
|
||||
def test_actor_fetching(r_mock):
|
||||
|
|
@ -375,7 +375,7 @@ def test_library_actor_handle_create_audio_no_library(mocker, factories):
|
|||
# when we receive inbox create audio, we should not do anything
|
||||
# if we don't have a configured library matching the sender
|
||||
mocked_create = mocker.patch(
|
||||
'funkwhale_api.music.serializers.AudioCollectionImportSerializer.create'
|
||||
'funkwhale_api.federation.serializers.AudioSerializer.create'
|
||||
)
|
||||
actor = factories['federation.Actor']()
|
||||
library_actor = actors.SYSTEM_ACTORS['library'].get_actor_instance()
|
||||
|
|
@ -393,7 +393,7 @@ def test_library_actor_handle_create_audio_no_library(mocker, factories):
|
|||
library_actor.system_conf.post_inbox(data, actor=actor)
|
||||
|
||||
mocked_create.assert_not_called()
|
||||
music_models.ImportBatch.objects.count() == 0
|
||||
models.LibraryTrack.objects.count() == 0
|
||||
|
||||
|
||||
def test_library_actor_handle_create_audio_no_library_enabled(
|
||||
|
|
@ -401,7 +401,7 @@ def test_library_actor_handle_create_audio_no_library_enabled(
|
|||
# when we receive inbox create audio, we should not do anything
|
||||
# if we don't have an enabled library
|
||||
mocked_create = mocker.patch(
|
||||
'funkwhale_api.music.serializers.AudioCollectionImportSerializer.create'
|
||||
'funkwhale_api.federation.serializers.AudioSerializer.create'
|
||||
)
|
||||
disabled_library = factories['federation.Library'](
|
||||
federation_enabled=False)
|
||||
|
|
@ -421,12 +421,14 @@ def test_library_actor_handle_create_audio_no_library_enabled(
|
|||
library_actor.system_conf.post_inbox(data, actor=actor)
|
||||
|
||||
mocked_create.assert_not_called()
|
||||
music_models.ImportBatch.objects.count() == 0
|
||||
models.LibraryTrack.objects.count() == 0
|
||||
|
||||
|
||||
def test_library_actor_handle_create_audio(mocker, factories):
|
||||
library_actor = actors.SYSTEM_ACTORS['library'].get_actor_instance()
|
||||
remote_library = factories['federation.Library']()
|
||||
remote_library = factories['federation.Library'](
|
||||
federation_enabled=True
|
||||
)
|
||||
|
||||
data = {
|
||||
'actor': remote_library.actor.url,
|
||||
|
|
@ -442,14 +444,19 @@ def test_library_actor_handle_create_audio(mocker, factories):
|
|||
|
||||
library_actor.system_conf.post_inbox(data, actor=remote_library.actor)
|
||||
|
||||
batch = remote_library.import_batches.latest('id')
|
||||
lts = list(remote_library.tracks.order_by('id'))
|
||||
|
||||
assert batch.source_library_url == data['object']['id']
|
||||
assert batch.source_library == remote_library
|
||||
assert batch.jobs.count() == 2
|
||||
assert len(lts) == 2
|
||||
|
||||
jobs = list(batch.jobs.order_by('id'))
|
||||
for i, a in enumerate(data['object']['items']):
|
||||
job = jobs[i]
|
||||
assert job.source_library_url == a['id']
|
||||
assert job.source == a['url']['href']
|
||||
lt = lts[i]
|
||||
assert lt.pk is not None
|
||||
assert lt.url == a['id']
|
||||
assert lt.library == remote_library
|
||||
assert lt.audio_url == a['url']['href']
|
||||
assert lt.audio_mimetype == a['url']['mediaType']
|
||||
assert lt.metadata == a['metadata']
|
||||
assert lt.title == a['metadata']['recording']['title']
|
||||
assert lt.artist_name == a['metadata']['artist']['name']
|
||||
assert lt.album_title == a['metadata']['release']['title']
|
||||
assert lt.published_date == arrow.get(a['published'])
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
import arrow
|
||||
|
||||
from django.urls import reverse
|
||||
from django.core.paginator import Paginator
|
||||
|
||||
from funkwhale_api.federation import actors
|
||||
from funkwhale_api.federation import keys
|
||||
from funkwhale_api.federation import models
|
||||
from funkwhale_api.federation import serializers
|
||||
from funkwhale_api.music.serializers import AudioSerializer
|
||||
from funkwhale_api.federation import utils
|
||||
|
||||
|
||||
def test_actor_serializer_from_ap(db):
|
||||
|
|
@ -174,7 +177,7 @@ def test_paginated_collection_serializer(factories):
|
|||
conf = {
|
||||
'id': 'https://test.federation/test',
|
||||
'items': tfs,
|
||||
'item_serializer': AudioSerializer,
|
||||
'item_serializer': serializers.AudioSerializer,
|
||||
'actor': actor,
|
||||
'page_size': 2,
|
||||
}
|
||||
|
|
@ -204,7 +207,7 @@ def test_collection_page_serializer(factories):
|
|||
|
||||
conf = {
|
||||
'id': 'https://test.federation/test',
|
||||
'item_serializer': AudioSerializer,
|
||||
'item_serializer': serializers.AudioSerializer,
|
||||
'actor': actor,
|
||||
'page': Paginator(tfs, 2).page(2),
|
||||
}
|
||||
|
|
@ -235,3 +238,140 @@ def test_collection_page_serializer(factories):
|
|||
serializer = serializers.CollectionPageSerializer(conf)
|
||||
|
||||
assert serializer.data == expected
|
||||
|
||||
|
||||
def test_activity_pub_audio_serializer_to_library_track(factories):
|
||||
remote_library = factories['federation.Library']()
|
||||
audio = factories['federation.Audio']()
|
||||
serializer = serializers.AudioSerializer(
|
||||
data=audio, context={'library': remote_library})
|
||||
|
||||
assert serializer.is_valid(raise_exception=True)
|
||||
|
||||
lt = serializer.save()
|
||||
|
||||
assert lt.pk is not None
|
||||
assert lt.url == audio['id']
|
||||
assert lt.library == remote_library
|
||||
assert lt.audio_url == audio['url']['href']
|
||||
assert lt.audio_mimetype == audio['url']['mediaType']
|
||||
assert lt.metadata == audio['metadata']
|
||||
assert lt.title == audio['metadata']['recording']['title']
|
||||
assert lt.artist_name == audio['metadata']['artist']['name']
|
||||
assert lt.album_title == audio['metadata']['release']['title']
|
||||
assert lt.published_date == arrow.get(audio['published'])
|
||||
|
||||
|
||||
def test_activity_pub_audio_serializer_to_ap(factories):
|
||||
tf = factories['music.TrackFile'](mimetype='audio/mp3')
|
||||
library = actors.SYSTEM_ACTORS['library'].get_actor_instance()
|
||||
expected = {
|
||||
'@context': serializers.AP_CONTEXT,
|
||||
'type': 'Audio',
|
||||
'id': tf.get_federation_url(),
|
||||
'name': tf.track.full_name,
|
||||
'published': tf.creation_date.isoformat(),
|
||||
'updated': tf.modification_date.isoformat(),
|
||||
'metadata': {
|
||||
'artist': {
|
||||
'musicbrainz_id': tf.track.artist.mbid,
|
||||
'name': tf.track.artist.name,
|
||||
},
|
||||
'release': {
|
||||
'musicbrainz_id': tf.track.album.mbid,
|
||||
'title': tf.track.album.title,
|
||||
},
|
||||
'recording': {
|
||||
'musicbrainz_id': tf.track.mbid,
|
||||
'title': tf.track.title,
|
||||
},
|
||||
},
|
||||
'url': {
|
||||
'href': utils.full_url(tf.path),
|
||||
'type': 'Link',
|
||||
'mediaType': 'audio/mp3'
|
||||
},
|
||||
'attributedTo': [
|
||||
library.url
|
||||
]
|
||||
}
|
||||
|
||||
serializer = serializers.AudioSerializer(tf, context={'actor': library})
|
||||
|
||||
assert serializer.data == expected
|
||||
|
||||
|
||||
def test_activity_pub_audio_serializer_to_ap_no_mbid(factories):
|
||||
tf = factories['music.TrackFile'](
|
||||
mimetype='audio/mp3',
|
||||
track__mbid=None,
|
||||
track__album__mbid=None,
|
||||
track__album__artist__mbid=None,
|
||||
)
|
||||
library = actors.SYSTEM_ACTORS['library'].get_actor_instance()
|
||||
expected = {
|
||||
'@context': serializers.AP_CONTEXT,
|
||||
'type': 'Audio',
|
||||
'id': tf.get_federation_url(),
|
||||
'name': tf.track.full_name,
|
||||
'published': tf.creation_date.isoformat(),
|
||||
'updated': tf.modification_date.isoformat(),
|
||||
'metadata': {
|
||||
'artist': {
|
||||
'name': tf.track.artist.name,
|
||||
'musicbrainz_id': None,
|
||||
},
|
||||
'release': {
|
||||
'title': tf.track.album.title,
|
||||
'musicbrainz_id': None,
|
||||
},
|
||||
'recording': {
|
||||
'title': tf.track.title,
|
||||
'musicbrainz_id': None,
|
||||
},
|
||||
},
|
||||
'url': {
|
||||
'href': utils.full_url(tf.path),
|
||||
'type': 'Link',
|
||||
'mediaType': 'audio/mp3'
|
||||
},
|
||||
'attributedTo': [
|
||||
library.url
|
||||
]
|
||||
}
|
||||
|
||||
serializer = serializers.AudioSerializer(tf, context={'actor': library})
|
||||
|
||||
assert serializer.data == expected
|
||||
|
||||
|
||||
def test_collection_serializer_to_ap(factories):
|
||||
tf1 = factories['music.TrackFile'](mimetype='audio/mp3')
|
||||
tf2 = factories['music.TrackFile'](mimetype='audio/ogg')
|
||||
library = actors.SYSTEM_ACTORS['library'].get_actor_instance()
|
||||
expected = {
|
||||
'@context': serializers.AP_CONTEXT,
|
||||
'id': 'https://test.id',
|
||||
'actor': library.url,
|
||||
'totalItems': 2,
|
||||
'type': 'Collection',
|
||||
'items': [
|
||||
serializers.AudioSerializer(
|
||||
tf1, context={'actor': library, 'include_ap_context': False}
|
||||
).data,
|
||||
serializers.AudioSerializer(
|
||||
tf2, context={'actor': library, 'include_ap_context': False}
|
||||
).data,
|
||||
]
|
||||
}
|
||||
|
||||
collection = {
|
||||
'id': expected['id'],
|
||||
'actor': library,
|
||||
'items': [tf1, tf2],
|
||||
'item_serializer': serializers.AudioSerializer
|
||||
}
|
||||
serializer = serializers.CollectionSerializer(
|
||||
collection, context={'actor': library, 'id': 'https://test.id'})
|
||||
|
||||
assert serializer.data == expected
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ from funkwhale_api.federation import actors
|
|||
from funkwhale_api.federation import serializers
|
||||
from funkwhale_api.federation import utils
|
||||
from funkwhale_api.federation import webfinger
|
||||
from funkwhale_api.music.serializers import AudioSerializer
|
||||
|
||||
|
||||
@pytest.mark.parametrize('system_actor', actors.SYSTEM_ACTORS.keys())
|
||||
|
|
@ -87,7 +86,7 @@ def test_audio_file_list_actor_no_page(
|
|||
'id': utils.full_url(reverse('federation:music:files-list')),
|
||||
'page_size': 2,
|
||||
'items': list(reversed(tfs)), # we order by -creation_date
|
||||
'item_serializer': AudioSerializer,
|
||||
'item_serializer': serializers.AudioSerializer,
|
||||
'actor': library
|
||||
}
|
||||
expected = serializers.PaginatedCollectionSerializer(conf).data
|
||||
|
|
@ -107,7 +106,7 @@ def test_audio_file_list_actor_page(
|
|||
conf = {
|
||||
'id': utils.full_url(reverse('federation:music:files-list')),
|
||||
'page': Paginator(list(reversed(tfs)), 2).page(2),
|
||||
'item_serializer': AudioSerializer,
|
||||
'item_serializer': serializers.AudioSerializer,
|
||||
'actor': library
|
||||
}
|
||||
expected = serializers.CollectionPageSerializer(conf).data
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue