Create a file with new number if it exists

Author: mafftor

src/LfmPath.php

@@ -288,7 +288,7 @@ private function uploadValidator($file)
 
         $new_file_name = $this->getNewName($file);
 
-        if ($this->setName($new_file_name)->exists() && !config('lfm.over_write_on_duplicate', false)) {
+        if ($this->setName($new_file_name)->exists() && config('lfm.rename_file.duplicate', '-%s') === false) {
             return $this->error('file-exist');
         }
 
@@ -310,24 +310,54 @@ private function uploadValidator($file)
         return true;
     }
 
-    private function getNewName($file)
+    /**
+     * Generate new name for file
+     *
+     * @param UploadedFile $file
+     * @return string
+     */
+    private function getNewName($file): string
     {
-        $new_file_name = $this->helper
-            ->translateFromUtf8(trim(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)));
+        $name = $this->helper->translateFromUtf8(trim(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)));
 
         if (config('lfm.rename_file.uniqid', false) === true) {
-            $new_file_name = uniqid();
+            $name = uniqid();
         } elseif (config('lfm.rename_file.slug', true) === true) {
-            $new_file_name = Str::slug($new_file_name);
+            $name = Str::slug($name);
         }
 
-        $extension = $file->getClientOriginalExtension();
+        return $this->uniquifyName($name, $file->getClientOriginalExtension());
+    }
 
-        if ($extension) {
-            $new_file_name .= '.' . $extension;
-        }
 
-        return $new_file_name;
+    /**
+     * Generate unique name for file if it necessary
+     *
+     * @param string $name
+     * @param string $extension
+     * @return string
+     */
+    private function uniquifyName(string $name, string $extension): string
+    {
+        $duplicate = config('lfm.rename_file.duplicate', '-%s');
+        $i = 0;
+
+        do {
+            $result = $name;
+
+            if ($i && is_string($duplicate)) {
+                $result .= sprintf($duplicate, $i);
+            }
+
+            // Append the extension if it exists
+            if ($extension) {
+                $result .= '.' . $extension;
+            }
+
+            $i++;
+        } while (is_string($duplicate) ? $this->setName($result)->exists() : false);
+
+        return $result;
     }
 
     private function saveFile($file, $new_file_name)

src/config/lfm.php

@@ -38,14 +38,14 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Shared folder / Private folder
+    | Folder privacy
     |--------------------------------------------------------------------------
     |
     | If both options are set to false, then shared folder will be activated.
     |
     */
 
-    'allow_private_folder' => true,
+    'allow_private_folder' => false,
 
     // Flexible way to customize client folders accessibility
     // If you want to customize client folders, publish tag="lfm_handler"
@@ -123,7 +123,7 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Upload / Validation
+    | Upload and Validation
     |--------------------------------------------------------------------------
     |
     | We highly recommend you to leave alphanumeric setting by default (true)
@@ -139,44 +139,45 @@
     'should_validate_size' => true,
     'should_validate_mime' => true,
 
-    // behavior on files with identical name
-    // setting it to true cause old file replace with new one
-    // setting it to false show `error-file-exist` error and stop upload
-    'over_write_on_duplicate' => false,
-
     /*
     |--------------------------------------------------------------------------
-    | File naming
+    | File naming [Upload]
     |--------------------------------------------------------------------------
     |
-    | It works only when you're uploading a new file!
+    | 'uniqid' - Generate a unique ID (length:13) (e.g. 5e94a2653ef6a)
+    | 'slug' - Generate friendly "slug" ("Te sT 1.txt" => "te-st-1.txt")
     |
-    | rename_file.uniqid - Generate a unique ID (length:13) (e.g 5e94a2653ef6a)
-    | rename_file.slug - Generate friendly "slug" ("Te sT .txt" => "te-st.txt")
+    | 'duplicate' - behavior on files with identical name
+    |   '-%s' - create new file with postfix file.txt => file-1.txt, file-2.txt
+    |     where '%s' is number '-1', '-2' will be generated automatically
+    |   true - old file will be replaced with new one
+    |   false - will show `error-file-exist` error and stop upload
     |
-    | Make sure that you have enabled only one feature of rename_file because
-    | of conflicts
+    | Note!
+    |   Make sure that you have enabled only one feature of rename_file
+    |   'uniqid' or 'slug' because of conflicts
     |
     */
 
     'rename_file' => [
         'uniqid' => false,
         'slug' => true,
+
+        'duplicate' => '-%s',
     ],
 
     /*
     |--------------------------------------------------------------------------
-    | Compressing
+    | Compression
     |--------------------------------------------------------------------------
     |
     | Define the quality of the image. Data ranging from 0
     | (poor quality, small file) to 100 (best quality, big file).
     | Quality is only applied if you're encoding JPG format
     | since PNG compression is lossless and does not affect image quality.
     |
-    | Default: 90
-    | Recommended: 80-90
-    | Disable: false
+    | 90 - default value, recommended value is between 80-90
+    | false - to disable compression
     |
     */