add image type

AliGhaleyan · Feb 27, 2020 · aff3c26 · aff3c26
1 parent 9bba7c2
commit aff3c26
Show file tree

Hide file tree

Showing 11 changed files with 235 additions and 45 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,8 @@
     "type": "library",
     "require": {
         "php": "^7.2",
-        "laravel/framework": "^6.2"
+        "laravel/framework": "^6.2",
+        "intervention/image": "^2.5"
     },
     "keywords": [
         "file",

diff --git a/config/filemanager.php b/config/filemanager.php
@@ -5,16 +5,25 @@
 
     "types" => [
         "default" => [
-            "provider" => \AliGhale\FileManager\Types\File::class,
-            "path"     => "default_files/test/",
-            "private"  => false,
-            "date_time_prefix" => true,
+            "provider"                => \AliGhale\FileManager\Types\File::class,
+            "path"                    => "default_files/test/",
+            "private"                 => false,
+            "date_time_prefix"        => true,
             "use_file_name_to_upload" => false,
-            "secret" => "ashkdsjka#sdkdjfsj22188455$$#$%dsDFsdf",
-            "download_link_expire" => 160, // minutes
+            "secret"                  => "ashkdsjka#sdkdjfsj22188455$$#$%dsDFsdf",
+            "download_link_expire"    => 160, // minutes
+        ],
+
+        "image"   => [
+            "provider" => \AliGhale\FileManager\Types\Image::class,
+            "path"     => "images/upload/documents/",
+            "sizes"    => ["16", "24", "32", "64", "128", "320"],
+            "thumb"    => "320"
+        ],
+        "profile" => [
+            "parent"           => "image",
+            "path"             => "images/upload/profiles/",
+            "date_time_prefix" => false,
         ],
-//        "image"   => [
-//            //
-//        ],
     ],
 ];
diff --git a/src/BaseType.php b/src/BaseType.php
@@ -91,10 +91,7 @@ abstract class BaseType
      */
     private function __construct()
     {
-        $type = config("filemanager.type");
-        $config = filemanager_config();
-        $this->setConfig($config);
-        $this->fetchProperties();
+        //
     }
 
 
@@ -118,7 +115,7 @@ public static function getInstance()
      * @param array|null $config
      * @return $this
      */
