4 Commits

Author SHA1 Message Date
f9775d9c1e fix pipeline 2024-12-05 11:57:28 +01:00
05657f9e91 fix bug 2024-12-05 11:28:15 +01:00
0e1c32a7d4 add back link 2024-12-05 11:25:18 +01:00
07a54729b1 add route parameter for dirs 2024-12-05 10:50:12 +01:00
10 changed files with 19 additions and 94 deletions

View File

@ -2,6 +2,7 @@ import { Controller } from '@hotwired/stimulus';
export default class extends Controller { export default class extends Controller {
connect() { connect() {
console.log(this.element);
this.element.querySelector('input').addEventListener('change', () => { this.element.querySelector('input').addEventListener('change', () => {
this.element.querySelector('button[type="submit"]').click(); this.element.querySelector('button[type="submit"]').click();
}); });

View File

@ -20,12 +20,6 @@ class HomeController extends AbstractController
)] )]
public function __invoke(FileSystemService $fileSystemService, string $dirs): Response public function __invoke(FileSystemService $fileSystemService, string $dirs): Response
{ {
if ($fileSystemService->isFile(substr_replace($dirs, '', -1))) {
return $this->render('file.html.twig', [
'file' => $fileSystemService->getFile((string) substr_replace($dirs, '', -1)),
]);
}
return $this->render('home.html.twig', [ return $this->render('home.html.twig', [
'content' => $fileSystemService->getDirs($dirs), 'content' => $fileSystemService->getDirs($dirs),
'fileForm' => $this->createForm(UploadFileForm::class), 'fileForm' => $this->createForm(UploadFileForm::class),

View File

@ -23,7 +23,7 @@ class UploadController extends AbstractController
$form = $this->createForm(UploadFileForm::class, $fileData)->handleRequest($request); $form = $this->createForm(UploadFileForm::class, $fileData)->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) { if ($form->isSubmitted() && $form->isValid()) {
$fileSystemService->uploadFile($fileData->files); $fileSystemService->uploadFile($fileData->file);
} }
return $this->redirectToRoute('app_home'); return $this->redirectToRoute('app_home');

View File

@ -17,7 +17,7 @@ class UploadFileForm extends AbstractType
{ {
$builder $builder
->setAction($this->urlGenerator->generate('app_upload')) ->setAction($this->urlGenerator->generate('app_upload'))
->add('files', FileType::class, [ ->add('file', FileType::class, [
'attr' => ['class' => 'hidden'], 'attr' => ['class' => 'hidden'],
'multiple' => true, 'multiple' => true,
]); ]);

View File

@ -6,25 +6,22 @@ namespace App\Objects;
use SplFileInfo; use SplFileInfo;
readonly class DirContent class DirContent
{ {
private function __construct( private function __construct(
private string $name, private readonly string $name,
private int $size, private readonly int $size,
private string $type, private readonly string $type,
private string $path, )
private string $content, {
) {
} }
public static function make(SplFileInfo $fileInfo, string $content = ''): DirContent public static function make(SplFileInfo $fileInfo): DirContent
{ {
return new self( return new self(
$fileInfo->getBasename(), $fileInfo->getBasename(),
$fileInfo->getSize() ?? 0, $fileInfo->getSize() ?? 0,
$fileInfo->getType() ?? 'N/A', $fileInfo->getType() ?? 'N/A',
$fileInfo->getPath(),
$content
); );
} }
@ -47,20 +44,10 @@ readonly class DirContent
return $this->type; return $this->type;
} }
public function getPath(): string private function getHumanReadableSize()
{
return $this->path;
}
public function getContent(): string
{
return $this->content;
}
private function getHumanReadableSize(): string
{ {
$bytes = $this->size; $bytes = $this->size;
$size = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; $size = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
$factor = floor((strlen((string) $bytes) - 1) / 3); $factor = floor((strlen((string) $bytes) - 1) / 3);
return sprintf("%.1f %s", $bytes / (1024 ** $factor), $size[$factor]); return sprintf("%.1f %s", $bytes / (1024 ** $factor), $size[$factor]);

View File

@ -7,7 +7,7 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
class UploadedFileData class UploadedFileData
{ {
/** /**
* @var UploadedFile[] $files * @var UploadedFile[] $file
*/ */
public array $files; public array $file;
} }

View File

@ -4,7 +4,6 @@ namespace App\Service;
use App\Objects\DirContent; use App\Objects\DirContent;
use Symfony\Component\DependencyInjection\Attribute\Autowire; use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\Filesystem\Exception\IOException;
use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\Finder;
use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\File\UploadedFile;
@ -24,7 +23,7 @@ class FileSystemService
public function getDirs(string $dirs): array public function getDirs(string $dirs): array
{ {
$finder = new Finder(); $finder = new Finder();
$finder->in($this->getTotalPath($dirs)); $finder->in($this->dir . '/' . $dirs);
$contents = []; $contents = [];
@ -41,40 +40,7 @@ class FileSystemService
public function uploadFile(array $files): void public function uploadFile(array $files): void
{ {
foreach ($files as $file) { foreach ($files as $file) {
$this->filesystem->dumpFile($this->getTotalPath($file->getClientOriginalName()), $file->getContent()); $this->filesystem->dumpFile($this->dir . '/' . $file->getClientOriginalName(), $file->getContent());
} }
} }
public function isFile(string $dirs): bool
{
try {
$this->filesystem->readFile($this->getTotalPath($dirs));
} catch (IOException) {
return false;
}
return true;
}
public function getFile(string $filePath): DirContent
{
$dirs = explode('/', $filePath);
$fileName = array_pop($dirs);
$finder = new Finder();
$finder->in($this->getTotalPath(implode('/', $dirs)));
foreach ($finder as $file) {
if ($file->getFilename() === $fileName) {
return DirContent::make($file, $this->filesystem->readFile($this->getTotalPath($filePath)));
}
}
throw new \RuntimeException('File not found');
}
private function getTotalPath(string $filePath): string
{
return $this->dir . '/' . $filePath;
}
} }

View File

@ -16,9 +16,7 @@ class RoutingService
{ {
$dirsString = $request->attributes->get('dirs', ''); $dirsString = $request->attributes->get('dirs', '');
$dirs = explode('/', $dirsString); $dirs = explode('/', $dirsString);
if (array_pop($dirs) === '') {
array_pop($dirs); array_pop($dirs);
}
return $this->urlGenerator->generate('app_home', ['dirs' => implode('/', $dirs)]); return $this->urlGenerator->generate('app_home', ['dirs' => implode('/', $dirs)]);
} }

View File

@ -27,14 +27,14 @@
{{ form_start(fileForm, {'attr': {'data-controller': 'upload-file'}}) }} {{ form_start(fileForm, {'attr': {'data-controller': 'upload-file'}}) }}
<div class="flex items-center justify-center max-w-4xl mt-5"> <div class="flex items-center justify-center max-w-4xl mt-5">
<label for="upload_file_form_files" <label for="upload_file_form_file"
class="flex flex-col items-center justify-center w-full h-64 border-2 border-gray-300 border-dashed rounded-lg cursor-pointer bg-gray-50 dark:hover:bg-gray-800 dark:bg-gray-700 hover:bg-gray-100 dark:border-gray-600 dark:hover:border-gray-500 dark:hover:bg-gray-600"> class="flex flex-col items-center justify-center w-full h-64 border-2 border-gray-300 border-dashed rounded-lg cursor-pointer bg-gray-50 dark:hover:bg-gray-800 dark:bg-gray-700 hover:bg-gray-100 dark:border-gray-600 dark:hover:border-gray-500 dark:hover:bg-gray-600">
<div class="flex flex-col items-center justify-center pt-5 pb-6"> <div class="flex flex-col items-center justify-center pt-5 pb-6">
{{ ux_icon('file:upload', {height: '64px', width: '64px'}) }} {{ ux_icon('file:upload', {height: '64px', width: '64px'}) }}
<p class="mb-2 text-sm text-gray-500 dark:text-gray-400"><span class="font-semibold">Click to upload</span> <p class="mb-2 text-sm text-gray-500 dark:text-gray-400"><span class="font-semibold">Click to upload</span>
or drag and drop</p> or drag and drop</p>
</div> </div>
{{ form_widget(fileForm.files) }} {{ form_widget(fileForm.file) }}
<button type="submit" class="hidden"></button> <button type="submit" class="hidden"></button>
</label> </label>
</div> </div>

View File

@ -1,21 +0,0 @@
{% extends 'base.html.twig' %}
{% block title %}
{{ file.name }}
{% endblock %}
{% block body %}
<div class="max-w-2xl mx-auto my-8 p-6 bg-white shadow-lg rounded-lg border">
<a href="{{ routing_service.goBack(app.request) }}" class="inline-flex items-center text-blue-600 hover:text-blue-800 font-medium transition-colors">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2"
stroke="currentColor" class="w-5 h-5 mr-2">
<path stroke-linecap="round" stroke-linejoin="round" d="M15 19l-7-7 7-7"/>
</svg>
Back
</a>
<div class="mt-6 text-gray-700 overflow-auto max-h-96">
<p class="whitespace-pre-wrap leading-relaxed break-all text-balance">{{ file.content|raw }}</p>
</div>
</div>
{% endblock %}