From 43cbecc0a48c01a38aae331e38c14ab95bc178db Mon Sep 17 00:00:00 2001 From: feherpedro Date: Thu, 13 Aug 2020 23:12:13 +0200 Subject: [PATCH 1/2] rename uuid to uid --- src/Driver/BlueimpUploadDriver.php | 16 +++++++-------- src/Driver/DropzoneUploadDriver.php | 10 +++++----- src/Driver/NgFileUploadDriver.php | 12 ++++++------ src/Driver/PluploadUploadDriver.php | 6 +++--- src/Helper/ChunkHelpers.php | 24 +++++++++++------------ tests/Driver/DropzoneUploadDriverTest.php | 12 ++++++------ 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/Driver/BlueimpUploadDriver.php b/src/Driver/BlueimpUploadDriver.php index d320bbe..edae615 100644 --- a/src/Driver/BlueimpUploadDriver.php +++ b/src/Driver/BlueimpUploadDriver.php @@ -100,9 +100,9 @@ public function download(Request $request, StorageConfig $config): Response { $download = $request->query('download', false); if ($download !== false) { - $uuid = $request->query($this->fileParam); + $uid = $request->query($this->fileParam); - return $this->fileResponse($uuid, $config); + return $this->fileResponse($uid, $config); } $request->validate([ @@ -112,15 +112,15 @@ public function download(Request $request, StorageConfig $config): Response $originalFilename = $request->query($this->fileParam); $totalSize = $request->query('totalSize'); - $uuid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename); + $uid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename); - if (!$this->chunkExists($config, $uuid)) { + if (!$this->chunkExists($config, $uid)) { return new JsonResponse([ 'file' => null, ]); } - $chunk = Arr::last($this->chunks($config, $uuid)); + $chunk = Arr::last($this->chunks($config, $uid)); $size = explode('-', basename($chunk))[1] + 1; return new JsonResponse([ @@ -154,9 +154,9 @@ public function save(Request $request, StorageConfig $config, Closure $fileUploa throw new BadRequestHttpException($e->getMessage(), $e); } - $uuid = $this->identifier->generateFileIdentifier($range->getTotal(), $file->getClientOriginalName()); + $uid = $this->identifier->generateFileIdentifier($range->getTotal(), $file->getClientOriginalName()); - $chunks = $this->storeChunk($config, $range, $file, $uuid); + $chunks = $this->storeChunk($config, $range, $file, $uid); if (!$range->isLast()) { return new PercentageJsonResponse($range->getPercentage()); @@ -167,7 +167,7 @@ public function save(Request $request, StorageConfig $config, Closure $fileUploa $path = $this->mergeChunks($config, $chunks, $targetFilename); if ($config->sweep()) { - $this->deleteChunkDirectory($config, $uuid); + $this->deleteChunkDirectory($config, $uid); } $this->triggerFileUploadedEvent($config->getDisk(), $path, $fileUploaded); diff --git a/src/Driver/DropzoneUploadDriver.php b/src/Driver/DropzoneUploadDriver.php index d37f953..755f299 100644 --- a/src/Driver/DropzoneUploadDriver.php +++ b/src/Driver/DropzoneUploadDriver.php @@ -76,7 +76,7 @@ public function save(Request $request, StorageConfig $config, Closure $fileUploa */ private function isMonolithRequest(Request $request): bool { - return $request->post('dzuuid') === null + return $request->post('dzuid') === null && $request->post('dzchunkindex') === null && $request->post('dztotalfilesize') === null && $request->post('dzchunksize') === null @@ -90,7 +90,7 @@ private function isMonolithRequest(Request $request): bool private function validateChunkRequest(Request $request): void { $request->validate([ - 'dzuuid' => 'required', + 'dzuid' => 'required', 'dzchunkindex' => 'required', 'dztotalfilesize' => 'required', 'dzchunksize' => 'required', @@ -139,9 +139,9 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $ throw new BadRequestHttpException($e->getMessage(), $e); } - $uuid = $request->post('dzuuid'); + $uid = $request->post('dzuid'); - $chunks = $this->storeChunk($config, $range, $file, $uuid); + $chunks = $this->storeChunk($config, $range, $file, $uid); if (!$range->isFinished($chunks)) { return new PercentageJsonResponse($range->getPercentage($chunks)); @@ -152,7 +152,7 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $ $path = $this->mergeChunks($config, $chunks, $targetFilename); if ($config->sweep()) { - $this->deleteChunkDirectory($config, $uuid); + $this->deleteChunkDirectory($config, $uid); } $this->triggerFileUploadedEvent($config->getDisk(), $path, $fileUploaded); diff --git a/src/Driver/NgFileUploadDriver.php b/src/Driver/NgFileUploadDriver.php index 6f5ee66..31c81e4 100644 --- a/src/Driver/NgFileUploadDriver.php +++ b/src/Driver/NgFileUploadDriver.php @@ -64,16 +64,16 @@ private function resume(Request $request, StorageConfig $config): Response $originalFilename = $request->get('file'); $totalSize = $request->get('totalSize'); - $uuid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename); + $uid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename); - if (!$this->chunkExists($config, $uuid)) { + if (!$this->chunkExists($config, $uid)) { return new JsonResponse([ 'file' => $originalFilename, 'size' => 0, ]); } - $chunk = Arr::last($this->chunks($config, $uuid)); + $chunk = Arr::last($this->chunks($config, $uid)); $size = explode('-', basename($chunk))[1] + 1; return new JsonResponse([ @@ -151,9 +151,9 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $ $originalFilename = $file->getClientOriginalName(); $totalSize = $request->get('_totalSize'); - $uuid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename); + $uid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename); - $chunks = $this->storeChunk($config, $range, $file, $uuid); + $chunks = $this->storeChunk($config, $range, $file, $uid); if (!$range->isLast()) { return new PercentageJsonResponse($range->getPercentage()); @@ -164,7 +164,7 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $ $path = $this->mergeChunks($config, $chunks, $targetFilename); if ($config->sweep()) { - $this->deleteChunkDirectory($config, $uuid); + $this->deleteChunkDirectory($config, $uid); } $this->triggerFileUploadedEvent($config->getDisk(), $path, $fileUploaded); diff --git a/src/Driver/PluploadUploadDriver.php b/src/Driver/PluploadUploadDriver.php index 38e377f..808caa6 100644 --- a/src/Driver/PluploadUploadDriver.php +++ b/src/Driver/PluploadUploadDriver.php @@ -95,9 +95,9 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $ throw new BadRequestHttpException($e->getMessage(), $e); } - $uuid = $this->identifier->generateFileIdentifier($range->getTotal(), $file->getClientOriginalName()); + $uid = $this->identifier->generateFileIdentifier($range->getTotal(), $file->getClientOriginalName()); - $chunks = $this->storeChunk($config, $range, $file, $uuid); + $chunks = $this->storeChunk($config, $range, $file, $uid); if (!$range->isLast()) { return new PercentageJsonResponse($range->getPercentage()); @@ -108,7 +108,7 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $ $path = $this->mergeChunks($config, $chunks, $targetFilename); if ($config->sweep()) { - $this->deleteChunkDirectory($config, $uuid); + $this->deleteChunkDirectory($config, $uid); } $this->triggerFileUploadedEvent($config->getDisk(), $path, $fileUploaded); diff --git a/src/Helper/ChunkHelpers.php b/src/Helper/ChunkHelpers.php index 9af364c..ec33268 100644 --- a/src/Helper/ChunkHelpers.php +++ b/src/Helper/ChunkHelpers.php @@ -53,11 +53,11 @@ public function mergeChunks(StorageConfig $config, array $chunks, string $target * Delete a directory with the given name from the chunk directory. * * @param \CodingSocks\ChunkUploader\StorageConfig $config - * @param string $uuid + * @param string $uid */ - public function deleteChunkDirectory(StorageConfig $config, string $uuid): void + public function deleteChunkDirectory(StorageConfig $config, string $uid): void { - $directory = $config->getChunkDirectory() . '/' . $uuid; + $directory = $config->getChunkDirectory() . '/' . $uid; Storage::disk($config->getDisk())->deleteDirectory($directory); } @@ -67,15 +67,15 @@ public function deleteChunkDirectory(StorageConfig $config, string $uuid): void * @param \CodingSocks\ChunkUploader\StorageConfig $config * @param \CodingSocks\ChunkUploader\Range\Range $range * @param \Illuminate\Http\UploadedFile $file - * @param string $uuid + * @param string $uid * * @return array */ - public function storeChunk(StorageConfig $config, Range $range, UploadedFile $file, string $uuid): array + public function storeChunk(StorageConfig $config, Range $range, UploadedFile $file, string $uid): array { $chunkname = $this->buildChunkname($range); - $directory = $config->getChunkDirectory() . '/' . $uuid; + $directory = $config->getChunkDirectory() . '/' . $uid; $file->storeAs($directory, $chunkname, [ 'disk' => $config->getDisk(), ]); @@ -87,13 +87,13 @@ public function storeChunk(StorageConfig $config, Range $range, UploadedFile $fi * List all chunks from a directory with the given name. * * @param \CodingSocks\ChunkUploader\StorageConfig $config - * @param string $uuid + * @param string $uid * * @return array */ - public function chunks(StorageConfig $config, string $uuid): array + public function chunks(StorageConfig $config, string $uid): array { - $directory = $config->getChunkDirectory() . '/' . $uuid; + $directory = $config->getChunkDirectory() . '/' . $uid; return Storage::disk($config->getDisk())->files($directory); } @@ -119,14 +119,14 @@ public function buildChunkname(Range $range): string * When chunkname is given it checks the exact chunk. Otherwise only the folder has to exists. * * @param \CodingSocks\ChunkUploader\StorageConfig $config - * @param string $uuid + * @param string $uid * @param string|null $chunkname * * @return bool */ - public function chunkExists(StorageConfig $config, string $uuid, string $chunkname = null): bool + public function chunkExists(StorageConfig $config, string $uid, string $chunkname = null): bool { - $directory = $config->getChunkDirectory() . '/' . $uuid; + $directory = $config->getChunkDirectory() . '/' . $uid; $disk = Storage::disk($config->getDisk()); if (!$disk->exists($directory)) { diff --git a/tests/Driver/DropzoneUploadDriverTest.php b/tests/Driver/DropzoneUploadDriverTest.php index f7ae5be..7037a80 100644 --- a/tests/Driver/DropzoneUploadDriverTest.php +++ b/tests/Driver/DropzoneUploadDriverTest.php @@ -106,7 +106,7 @@ public function testUploadMonolithWithCallback() public function excludedPostParameterProvider() { return [ - 'dzuuid' => ['dzuuid'], + 'dzuid' => ['dzuid'], 'dzchunkindex' => ['dzchunkindex'], 'dztotalfilesize' => ['dztotalfilesize'], 'dzchunksize' => ['dzchunksize'], @@ -121,7 +121,7 @@ public function excludedPostParameterProvider() public function testPostParameterValidation($exclude) { $arr = [ - 'dzuuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', + 'dzuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', 'dzchunkindex' => 0, 'dztotalfilesize' => 200, 'dzchunksize' => 100, @@ -144,7 +144,7 @@ public function testUploadFirstChunk() { $file = UploadedFile::fake()->create('test.txt', 100); $request = Request::create('', Request::METHOD_POST, [ - 'dzuuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', + 'dzuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', 'dzchunkindex' => 0, 'dztotalfilesize' => 200, 'dzchunksize' => 100, @@ -169,7 +169,7 @@ public function testUploadFirstChunkWithCallback() { $file = UploadedFile::fake()->create('test.txt', 100); $request = Request::create('', Request::METHOD_POST, [ - 'dzuuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', + 'dzuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', 'dzchunkindex' => 0, 'dztotalfilesize' => 200, 'dzchunksize' => 100, @@ -194,7 +194,7 @@ public function testUploadLastChunk() $file = UploadedFile::fake()->create('test.txt', 100); $request = Request::create('', Request::METHOD_POST, [ - 'dzuuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', + 'dzuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', 'dzchunkindex' => 1, 'dztotalfilesize' => 200, 'dzchunksize' => 100, @@ -222,7 +222,7 @@ public function testUploadLastChunkWithCallback() $file = UploadedFile::fake()->create('test.txt', 100); $request = Request::create('', Request::METHOD_POST, [ - 'dzuuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', + 'dzuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', 'dzchunkindex' => 1, 'dztotalfilesize' => 200, 'dzchunksize' => 100, From 9368f84e9dfc4fefee33d38386f3202a1c5f0cf3 Mon Sep 17 00:00:00 2001 From: feherpedro Date: Fri, 14 Aug 2020 12:37:51 +0200 Subject: [PATCH 2/2] fix: rename dzuid to dzuuid --- src/Driver/DropzoneUploadDriver.php | 6 +++--- tests/Driver/DropzoneUploadDriverTest.php | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Driver/DropzoneUploadDriver.php b/src/Driver/DropzoneUploadDriver.php index 755f299..e8d82a8 100644 --- a/src/Driver/DropzoneUploadDriver.php +++ b/src/Driver/DropzoneUploadDriver.php @@ -76,7 +76,7 @@ public function save(Request $request, StorageConfig $config, Closure $fileUploa */ private function isMonolithRequest(Request $request): bool { - return $request->post('dzuid') === null + return $request->post('dzuuid') === null && $request->post('dzchunkindex') === null && $request->post('dztotalfilesize') === null && $request->post('dzchunksize') === null @@ -90,7 +90,7 @@ private function isMonolithRequest(Request $request): bool private function validateChunkRequest(Request $request): void { $request->validate([ - 'dzuid' => 'required', + 'dzuuid' => 'required', 'dzchunkindex' => 'required', 'dztotalfilesize' => 'required', 'dzchunksize' => 'required', @@ -139,7 +139,7 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $ throw new BadRequestHttpException($e->getMessage(), $e); } - $uid = $request->post('dzuid'); + $uid = $request->post('dzuuid'); $chunks = $this->storeChunk($config, $range, $file, $uid); diff --git a/tests/Driver/DropzoneUploadDriverTest.php b/tests/Driver/DropzoneUploadDriverTest.php index 7037a80..f7ae5be 100644 --- a/tests/Driver/DropzoneUploadDriverTest.php +++ b/tests/Driver/DropzoneUploadDriverTest.php @@ -106,7 +106,7 @@ public function testUploadMonolithWithCallback() public function excludedPostParameterProvider() { return [ - 'dzuid' => ['dzuid'], + 'dzuuid' => ['dzuuid'], 'dzchunkindex' => ['dzchunkindex'], 'dztotalfilesize' => ['dztotalfilesize'], 'dzchunksize' => ['dzchunksize'], @@ -121,7 +121,7 @@ public function excludedPostParameterProvider() public function testPostParameterValidation($exclude) { $arr = [ - 'dzuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', + 'dzuuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', 'dzchunkindex' => 0, 'dztotalfilesize' => 200, 'dzchunksize' => 100, @@ -144,7 +144,7 @@ public function testUploadFirstChunk() { $file = UploadedFile::fake()->create('test.txt', 100); $request = Request::create('', Request::METHOD_POST, [ - 'dzuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', + 'dzuuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', 'dzchunkindex' => 0, 'dztotalfilesize' => 200, 'dzchunksize' => 100, @@ -169,7 +169,7 @@ public function testUploadFirstChunkWithCallback() { $file = UploadedFile::fake()->create('test.txt', 100); $request = Request::create('', Request::METHOD_POST, [ - 'dzuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', + 'dzuuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', 'dzchunkindex' => 0, 'dztotalfilesize' => 200, 'dzchunksize' => 100, @@ -194,7 +194,7 @@ public function testUploadLastChunk() $file = UploadedFile::fake()->create('test.txt', 100); $request = Request::create('', Request::METHOD_POST, [ - 'dzuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', + 'dzuuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', 'dzchunkindex' => 1, 'dztotalfilesize' => 200, 'dzchunksize' => 100, @@ -222,7 +222,7 @@ public function testUploadLastChunkWithCallback() $file = UploadedFile::fake()->create('test.txt', 100); $request = Request::create('', Request::METHOD_POST, [ - 'dzuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', + 'dzuuid' => '2494cefe4d234bd331aeb4514fe97d810efba29b', 'dzchunkindex' => 1, 'dztotalfilesize' => 200, 'dzchunksize' => 100,