yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-05 20:01:54 +02:00
Code Issues Releases Wiki Activity

Blacked the code

Browse source
This commit is contained in:
Eliot Berriot 2018-06-09 15:36:16 +02:00
parent b6fc0051fa
commit 62ca3bd736
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
279 changed files with 8861 additions and 9527 deletions
Download patch file Download diff file Expand all files Collapse all files

203
api/funkwhale_api/music/serializers.py
View file

@ -19,14 +19,14 @@ class ArtistAlbumSerializer(serializers.ModelSerializer):
class Meta:
model = models.Album
fields = (
'id',
'mbid',
'title',
'artist',
'release_date',
'cover',
'creation_date',
'tracks_count',
"id",
"mbid",
"title",
"artist",
"release_date",
"cover",
"creation_date",
"tracks_count",
)
def get_tracks_count(self, o):
@ -38,13 +38,7 @@ class ArtistWithAlbumsSerializer(serializers.ModelSerializer):
class Meta:
model = models.Artist
fields = (
'id',
'mbid',
'name',
'creation_date',
'albums',
)
fields = ("id", "mbid", "name", "creation_date", "albums")
class TrackFileSerializer(serializers.ModelSerializer):
@ -53,23 +47,18 @@ class TrackFileSerializer(serializers.ModelSerializer):
class Meta:
model = models.TrackFile
fields = (
'id',
'path',
'source',
'filename',
'mimetype',
'track',
'duration',
'mimetype',
'bitrate',
'size',
"id",
"path",
"source",
"filename",
"mimetype",
"track",
"duration",
"mimetype",
"bitrate",
"size",
)
read_only_fields = [
'duration',
'mimetype',
'bitrate',
'size',
]
read_only_fields = ["duration", "mimetype", "bitrate", "size"]
def get_path(self, o):
url = o.path
@ -82,26 +71,21 @@ class AlbumTrackSerializer(serializers.ModelSerializer):
class Meta:
model = models.Track
fields = (
'id',
'mbid',
'title',
'album',
'artist',
'creation_date',
'files',
'position',
"id",
"mbid",
"title",
"album",
"artist",
"creation_date",
"files",
"position",
)
class ArtistSimpleSerializer(serializers.ModelSerializer):
class Meta:
model = models.Artist
fields = (
'id',
'mbid',
'name',
'creation_date',
)
fields = ("id", "mbid", "name", "creation_date")
class AlbumSerializer(serializers.ModelSerializer):
@ -111,20 +95,20 @@ class AlbumSerializer(serializers.ModelSerializer):
class Meta:
model = models.Album
fields = (
'id',
'mbid',
'title',
'artist',
'tracks',
'release_date',
'cover',
'creation_date',
"id",
"mbid",
"title",
"artist",
"tracks",
"release_date",
"cover",
"creation_date",
)
def get_tracks(self, o):
ordered_tracks = sorted(
o.tracks.all(),
key=lambda v: (v.position, v.title) if v.position else (99999, v.title)
key=lambda v: (v.position, v.title) if v.position else (99999, v.title),
)
return AlbumTrackSerializer(ordered_tracks, many=True).data
@ -135,13 +119,13 @@ class TrackAlbumSerializer(serializers.ModelSerializer):
class Meta:
model = models.Album
fields = (
'id',
'mbid',
'title',
'artist',
'release_date',
'cover',
'creation_date',
"id",
"mbid",
"title",
"artist",
"release_date",
"cover",
"creation_date",
)
@ -154,15 +138,15 @@ class TrackSerializer(serializers.ModelSerializer):
class Meta:
model = models.Track
fields = (
'id',
'mbid',
'title',
'album',
'artist',
'creation_date',
'files',
'position',
'lyrics',
"id",
"mbid",
"title",
"album",
"artist",
"creation_date",
"files",
"position",
"lyrics",
)
def get_lyrics(self, obj):
@ -172,20 +156,19 @@ class TrackSerializer(serializers.ModelSerializer):
class TagSerializer(serializers.ModelSerializer):
class Meta:
model = Tag
fields = ('id', 'name', 'slug')
fields = ("id", "name", "slug")
class SimpleAlbumSerializer(serializers.ModelSerializer):
class Meta:
model = models.Album
fields = ('id', 'mbid', 'title', 'release_date', 'cover')
fields = ("id", "mbid", "title", "release_date", "cover")
class LyricsSerializer(serializers.ModelSerializer):
class Meta:
model = models.Lyrics
fields = ('id', 'work', 'content', 'content_rendered')
fields = ("id", "work", "content", "content_rendered")
class ImportJobSerializer(serializers.ModelSerializer):
@ -193,15 +176,8 @@ class ImportJobSerializer(serializers.ModelSerializer):
class Meta:
model = models.ImportJob
fields = (
'id',
'mbid',
'batch',
'source',
'status',
'track_file',
'audio_file')
read_only_fields = ('status', 'track_file')
fields = ("id", "mbid", "batch", "source", "status", "track_file", "audio_file")
read_only_fields = ("status", "track_file")
class ImportBatchSerializer(serializers.ModelSerializer):
@ -210,19 +186,19 @@ class ImportBatchSerializer(serializers.ModelSerializer):
class Meta:
model = models.ImportBatch
fields = (
'id',
'submitted_by',
'source',
'status',
'creation_date',
'import_request')
read_only_fields = (
'creation_date', 'submitted_by', 'source')
"id",
"submitted_by",
"source",
"status",
"creation_date",
"import_request",
)
read_only_fields = ("creation_date", "submitted_by", "source")
def to_representation(self, instance):
repr = super().to_representation(instance)
try:
repr['job_count'] = instance.job_count
repr["job_count"] = instance.job_count
except AttributeError:
# Queryset was not annotated
pass
@ -231,50 +207,43 @@ class ImportBatchSerializer(serializers.ModelSerializer):
class TrackActivitySerializer(activity_serializers.ModelSerializer):
type = serializers.SerializerMethodField()
name = serializers.CharField(source='title')
artist = serializers.CharField(source='artist.name')
album = serializers.CharField(source='album.title')
name = serializers.CharField(source="title")
artist = serializers.CharField(source="artist.name")
album = serializers.CharField(source="album.title")
class Meta:
model = models.Track
fields = [
'id',
'local_id',
'name',
'type',
'artist',
'album',
]
fields = ["id", "local_id", "name", "type", "artist", "album"]
def get_type(self, obj):
return 'Audio'
return "Audio"
class ImportJobRunSerializer(serializers.Serializer):
jobs = serializers.PrimaryKeyRelatedField(
many=True,
queryset=models.ImportJob.objects.filter(
status__in=['pending', 'errored']
)
queryset=models.ImportJob.objects.filter(status__in=["pending", "errored"]),
)
batches = serializers.PrimaryKeyRelatedField(
many=True,
queryset=models.ImportBatch.objects.all()
many=True, queryset=models.ImportBatch.objects.all()
)
def validate(self, validated_data):
jobs = validated_data['jobs']
batches_ids = [b.pk for b in validated_data['batches']]
jobs = validated_data["jobs"]
batches_ids = [b.pk for b in validated_data["batches"]]
query = Q(batch__pk__in=batches_ids)
query |= Q(pk__in=[j.id for j in jobs])
queryset = models.ImportJob.objects.filter(query).filter(
status__in=['pending', 'errored']).distinct()
validated_data['_jobs'] = queryset
queryset = (
models.ImportJob.objects.filter(query)
.filter(status__in=["pending", "errored"])
.distinct()
)
validated_data["_jobs"] = queryset
return validated_data
def create(self, validated_data):
ids = validated_data['_jobs'].values_list('id', flat=True)
validated_data['_jobs'].update(status='pending')
ids = validated_data["_jobs"].values_list("id", flat=True)
validated_data["_jobs"].update(status="pending")
for id in ids:
tasks.import_job_run.delay(import_job_id=id)
return {'jobs': list(ids)}
return {"jobs": list(ids)}