Merge pull request #403 from moebrowne/bugfix/generated-duplicate-file-names-not-always-unique

Generated Numeric File Name Suffixes Are Not Always Unique

Modules/Media/Repositories/Eloquent/EloquentFileRepository.php

@@ -127,14 +127,23 @@ class EloquentFileRepository extends EloquentBaseRepository implements FileRepos
     private function getNewUniqueFilename($fileName)
     {
         $fileNameOnly = pathinfo($fileName, PATHINFO_FILENAME);
-        $model = $this->model->where('filename', 'LIKE', "$fileNameOnly%")->orderBy('created_at', 'desc')->first();
-        $latestFilename = pathinfo($model->filename, PATHINFO_FILENAME);
-        $extension = pathinfo($model->filename, PATHINFO_EXTENSION);
+        $extension = pathinfo($fileName, PATHINFO_EXTENSION);
 
-        $version = substr($latestFilename, -1, strpos($latestFilename, '_'));
-        $version++;
+        $models = $this->model->where('filename', 'LIKE', "$fileNameOnly%")->get();
 
-        return $fileNameOnly . '_' . $version . '.' . $extension;
+        $versionCurrent = $models->reduce(function ($carry, $model) {
+            $latestFilename = pathinfo($model->filename, PATHINFO_FILENAME);
+
+            if (preg_match('/_([0-9]+)$/', $latestFilename, $matches) !== 1) {
+                return $carry;
+            }
+
+            $version = (int)$matches[1];
+
+            return ($version > $carry) ? $version : $carry;
+        }, 0);
+
+        return $fileNameOnly . '_' . ($versionCurrent+1) . '.' . $extension;
     }
 
     /**

Modules/Media/Tests/EloquentFileRepositoryTest.php

@@ -103,10 +103,11 @@ class EloquentFileRepositoryTest extends MediaTestCase
         $this->assertEquals('my-file_2.jpg', $this->file->find(3)->filename);
     }
 
-    public function it_weird_edge_case()
+    /** @test */
+    public function it_can_increment_file_name_version_to_a_number_higher_than_any_existing()
     {
         $file = $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('my-file.jpg'));
-        $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('my-file_1.jpg'));
+        $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('my-file.jpg'));
         $this->file->destroy($file);
         sleep(1);
         $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('my-file.jpg'));