yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 04:09:16 +02:00
Code Issues Releases Wiki Activity

See #272: linting and changelog

Browse source
This commit is contained in:
Eliot Berriot 2018-10-26 15:44:54 +02:00
parent ac4bba816d
commit bcd22eb38c
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
6 changed files with 39 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

37
api/funkwhale_api/music/models.py
View file

@ -209,12 +209,7 @@ class AlbumQuerySet(models.QuerySet):
def with_prefetched_tracks_and_playable_uploads(self, actor):
tracks = Track.objects.with_playable_uploads(actor)
return self.prefetch_related(
models.Prefetch(
'tracks',
queryset=tracks,
)
)
return self.prefetch_related(models.Prefetch("tracks", queryset=tracks))
class Album(APIModelMixin):
@ -413,13 +408,9 @@ class TrackQuerySet(models.QuerySet):
return self.exclude(uploads__in=files).distinct()
def with_playable_uploads(self, actor):
uploads = Upload.objects.playable_by(actor).select_related('track')
uploads = Upload.objects.playable_by(actor).select_related("track")
return self.prefetch_related(
models.Prefetch(
'uploads',
queryset=uploads,
to_attr='playable_uploads'
)
models.Prefetch("uploads", queryset=uploads, to_attr="playable_uploads")
)
@ -763,11 +754,13 @@ class Upload(models.Model):
# we create the version with an empty file, then
# we'll write to it
f = ContentFile(b"")
version = self.versions.create(mimetype=mimetype, bitrate=self.bitrate or 128000, size=0)
version = self.versions.create(
mimetype=mimetype, bitrate=self.bitrate or 128000, size=0
)
# we keep the same name, but we update the extension
new_name = os.path.splitext(
os.path.basename(self.audio_file.name)
)[0] + '.{}'.format(format)
new_name = os.path.splitext(os.path.basename(self.audio_file.name))[
0
] + ".{}".format(format)
version.audio_file.save(new_name, f)
utils.transcode_file(
input=self.audio_file,
@ -776,18 +769,18 @@ class Upload(models.Model):
output_format=utils.MIMETYPE_TO_EXTENSION[mimetype],
)
version.size = version.audio_file.size
version.save(update_fields=['size'])
version.save(update_fields=["size"])
return version
MIMETYPE_CHOICES = [
(mt, ext) for ext, mt in utils.AUDIO_EXTENSIONS_AND_MIMETYPE
]
MIMETYPE_CHOICES = [(mt, ext) for ext, mt in utils.AUDIO_EXTENSIONS_AND_MIMETYPE]
class UploadVersion(models.Model):
upload = models.ForeignKey(Upload, related_name='versions', on_delete=models.CASCADE)
upload = models.ForeignKey(
Upload, related_name="versions", on_delete=models.CASCADE
)
mimetype = models.CharField(max_length=50, choices=MIMETYPE_CHOICES)
creation_date = models.DateTimeField(default=timezone.now)
accessed_date = models.DateTimeField(null=True, blank=True)
@ -796,7 +789,7 @@ class UploadVersion(models.Model):
size = models.IntegerField()
class Meta:
unique_together = ('upload', 'mimetype', 'bitrate')
unique_together = ("upload", "mimetype", "bitrate")
@property
def filename(self):