Add support for compressing items in the file manager

This commit is contained in:
Dane Everitt 2020-07-11 13:38:49 -07:00
parent cb9eb918b2
commit 82bc9e617b
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
8 changed files with 137 additions and 33 deletions

View file

@ -5,6 +5,7 @@ namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
use Carbon\CarbonImmutable;
use Illuminate\Http\Response;
use Pterodactyl\Models\Server;
use Illuminate\Http\JsonResponse;
use GuzzleHttp\Exception\TransferException;
use Pterodactyl\Services\Nodes\NodeJWTService;
use Illuminate\Contracts\Routing\ResponseFactory;
@ -17,6 +18,7 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Files\ListFilesRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\DeleteFileRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\RenameFileRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CreateFolderRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CompressFilesRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\GetFileContentsRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\WriteFileContentRequest;
@ -90,7 +92,7 @@ class FileController extends ClientApiController
*/
public function getFileContents(GetFileContentsRequest $request, Server $server): Response
{
return Response::create(
return new Response(
$this->fileRepository->setServer($server)->getContent(
$request->get('file'), config('pterodactyl.files.max_edit_size')
),
@ -136,16 +138,16 @@ class FileController extends ClientApiController
*
* @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\WriteFileContentRequest $request
* @param \Pterodactyl\Models\Server $server
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\JsonResponse
*/
public function writeFileContents(WriteFileContentRequest $request, Server $server): Response
public function writeFileContents(WriteFileContentRequest $request, Server $server): JsonResponse
{
$this->fileRepository->setServer($server)->putContent(
$request->get('file'),
$request->getContent()
);
return Response::create('', Response::HTTP_NO_CONTENT);
return new JsonResponse([], Response::HTTP_NO_CONTENT);
}
/**
@ -153,15 +155,15 @@ class FileController extends ClientApiController
*
* @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\CreateFolderRequest $request
* @param \Pterodactyl\Models\Server $server
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\JsonResponse
*/
public function createFolder(CreateFolderRequest $request, Server $server): Response
public function createFolder(CreateFolderRequest $request, Server $server): JsonResponse
{
$this->fileRepository
->setServer($server)
->createDirectory($request->input('name'), $request->input('root', '/'));
return Response::create('', Response::HTTP_NO_CONTENT);
return new JsonResponse([], Response::HTTP_NO_CONTENT);
}
/**
@ -169,15 +171,15 @@ class FileController extends ClientApiController
*
* @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\RenameFileRequest $request
* @param \Pterodactyl\Models\Server $server
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\JsonResponse
*/
public function renameFile(RenameFileRequest $request, Server $server): Response
public function renameFile(RenameFileRequest $request, Server $server): JsonResponse
{
$this->fileRepository
->setServer($server)
->renameFile($request->input('rename_from'), $request->input('rename_to'));
return Response::create('', Response::HTTP_NO_CONTENT);
return new JsonResponse([], Response::HTTP_NO_CONTENT);
}
/**
@ -185,15 +187,32 @@ class FileController extends ClientApiController
*
* @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\CopyFileRequest $request
* @param \Pterodactyl\Models\Server $server
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\JsonResponse
*/
public function copyFile(CopyFileRequest $request, Server $server): Response
public function copyFile(CopyFileRequest $request, Server $server): JsonResponse
{
$this->fileRepository
->setServer($server)
->copyFile($request->input('location'));
return Response::create('', Response::HTTP_NO_CONTENT);
return new JsonResponse([], Response::HTTP_NO_CONTENT);
}
/**
* @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\CompressFilesRequest $request
* @param \Pterodactyl\Models\Server $server
* @return array
*/
public function compressFiles(CompressFilesRequest $request, Server $server): array
{
$file = $this->fileRepository->setServer($server)
->compressFiles(
$request->input('root'), $request->input('files')
);
return $this->fractal->item($file)
->transformWith($this->getTransformer(FileObjectTransformer::class))
->toArray();
}
/**
@ -201,14 +220,14 @@ class FileController extends ClientApiController
*
* @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\DeleteFileRequest $request
* @param \Pterodactyl\Models\Server $server
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\JsonResponse
*/
public function delete(DeleteFileRequest $request, Server $server): Response
public function delete(DeleteFileRequest $request, Server $server): JsonResponse
{
$this->fileRepository
->setServer($server)
->deleteFile($request->input('location'));
return Response::create('', Response::HTTP_NO_CONTENT);
return new JsonResponse([], Response::HTTP_NO_CONTENT);
}
}

View file

@ -0,0 +1,31 @@
<?php
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
use Pterodactyl\Models\Permission;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class CompressFilesRequest extends ClientApiRequest
{
/**
* Checks that the authenticated user is allowed to create archives for this server.
*
* @return string
*/
public function permission(): string
{
return Permission::ACTION_FILE_ARCHIVE;
}
/**
* @return array
*/
public function rules(): array
{
return [
'root' => 'sometimes|nullable|string',
'files' => 'required|array',
'files.*' => 'string',
];
}
}