mirror of
https://github.com/pelican-dev/panel.git
synced 2025-06-27 23:41:09 +02:00
Add FileExistsException
& Fix error reporting (#1417)
This commit is contained in:
parent
4d0aabe91e
commit
cdcd1c521e
7
app/Exceptions/Repository/FileExistsException.php
Normal file
7
app/Exceptions/Repository/FileExistsException.php
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Exceptions\Repository;
|
||||||
|
|
||||||
|
use Exception;
|
||||||
|
|
||||||
|
class FileExistsException extends Exception {}
|
@ -4,6 +4,7 @@ namespace App\Filament\Server\Resources\FileResource\Pages;
|
|||||||
|
|
||||||
use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
|
use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
|
||||||
use App\Enums\EditorLanguages;
|
use App\Enums\EditorLanguages;
|
||||||
|
use App\Exceptions\Repository\FileExistsException;
|
||||||
use App\Facades\Activity;
|
use App\Facades\Activity;
|
||||||
use App\Filament\Server\Resources\FileResource;
|
use App\Filament\Server\Resources\FileResource;
|
||||||
use App\Models\File;
|
use App\Models\File;
|
||||||
@ -12,6 +13,7 @@ use App\Models\Server;
|
|||||||
use App\Repositories\Daemon\DaemonFileRepository;
|
use App\Repositories\Daemon\DaemonFileRepository;
|
||||||
use App\Filament\Components\Tables\Columns\BytesColumn;
|
use App\Filament\Components\Tables\Columns\BytesColumn;
|
||||||
use App\Filament\Components\Tables\Columns\DateTimeColumn;
|
use App\Filament\Components\Tables\Columns\DateTimeColumn;
|
||||||
|
use App\Livewire\AlertBanner;
|
||||||
use App\Traits\Filament\CanCustomizeHeaderActions;
|
use App\Traits\Filament\CanCustomizeHeaderActions;
|
||||||
use App\Traits\Filament\CanCustomizeHeaderWidgets;
|
use App\Traits\Filament\CanCustomizeHeaderWidgets;
|
||||||
use Filament\Actions\Action as HeaderAction;
|
use Filament\Actions\Action as HeaderAction;
|
||||||
@ -419,11 +421,22 @@ class ListFiles extends ListRecords
|
|||||||
->keyBindings('')
|
->keyBindings('')
|
||||||
->modalSubmitActionLabel('Create')
|
->modalSubmitActionLabel('Create')
|
||||||
->action(function ($data) {
|
->action(function ($data) {
|
||||||
$this->getDaemonFileRepository()->putContent(join_paths($this->path, $data['name']), $data['editor'] ?? '');
|
$path = join_paths($this->path, $data['name']);
|
||||||
|
try {
|
||||||
|
$this->getDaemonFileRepository()->putContent($path, $data['editor'] ?? '');
|
||||||
|
|
||||||
Activity::event('server:file.write')
|
Activity::event('server:file.write')
|
||||||
->property('file', join_paths($this->path, $data['name']))
|
->property('file', join_paths($path, $data['name']))
|
||||||
->log();
|
->log();
|
||||||
|
} catch (FileExistsException) {
|
||||||
|
AlertBanner::make()
|
||||||
|
->title('<code>' . $path . '</code> already exists!')
|
||||||
|
->danger()
|
||||||
|
->closable()
|
||||||
|
->send();
|
||||||
|
|
||||||
|
$this->redirect(self::getUrl(['path' => dirname($path)]));
|
||||||
|
}
|
||||||
})
|
})
|
||||||
->form([
|
->form([
|
||||||
TextInput::make('name')
|
TextInput::make('name')
|
||||||
@ -448,11 +461,22 @@ class ListFiles extends ListRecords
|
|||||||
->label('New Folder')
|
->label('New Folder')
|
||||||
->color('gray')
|
->color('gray')
|
||||||
->action(function ($data) {
|
->action(function ($data) {
|
||||||
$this->getDaemonFileRepository()->createDirectory($data['name'], $this->path);
|
try {
|
||||||
|
$this->getDaemonFileRepository()->createDirectory($data['name'], $this->path);
|
||||||
|
|
||||||
Activity::event('server:file.create-directory')
|
Activity::event('server:file.create-directory')
|
||||||
->property(['directory' => $this->path, 'name' => $data['name']])
|
->property(['directory' => $this->path, 'name' => $data['name']])
|
||||||
->log();
|
->log();
|
||||||
|
} catch (FileExistsException) {
|
||||||
|
$path = join_paths($this->path, $data['name']);
|
||||||
|
AlertBanner::make()
|
||||||
|
->title('<code>' . $path . '</code> already exists!')
|
||||||
|
->danger()
|
||||||
|
->closable()
|
||||||
|
->send();
|
||||||
|
|
||||||
|
$this->redirect(self::getUrl(['path' => dirname($path)]));
|
||||||
|
}
|
||||||
})
|
})
|
||||||
->form([
|
->form([
|
||||||
TextInput::make('name')
|
TextInput::make('name')
|
||||||
|
@ -5,6 +5,7 @@ namespace App\Repositories\Daemon;
|
|||||||
use Illuminate\Contracts\Filesystem\FileNotFoundException;
|
use Illuminate\Contracts\Filesystem\FileNotFoundException;
|
||||||
use Illuminate\Http\Client\Response;
|
use Illuminate\Http\Client\Response;
|
||||||
use App\Exceptions\Http\Server\FileSizeTooLargeException;
|
use App\Exceptions\Http\Server\FileSizeTooLargeException;
|
||||||
|
use App\Exceptions\Repository\FileExistsException;
|
||||||
use App\Exceptions\Repository\FileNotEditableException;
|
use App\Exceptions\Repository\FileNotEditableException;
|
||||||
use Illuminate\Http\Client\ConnectionException;
|
use Illuminate\Http\Client\ConnectionException;
|
||||||
|
|
||||||
@ -46,13 +47,20 @@ class DaemonFileRepository extends DaemonRepository
|
|||||||
* a file.
|
* a file.
|
||||||
*
|
*
|
||||||
* @throws ConnectionException
|
* @throws ConnectionException
|
||||||
|
* @throws FileExistsException
|
||||||
*/
|
*/
|
||||||
public function putContent(string $path, string $content): Response
|
public function putContent(string $path, string $content): Response
|
||||||
{
|
{
|
||||||
return $this->getHttpClient()
|
$response = $this->getHttpClient()
|
||||||
->withQueryParameters(['file' => $path])
|
->withQueryParameters(['file' => $path])
|
||||||
->withBody($content)
|
->withBody($content)
|
||||||
->post("/api/servers/{$this->server->uuid}/files/write");
|
->post("/api/servers/{$this->server->uuid}/files/write");
|
||||||
|
|
||||||
|
if ($response->getStatusCode() === 400) {
|
||||||
|
throw new FileExistsException();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -73,15 +81,22 @@ class DaemonFileRepository extends DaemonRepository
|
|||||||
* Creates a new directory for the server in the given $path.
|
* Creates a new directory for the server in the given $path.
|
||||||
*
|
*
|
||||||
* @throws ConnectionException
|
* @throws ConnectionException
|
||||||
|
* @throws FileExistsException
|
||||||
*/
|
*/
|
||||||
public function createDirectory(string $name, string $path): Response
|
public function createDirectory(string $name, string $path): Response
|
||||||
{
|
{
|
||||||
return $this->getHttpClient()->post("/api/servers/{$this->server->uuid}/files/create-directory",
|
$response = $this->getHttpClient()->post("/api/servers/{$this->server->uuid}/files/create-directory",
|
||||||
[
|
[
|
||||||
'name' => $name,
|
'name' => $name,
|
||||||
'path' => $path,
|
'path' => $path,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if ($response->getStatusCode() === 400) {
|
||||||
|
throw new FileExistsException();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -57,6 +57,9 @@ abstract class DaemonRepository
|
|||||||
if (is_bool($condition)) {
|
if (is_bool($condition)) {
|
||||||
return $condition;
|
return $condition;
|
||||||
}
|
}
|
||||||
|
if ($condition->clientError()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$header = $condition->header('User-Agent');
|
$header = $condition->header('User-Agent');
|
||||||
if (
|
if (
|
||||||
|
Loading…
x
Reference in New Issue
Block a user