djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix return response, fix file delete

Browse Source
This commit is contained in:
jb-alvarado 2020-05-24 20:08:40 +02:00
parent 5036cfbab3
commit aa7f267333
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffplayout/apps/api_player/views.py
View File

@ -3,8 +3,8 @@ import shutil
from urllib.parse import unquote
from apps.api_player.models import GuiSettings, MessengePresets
from apps.api_player.serializers import (GuiSettingsSerializer, MessengerSerializer,
UserSerializer)
from apps.api_player.serializers import (GuiSettingsSerializer,
MessengerSerializer, UserSerializer)
from django.contrib.auth.models import User
from django_filters import rest_framework as filters
from rest_framework import viewsets
@ -230,9 +230,9 @@ class FileOperations(APIView):
def delete(self, request, *args, **kwargs):
if 'file' in request.GET.dict() and 'path' in request.GET.dict():
root = read_yaml()['storage']['path']
_file = request.GET.dict()['file']
_path = os.path.join(
*(request.GET.dict()['path'].split(os.path.sep)[2:]))
_file = unquote(request.GET.dict()['file'])
folder = unquote(request.GET.dict()['path']).lstrip('/')
_path = os.path.join(*(folder.split(os.path.sep)[1:]))
fullPath = os.path.join(root, _path)
if not _file or _file == 'null':
@ -240,12 +240,12 @@ class FileOperations(APIView):
shutil.rmtree(fullPath, ignore_errors=True)
return Response(status=200)
else:
Response(status=404)
return Response(status=404)
elif os.path.isfile(os.path.join(fullPath, _file)):
os.remove(os.path.join(fullPath, _file))
return Response(status=200)
else:
Response(status=404)
return Response(status=404)
else:
return Response(status=404)