arrange configs

Author: streamtw

src/LfmPath.php

@@ -243,18 +243,15 @@ private function uploadValidator($file)
         $type_key = $this->helper->currentLfmType();
 
         if (config('lfm.should_validate_mime', false)) {
-            $mine_config = 'lfm.valid_' . $type_key . '_mimetypes';
-            $valid_mimetypes = config($mine_config, []);
-            if (false === in_array($mimetype, $valid_mimetypes)) {
+            if (false === in_array($mimetype, $this->helper->availableMimeTypes())) {
                 return $this->error('mime') . $mimetype;
             }
         }
 
         if (config('lfm.should_validate_size', false)) {
-            $max_size = config('lfm.max_' . $type_key . '_size', 0);
             // size to kb unit is needed
             $file_size = $file->getSize() / 1000;
-            if ($file_size > $max_size) {
+            if ($file_size > $this->helper->maxUploadSize()) {
                 return $this->error('size') . $file_size;
             }
         }
@@ -294,8 +291,6 @@ public function makeThumbnail($filename)
         // create folder for thumbnails
         $this->setName(null)->thumb(true)->createFolder();
 
-        \Log::info($this->thumb(false)->setName($filename)->path('absolute'));
-
         // generate cropped thumbnail
         Image::make($this->thumb(false)->setName($filename)->path('absolute'))
             ->fit(config('lfm.thumb_img_width', 200), config('lfm.thumb_img_height', 200))

src/config/lfm.php

@@ -97,19 +97,8 @@
 
     'should_validate_size'   => false,
 
-
     'should_validate_mime'   => false,
 
-    // If true, image thumbnails would be created during upload
-    'should_create_thumbnails' => true,
-
-    // Create thumbnails automatically only for listed types.
-    'raster_mimetypes' => [
-        'image/jpeg',
-        'image/pjpeg',
-        'image/png',
-    ],
-
     // permissions to be set when create a new folder or when it creates automatically with thumbnails
     'create_folder_mode' => 0755,
 
@@ -118,10 +107,20 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Thumbnail Dimensions
+    | Thumbnail
     |--------------------------------------------------------------------------
     */
 
+    // If true, image thumbnails would be created during upload
+    'should_create_thumbnails' => true,
+
+    // Create thumbnails automatically only for listed types.
+    'raster_mimetypes' => [
+        'image/jpeg',
+        'image/pjpeg',
+        'image/png',
+    ],
+
     'thumb_img_width'  => 200,
 
     'thumb_img_height' => 200,