Skip to content

Commit b585e5c

Browse files
feherpedrofeherpedro
authored
rename uuid to uid (#69)
* rename uuid to uid
1 parent a32bfdd commit b585e5c

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed

‎src/Driver/BlueimpUploadDriver.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ public function download(Request $request, StorageConfig $config): Response
100100
{
101101
$download = $request->query('download', false);
102102
if ($download !== false) {
103-
$uuid = $request->query($this->fileParam);
103+
$uid = $request->query($this->fileParam);
104104

105-
return $this->fileResponse($uuid, $config);
105+
return $this->fileResponse($uid, $config);
106106
}
107107

108108
$request->validate([
@@ -112,15 +112,15 @@ public function download(Request $request, StorageConfig $config): Response
112112

113113
$originalFilename = $request->query($this->fileParam);
114114
$totalSize = $request->query('totalSize');
115-
$uuid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename);
115+
$uid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename);
116116

117-
if (!$this->chunkExists($config, $uuid)) {
117+
if (!$this->chunkExists($config, $uid)) {
118118
return new JsonResponse([
119119
'file' => null,
120120
]);
121121
}
122122

123-
$chunk = Arr::last($this->chunks($config, $uuid));
123+
$chunk = Arr::last($this->chunks($config, $uid));
124124
$size = explode('-', basename($chunk))[1] + 1;
125125

126126
return new JsonResponse([
@@ -154,9 +154,9 @@ public function save(Request $request, StorageConfig $config, Closure $fileUploa
154154
throw new BadRequestHttpException($e->getMessage(), $e);
155155
}
156156

157-
$uuid = $this->identifier->generateFileIdentifier($range->getTotal(), $file->getClientOriginalName());
157+
$uid = $this->identifier->generateFileIdentifier($range->getTotal(), $file->getClientOriginalName());
158158

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

161161
if (!$range->isLast()) {
162162
return new PercentageJsonResponse($range->getPercentage());
@@ -167,7 +167,7 @@ public function save(Request $request, StorageConfig $config, Closure $fileUploa
167167
$path = $this->mergeChunks($config, $chunks, $targetFilename);
168168

169169
if ($config->sweep()) {
170-
$this->deleteChunkDirectory($config, $uuid);
170+
$this->deleteChunkDirectory($config, $uid);
171171
}
172172

173173
$this->triggerFileUploadedEvent($config->getDisk(), $path, $fileUploaded);

‎src/Driver/DropzoneUploadDriver.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $
139139
throw new BadRequestHttpException($e->getMessage(), $e);
140140
}
141141

142-
$uuid = $request->post('dzuuid');
142+
$uid = $request->post('dzuuid');
143143

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

146146
if (!$range->isFinished($chunks)) {
147147
return new PercentageJsonResponse($range->getPercentage($chunks));
@@ -152,7 +152,7 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $
152152
$path = $this->mergeChunks($config, $chunks, $targetFilename);
153153

154154
if ($config->sweep()) {
155-
$this->deleteChunkDirectory($config, $uuid);
155+
$this->deleteChunkDirectory($config, $uid);
156156
}
157157

158158
$this->triggerFileUploadedEvent($config->getDisk(), $path, $fileUploaded);

‎src/Driver/NgFileUploadDriver.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ private function resume(Request $request, StorageConfig $config): Response
6464

6565
$originalFilename = $request->get('file');
6666
$totalSize = $request->get('totalSize');
67-
$uuid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename);
67+
$uid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename);
6868

69-
if (!$this->chunkExists($config, $uuid)) {
69+
if (!$this->chunkExists($config, $uid)) {
7070
return new JsonResponse([
7171
'file' => $originalFilename,
7272
'size' => 0,
7373
]);
7474
}
7575

76-
$chunk = Arr::last($this->chunks($config, $uuid));
76+
$chunk = Arr::last($this->chunks($config, $uid));
7777
$size = explode('-', basename($chunk))[1] + 1;
7878

7979
return new JsonResponse([
@@ -151,9 +151,9 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $
151151

152152
$originalFilename = $file->getClientOriginalName();
153153
$totalSize = $request->get('_totalSize');
154-
$uuid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename);
154+
$uid = $this->identifier->generateFileIdentifier($totalSize, $originalFilename);
155155

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

158158
if (!$range->isLast()) {
159159
return new PercentageJsonResponse($range->getPercentage());
@@ -164,7 +164,7 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $
164164
$path = $this->mergeChunks($config, $chunks, $targetFilename);
165165

166166
if ($config->sweep()) {
167-
$this->deleteChunkDirectory($config, $uuid);
167+
$this->deleteChunkDirectory($config, $uid);
168168
}
169169

170170
$this->triggerFileUploadedEvent($config->getDisk(), $path, $fileUploaded);

‎src/Driver/PluploadUploadDriver.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $
9595
throw new BadRequestHttpException($e->getMessage(), $e);
9696
}
9797

98-
$uuid = $this->identifier->generateFileIdentifier($range->getTotal(), $file->getClientOriginalName());
98+
$uid = $this->identifier->generateFileIdentifier($range->getTotal(), $file->getClientOriginalName());
9999

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

102102
if (!$range->isLast()) {
103103
return new PercentageJsonResponse($range->getPercentage());
@@ -108,7 +108,7 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $
108108
$path = $this->mergeChunks($config, $chunks, $targetFilename);
109109

110110
if ($config->sweep()) {
111-
$this->deleteChunkDirectory($config, $uuid);
111+
$this->deleteChunkDirectory($config, $uid);
112112
}
113113

114114
$this->triggerFileUploadedEvent($config->getDisk(), $path, $fileUploaded);

‎src/Helper/ChunkHelpers.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ public function mergeChunks(StorageConfig $config, array $chunks, string $target
5353
* Delete a directory with the given name from the chunk directory.
5454
*
5555
* @param \CodingSocks\ChunkUploader\StorageConfig $config
56-
* @param string $uuid
56+
* @param string $uid
5757
*/
58-
public function deleteChunkDirectory(StorageConfig $config, string $uuid): void
58+
public function deleteChunkDirectory(StorageConfig $config, string $uid): void
5959
{
60-
$directory = $config->getChunkDirectory() . '/' . $uuid;
60+
$directory = $config->getChunkDirectory() . '/' . $uid;
6161
Storage::disk($config->getDisk())->deleteDirectory($directory);
6262
}
6363

@@ -67,15 +67,15 @@ public function deleteChunkDirectory(StorageConfig $config, string $uuid): void
6767
* @param \CodingSocks\ChunkUploader\StorageConfig $config
6868
* @param \CodingSocks\ChunkUploader\Range\Range $range
6969
* @param \Illuminate\Http\UploadedFile $file
70-
* @param string $uuid
70+
* @param string $uid
7171
*
7272
* @return array
7373
*/
74-
public function storeChunk(StorageConfig $config, Range $range, UploadedFile $file, string $uuid): array
74+
public function storeChunk(StorageConfig $config, Range $range, UploadedFile $file, string $uid): array
7575
{
7676
$chunkname = $this->buildChunkname($range);
7777

78-
$directory = $config->getChunkDirectory() . '/' . $uuid;
78+
$directory = $config->getChunkDirectory() . '/' . $uid;
7979
$file->storeAs($directory, $chunkname, [
8080
'disk' => $config->getDisk(),
8181
]);
@@ -87,13 +87,13 @@ public function storeChunk(StorageConfig $config, Range $range, UploadedFile $fi
8787
* List all chunks from a directory with the given name.
8888
*
8989
* @param \CodingSocks\ChunkUploader\StorageConfig $config
90-
* @param string $uuid
90+
* @param string $uid
9191
*
9292
* @return array
9393
*/
94-
public function chunks(StorageConfig $config, string $uuid): array
94+
public function chunks(StorageConfig $config, string $uid): array
9595
{
96-
$directory = $config->getChunkDirectory() . '/' . $uuid;
96+
$directory = $config->getChunkDirectory() . '/' . $uid;
9797
return Storage::disk($config->getDisk())->files($directory);
9898
}
9999

@@ -119,14 +119,14 @@ public function buildChunkname(Range $range): string
119119
* When chunkname is given it checks the exact chunk. Otherwise only the folder has to exists.
120120
*
121121
* @param \CodingSocks\ChunkUploader\StorageConfig $config
122-
* @param string $uuid
122+
* @param string $uid
123123
* @param string|null $chunkname
124124
*
125125
* @return bool
126126
*/
127-
public function chunkExists(StorageConfig $config, string $uuid, string $chunkname = null): bool
127+
public function chunkExists(StorageConfig $config, string $uid, string $chunkname = null): bool
128128
{
129-
$directory = $config->getChunkDirectory() . '/' . $uuid;
129+
$directory = $config->getChunkDirectory() . '/' . $uid;
130130
$disk = Storage::disk($config->getDisk());
131131

132132
if (!$disk->exists($directory)) {

0 commit comments

Comments
 (0)