Smaller changes

biigle · May 21, 2024 · 3bcce9e · 3bcce9e
1 parent 4225371
commit 3bcce9e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/Http/Requests/StoreStorageRequestFile.php b/src/Http/Requests/StoreStorageRequestFile.php
@@ -108,7 +108,7 @@ public function withValidator($validator)
             $shouldDeletePreviousChunks = false;
 
             if ($file->getSize() > $user->storage_quota_remaining) {
-                $validator->errors()->add('storage_exceeded', 'The file size exceeds the available storage quota.');
+                $validator->errors()->add('file', 'The file size exceeds the available storage quota.');
                 $shouldDeletePreviousChunks = true;
             }
 
@@ -170,6 +170,7 @@ public function withValidator($validator)
             $existsInOtherRequest = StorageRequestFile::join('storage_requests', 'storage_requests.id', '=', 'storage_request_files.storage_request_id')
                 ->where('storage_requests.id', '!=', $this->storageRequest->id)
                 ->where('storage_requests.user_id', $this->storageRequest->user_id)
+                // Don't use $path here, because it contains directory name
                 ->where('storage_request_files.path','LIKE', '%'.$filename.'%')
                 ->exists();
 

diff --git a/src/Jobs/DeleteStorageRequestFile.php b/src/Jobs/DeleteStorageRequestFile.php
@@ -77,7 +77,7 @@ public function handle()
         $file = StorageRequestFile::where('path','=',$this->path);
 
         // Do not delete files when delete-request is outdated
-        if($file->exists() && $this->retryCount != $file->first()->retry_count){
+        if($file->exists() && $this->retryCount != $file->first()->retry_count) {
             return;
         }
 
@@ -111,7 +111,7 @@ public function handle()
             }
         }
 
-        if($file->exists()){
+        if($file->exists()) {
             $file->delete();
         }
     }

diff --git a/src/resources/views/create.blade.php b/src/resources/views/create.blade.php
@@ -131,7 +131,7 @@ class="btn btn-success"
         </div>
         <div v-cloak v-if="finishIncomplete && !loading" class="panel panel-warning text-center">
             <div class="panel-body text-warning">
-                <p><i class="fa fa-exclamation-triangle"> </i></p><p>Some file uploads failed.</p>
+                <p><i class="fa fa-exclamation-triangle"> </i></p><p>Some file uploads failed</p>
                 <p>
                 <button class="btn btn-default btn" title="Skip failed uploads" v-on:click="skipFailedFiles"> 
                     <i class="fa fa-arrow-left"></i> Skip

diff --git a/tests/Http/Controllers/Api/StorageRequestFileControllerTest.php b/tests/Http/Controllers/Api/StorageRequestFileControllerTest.php
@@ -526,14 +526,15 @@ public function testStoreChunkChunkIndexExists()
             ])
             ->assertStatus(200);
 
+        // Duplicated chunks do not cause errors any more
         $res2 = $this->postJson("/api/v1/storage-requests/{$id}/files", [
                 'file' => $file,
                 'chunk_index' => 0,
                 'chunk_total' => 2,
             ])
             ->assertStatus(200);
 
-        // Filemodel is just returned
+        // File model is just returned
         $this->assertEquals($res1->getContent(), $res2->getContent());
     }