remove FileApi integration

Author: streamtw

src/Lfm.php

@@ -21,8 +21,8 @@ public function __construct(Config $config = null, Request $request = null)
 
     public function getStorage($storage_path)
     {
-        if ($this->config->get('lfm.driver') == 'storage') {
-            return new LfmStorageRepository($storage_path);
+        if ($this->config->get('lfm.driver') === 'storage') {
+            return new LfmStorageRepository($storage_path, $this->config->get('lfm.disk'));
         } else {
             return new LfmFileRepository($storage_path);
         }
@@ -230,7 +230,7 @@ public function shouldSetStorageRoute()
 
         $storage_root = $this->getStorage('/')->rootPath();
 
-        if ($driver === 'storage' && (ends_with($storage_root, 'public') && ends_with($storage_root, 'public/'))) {
+        if ($driver === 'storage' && (ends_with($storage_root, 'public') || ends_with($storage_root, 'public/'))) {
             return false;
         }
 

src/LfmFileRepository.php

@@ -82,10 +82,6 @@ public function directoryIsEmpty()
 
     public function save($file, $new_filename)
     {
-        $result_filename = $new_filename . '.' . $file->getClientOriginalExtension();
-        $new_filepath = $this->path . '/' . $result_filename;
-        File::move($file->getRealPath(), $new_filepath);
-
-        return $result_filename;
+        File::move($file->getRealPath(), $this->path . '/' . $new_filename);
     }
 }

src/LfmPath.php

@@ -255,22 +255,28 @@ private function getNewName($file)
             $new_filename = preg_replace('/[^A-Za-z0-9\-\']/', '_', $new_filename);
         }
 
+        $extension = $file->getClientOriginalExtension();
+
+        if ($extension) {
+            $new_filename .= '.' . $extension;
+        }
+
         return $new_filename;
     }
 
     private function saveFile($file, $new_filename)
     {
         $should_create_thumbnail = $this->shouldCreateThumb($file);
 
-        $filename = $this->setName(null)->thumb(false)->storage->save($file, $new_filename);
+        $this->setName(null)->thumb(false)->storage->save($file, $new_filename);
 
-        chmod($this->setName($filename)->thumb(false)->path('absolute'), config('lfm.create_file_mode', 0644));
+        chmod($this->setName($new_filename)->thumb(false)->path('absolute'), config('lfm.create_file_mode', 0644));
 
         if ($should_create_thumbnail) {
-            $this->makeThumbnail($filename);
+            $this->makeThumbnail($new_filename);
         }
 
-        return $filename;
+        return $new_filename;
     }
 
     public function makeThumbnail($filename)

src/LfmStorageRepository.php

@@ -7,15 +7,16 @@
 
 class LfmStorageRepository implements RepositoryContract
 {
-    const DISK_NAME = 'local'; // config('lfm.disk')
+    private $disk_name;
 
     private $disk;
 
     private $path;
 
-    public function __construct($storage_path)
+    public function __construct($storage_path, $disk_name)
     {
-        $this->disk = Storage::disk(self::DISK_NAME);
+        $this->disk_name = $disk_name;
+        $this->disk = Storage::disk($this->disk_name);
         $this->path = $storage_path;
     }
 
@@ -88,9 +89,7 @@ public function directoryIsEmpty()
 
     public function save($file, $new_filename)
     {
-        $new_filename = (new FileApi($this->path))->thumbs([])->save($file, $new_filename);
-
-        return $new_filename;
+        $this->disk->putFileAs($this->path, $file, $new_filename);
     }
 
     private function insertSuffix($suffix, $file_name)

src/config/lfm.php

@@ -89,6 +89,8 @@
 
     'driver' => 'file',
 
+    'disk' => 'local',
+
     'rename_file' => false,
 
     'alphanumeric_filename'  => false,

src/controllers/UploadController.php

@@ -9,7 +9,6 @@
 use UniSharp\LaravelFilemanager\Events\ImageIsUploading;
 use UniSharp\LaravelFilemanager\Events\ImageWasUploaded;
 use UniSharp\LaravelFilemanager\Lfm;
-use Unisharp\FileApi\FileApi;
 
 class UploadController extends LfmController
 {