Skip to content

rename uuid to uid #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 14, 2020
Merged

rename uuid to uid #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43cbecc
rename uuid to uid
feherpedro Aug 13, 2020
9368f84
fix: rename dzuid to dzuuid
feherpedro Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Driver/BlueimpUploadDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand All @@ -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([
Expand Down Expand Up @@ -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());
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/Driver/DropzoneUploadDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('dzuuid');

$chunks = $this->storeChunk($config, $range, $file, $uuid);
$chunks = $this->storeChunk($config, $range, $file, $uid);

if (!$range->isFinished($chunks)) {
return new PercentageJsonResponse($range->getPercentage($chunks));
Expand All @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions src/Driver/NgFileUploadDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand Down Expand Up @@ -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());
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/Driver/PluploadUploadDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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);
Expand Down
24 changes: 12 additions & 12 deletions src/Helper/ChunkHelpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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(),
]);
Expand All @@ -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);
}

Expand All @@ -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)) {
Expand Down