refactor thumbnails related functions

Author: streamtw

src/LfmFileRepository.php

@@ -44,9 +44,9 @@ public function move($new_lfm_path)
         return File::move($this->path, $new_lfm_path->path('storage'));
     }
 
-    public function save($file, $new_filename)
+    public function save($file)
     {
-        $dest_file_path = $this->path . '/' . $new_filename;
+        $dest_file_path = $this->path;
 
         File::move($file->getRealPath(), $dest_file_path);
 

src/LfmPath.php

@@ -276,7 +276,7 @@ private function saveFile($file, $new_filename)
     {
         $should_create_thumbnail = $this->shouldCreateThumb($file);
 
-        $this->setName(null)->thumb(false)->storage->save($file, $new_filename);
+        $this->setName($new_filename)->thumb(false)->storage->save(file_get_contents($file));
 
         if ($should_create_thumbnail) {
             $this->makeThumbnail($new_filename);
@@ -290,21 +290,14 @@ public function makeThumbnail($filename)
         // create folder for thumbnails
         $this->setName(null)->thumb(true)->createFolder();
 
-        $image_path = $this->thumb(false)->setName($filename)->path('storage');
-
-        $image_content = $this->storage->get($image_path);
-
-        $thumb_path = $this->thumb(true)->setName($filename)->path('absolute');
+        $image_content = $this->thumb(false)->setName($filename)->get();
 
         // generate cropped thumbnail
         $image = Image::make($image_content)
             ->fit(config('lfm.thumb_img_width', 200), config('lfm.thumb_img_height', 200))
-            ->save($thumb_path);
-
-        \Log::info($this->storage->rootPath());
-        \Log::info($thumb_path);
+            ->encode();
 
-        $this->setName(null)->thumb(true)->storage->save(new UploadedFile($thumb_path, $filename), $filename);
+        $this->setName($filename)->thumb(true)->storage->save($image);
     }
 
     private function shouldCreateThumb($file)

src/LfmStorageRepository.php

@@ -42,19 +42,19 @@ public function move($new_lfm_path)
         return $this->disk->move($this->path, $new_lfm_path->path('storage'));
     }
 
-    public function save($file, $new_filename)
+    public function save($file_content)
     {
-        $this->disk->putFileAs($this->path, $file, $new_filename);
+        $this->disk->put($this->path, $file_content);
     }
 
     public function url($path)
     {
         return $this->disk->url($path);
     }
 
-    public function makeDirectory($mode, $recursive, $force)
+    public function makeDirectory()
     {
-        $this->disk->makeDirectory($this->path, $mode, $recursive, $force);
+        $this->disk->makeDirectory($this->path, ...$arguments);
 
         $this->disk->setVisibility($this->path, 'public');
     }

src/RepositoryContract.php

@@ -8,5 +8,5 @@ public function rootPath();
 
     public function move($new_lfm_path);
 
-    public function save($file, $new_filename);
+    public function save($file);
 }