updated music and files api

This commit is contained in:
Alexander Karpov 2023-12-08 17:17:18 +03:00
parent 63311d1d26
commit 5bc8cd523a
3 changed files with 39 additions and 18 deletions

View File

@ -1,5 +1,6 @@
import os
import elastic_transport
import structlog
from django.contrib.auth.mixins import LoginRequiredMixin
from django.core.exceptions import PermissionDenied
@ -91,7 +92,9 @@ def get_queryset(self):
):
return self.filter(BaseFileItem.objects.none())
return self.filter(
BaseFileItem.objects.filter(user=self.request.user, parent__isnull=True)
BaseFileItem.objects.cache().filter(
user=self.request.user, parent__isnull=True
)
)
@ -313,18 +316,25 @@ def on_completion(self, uploaded_file, request):
}
prepared = False
if prepared and uploaded_file.size <= request.user.left_file_upload:
f = File.objects.create(
user=request.user,
file_obj=uploaded_file,
name=uploaded_file.name,
parent=folder,
)
request.user.left_file_upload -= uploaded_file.size
request.user.save()
self.message = {
"message": f"File {f.file.name.split('/')[-1]} successfully uploaded",
"status": True,
}
try:
f = File.objects.create(
user=request.user,
file_obj=uploaded_file,
name=uploaded_file.name,
parent=folder,
)
request.user.left_file_upload -= uploaded_file.size
request.user.save()
self.message = {
"message": f"File {f.file.name.split('/')[-1]} successfully uploaded",
"status": True,
}
except elastic_transport.ConnectionError:
self.message = {
"message": "Service is down, please try again later or contact support",
"status": False,
}
logger.error("Elasticsearch is down")
elif prepared:
self.message = {
"message": "File is too large, please increase disk space",

View File

@ -16,13 +16,13 @@
class AuthorSerializer(serializers.ModelSerializer):
class Meta:
model = Author
fields = ["name", "slug", "link", "image_cropped"]
fields = ["name", "slug", "image_cropped"]
class AlbumSerializer(serializers.ModelSerializer):
class Meta:
model = Album
fields = ["name", "slug", "link", "image_cropped"]
fields = ["name", "slug", "image_cropped"]
class SongSerializer(serializers.ModelSerializer):
@ -61,7 +61,8 @@ class Meta:
class ListSongSerializer(SetUserModelSerializer):
album = serializers.CharField(source="album.name", read_only=True)
album = AlbumSerializer(read_only=True)
authors = AuthorSerializer(many=True, read_only=True)
liked = serializers.SerializerMethodField(method_name="get_liked")
@extend_schema_field(serializers.BooleanField)
@ -74,7 +75,16 @@ def get_liked(self, obj):
class Meta:
model = Song
fields = ["name", "slug", "file", "image_cropped", "length", "album", "liked"]
fields = [
"name",
"slug",
"file",
"image_cropped",
"length",
"album",
"authors",
"liked",
]
extra_kwargs = {
"slug": {"read_only": True},
"image_cropped": {"read_only": True},

View File

@ -48,7 +48,8 @@ def process_file(path, user_id):
@shared_task
def load_ym_file_meta(track, user_id):
return yandex.load_file_meta(track, user_id)
yb = yandex.load_file_meta(track, user_id)
return yb
@shared_task()