-    protected function fetchProperties(array $config = null)
+    public function fetchProperties(array $config = null)
     {
         if (is_null($config)) $config = $this->getConfig();
 
@@ -207,11 +204,12 @@ public function upload($file)
     protected function createFileRow($name = null)
     {
         $file = File::create([
-            "name"    => $name ?? $this->getName() ?? $this->generateRandomName(),
-            "type"    => $this->getType(),
-            "path"    => $this->getFilePath(),
-            "format"  => $this->getFormat(),
-            "private" => $this->public ? false : true,
+            "name"      => $name ?? $this->getName() ?? $this->generateRandomName(),
+            "file_name" => $this->getFileName(),
+            "type"      => $this->getType(),
+            "base_path" => $this->getUploadPath(),
+            "format"    => $this->getFormat(),
+            "private"   => $this->public ? false : true,
         ]);
         $this->setFile($file);
         return $file;
@@ -347,6 +345,17 @@ public function getPath()
     }
 
 
+    /**
+     * get full path
+     *
+     * @return string
+     */
+    public function getFullPath()
+    {
+        return $this->getStorageFolder($this->getUploadPath());
+    }
+
+
     /**
      * get upload location path
      * we append the prefix
@@ -399,6 +408,19 @@ public function getPrefix()
     }
 
 
+    /**
+     * get set prefix
+     *
+     * @param $prefix
+     * @return string
+     */
+    public function setPrefix($prefix)
+    {
+        $this->prefix = $prefix;
+        return $this;
+    }
+
+
     /**
      * check storage path
      *
@@ -501,7 +523,7 @@ public function isPublic()
      * @param array $parameters
      * @return string
      */
-    public function getFilePath($parameters = [])
+    public function getFilePath()
     {
         return $this->getUploadPath() . $this->getFileName();
     }

diff --git a/src/Controllers/DownloadController.php b/src/Controllers/DownloadController.php
@@ -21,26 +21,32 @@ class DownloadController
      * @return BinaryFileResponse
      * @throws InternalErrorException
      */
-    public function download($id)
+    public function download($file)
     {
         /** @var File $file */
         $file = File::query()
-            ->findOrFail($id);
+            ->where("id", $file)
+            ->orWhere("name", $file)
+            ->firstOrFail();
 
         $config = filemanager_config();
 
-        $secret = "";
-        if ($config['secret']) {
-            $secret = $config['secret'];
-        }
-
-        $hash = $secret . $file->id . request()->ip() . request('t');
-
-        if ((Carbon::createFromTimestamp(request('t')) > Carbon::now()) &&
-            Hash::check($hash, request('mac'))) {
+        if ($file->isPublic) {
             return $file->download();
         } else {
-            throw new InternalErrorException("link not valid");
+            $secret = "";
+            if ($config['secret']) {
+                $secret = $config['secret'];
+            }
+
+            $hash = $secret . $file->id . request()->ip() . request('t');
+
+            if ((Carbon::createFromTimestamp(request('t')) > Carbon::now()) &&
+                Hash::check($hash, request('mac'))) {
+                return $file->download();
+            } else {
+                throw new InternalErrorException("link not valid");
+            }
         }
     }
 }
diff --git a/src/Facades/File.php b/src/Facades/File.php
@@ -14,7 +14,7 @@
  * @package AliGhale\FileManager\Facades
  *
  * @method static BaseType useFileNameToUpload($status = true)
- * @method static upload($file)
+ * @method static BaseType upload($file)
  * @method static \AliGhale\FileManager\Models\File getFile($name = null)
  * @method static BaseType setFile(File $file)
  * @method static BaseType setConfig(array $config)
@@ -26,6 +26,7 @@
  * @method static getUploadPath()
  * @method static BaseType dateTimePrefix($value = true)
  * @method static getPrefix()
+ * @method static BaseType setPrefix($prefix)
  * @method static getStorageFolder($src)
  * @method static BaseType setName(string $name)
  * @method static getName()
@@ -35,6 +36,8 @@
  * @method static BaseType isPublic()
  * @method static getFilePath($parameters = [])
  * @method static getFileName()
+ * @method static BaseType fetchProperties(array $config = null)
+ * @method static BaseType type($type = null)
  */
 class File extends Facade
 {

diff --git a/src/File.php b/src/File.php
@@ -9,20 +9,29 @@
 
 class File
 {
+    /**
+     * select type
+     *
+     * @param null $type
+     * @return \AliGhale\FileManager\BaseType
+     */
     public function type($type = null)
     {
         if (is_null($type))
             $type = config("filemanager.type");
 
-        $typeConfig = config("filemanager.types.{$type}");
+        $config = filemanager_config($type);
 
         /** @var BaseType $providerClass */
-        $providerClass = $typeConfig['provider'];
+        $providerClass = $config['provider'];
         $providerClass = $providerClass::getInstance();
-        $providerClass->setType($type);
+        $providerClass->setType($type)
+            ->setConfig($config)
+            ->fetchProperties();
         return $providerClass;
     }
 
+
     public function __call($method, $parameters)
     {
         return $this->type()->$method(...$parameters);

diff --git a/src/FileManagerServiceProvider.php b/src/FileManagerServiceProvider.php
@@ -33,10 +33,10 @@ public function registerConfig()
 
     public function registerMigrations()
     {
-        $this->loadMigrationsFrom(__DIR__ . '/Migrations');
         $this->publishes([
-            __DIR__ . '/Migrations/' => database_path('migrations')
+            realpath(__DIR__ . '/Migrations') => database_path('migrations')
         ], 'migrations');
+        $this->loadMigrationsFrom(realpath(__DIR__ . '/Migrations'));
     }
 
     protected function registerRoutes()

diff --git a/src/Migrations/2020_02_18_155709_serjik_file_manager.php b/src/Migrations/2020_02_18_155709_serjik_file_manager.php
@@ -17,7 +17,8 @@ public function up()
         Schema::create('files', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name')->unique();
-            $table->text('path');
+            $table->string('file_name')->unique();
+            $table->text('base_path');
             $table->tinyInteger('private')->default(0);
             $table->string("type")->default("default");
             $table->timestamp('created_at')->default(DB::raw('CURRENT_TIMESTAMP'));

diff --git a/src/Models/File.php b/src/Models/File.php
@@ -16,7 +16,8 @@
  *
  * @property $id
  * @property $name
- * @property $path
+ * @property $file_name
+ * @property $base_path
  * @property $private
  * @property $isPrivate
  * @property $isPublic
@@ -30,7 +31,8 @@ class File extends Model
     protected $fillable = [
         "id",
         "name",
-        "path",
+        "file_name",
+        "base_path",
         "private",
         "type",
         "created_at",
@@ -46,6 +48,17 @@ public function getIsPrivateAttribute()
     {
         return $this->private ? true : false;
     }
+
+
+    /**
+     * is private this file
+     *
+     * @return bool
+     */
+    public function getPathAttribute()
+    {
+        return $this->base_path . $this->file_name;
+    }
 
 
     /**
@@ -75,7 +88,7 @@ public function generateLink()
         }
 
         if (isset($config['download_link_expire'])) {
-            $expireTime = (int) $config['download_link_expire'];
+            $expireTime = (int)$config['download_link_expire'];
         }
 
         /** @var int $expireTime */