Commit 370f833d authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

fixes #6 honor x-origin-dir

parent 8fa41b10

rpc/views.py

+5 −2
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ def rpc(request: HttpRequest) -> HttpResponse: 
@require_http_methods(["POST"])

def upload_partial(request: HttpRequest) -> HttpResponse:

    user = _get_user_from_request(request)

    origin_dir = request.headers.get("X-origin-dir", None)

    if not user:

        return HttpResponse("Forbidden", status=403)

    try:
@@ -171,7 +172,10 @@ def upload_partial(request: HttpRequest) -> HttpResponse: 
            raise ValueError

        file_name = base64.b64decode(request.headers["X-file-name"]).decode("utf-8")

        chunk_number, total_chunks = request.headers["X-file-chunk"].split("/")

        file_instance = models.File.objects.get(hash=file_hash)

        file_instance = models.File.objects.get(hash=file_hash, owner=user)

        if origin_dir:

            collection = _collection_from_origin_dir(origin_dir, user)

            collection.resources.add(file_instance)

        return HttpResponse(file_instance.id, status=200)

    except (KeyError, ValueError):

        return HttpResponse(status=400)
@@ -202,7 +206,6 @@ def upload_partial(request: HttpRequest) -> HttpResponse: 
                    )

                    f.close()

                    _silent_rmdir(partials_dir)

                    origin_dir = request.headers.get("X-origin-dir", None)

                    if origin_dir:

                        collection = _collection_from_origin_dir(origin_dir, user)

                        collection.resources.add(models.File.objects.get(id=file_id))