FIXES AND IMPROVEMENTS

Fix errors on Media Manager component in windows platform regarding
directory separators..

Author: darryldecode

src/Darryldecode/Backend/Base/Registrar/Registrar.php

@@ -13,7 +13,7 @@ class Registrar {
     /**
      * the laravel backend version
      */
-    const VERSION = '1.0.26';
+    const VERSION = '1.0.27';
     const VERSION_NAME = 'Alpha';
 
     /**

src/Darryldecode/Backend/Components/MediaManager/Commands/ListCommand.php

@@ -39,7 +39,7 @@ public function __construct($path = null, $disablePermissionChecking = false)
      */
     public function handle(Filesystem $filesystem, Repository $config)
     {
-        $path = (is_null($this->path)) ? '/' : $this->path;
+        $path = (is_null($this->path)) ? DIRECTORY_SEPARATOR : $this->path;
 
         $response = [];
         $response['files']          = $filesystem->files($path);
@@ -73,10 +73,9 @@ protected function isResultIsEmpty($files, $directories)
      */
     protected function breakDownPath($path)
     {
-
         if( $path == '/' ) return array('/');
 
-        $paths = explode('/',trim($path,'/'));
+        $paths = explode(DIRECTORY_SEPARATOR,trim($path,'/'));
 
         array_unshift($paths, '/');
 

src/Darryldecode/Backend/Components/MediaManager/Commands/UploadCommand.php

@@ -42,9 +42,10 @@ public function __construct($files = null, $path = null, $disablePermissionCheck
     /**
      * @param Repository $config
      * @param Image $image
+     * @param Filesystem $filesystem
      * @return CommandResult
      */
-    public function handle(Repository $config,Image $image)
+    public function handle(Repository $config,Image $image,Filesystem $filesystem)
     {
         // check if user has permission
         if( ! $this->disablePermissionChecking )
@@ -65,11 +66,11 @@ public function handle(Repository $config,Image $image)
 
             // save the file
             $file->move(
-                $config->get('filesystems.disks.local.root').'/'.$this->normalizePath($path),
+                $this->getCurrentFullPath($config,$path),
                 $normalizedFileName
             );
 
-            $filePath  = $config->get('filesystems.disks.local.root').'/'.$this->normalizePath($path).'/'.$normalizedFileName;
+            $filePath  = $this->getCurrentFullPath($config,$path).$normalizedFileName;
             $file_name = pathinfo($filePath, PATHINFO_FILENAME);
             $extension = pathinfo($filePath, PATHINFO_EXTENSION);
 
@@ -80,11 +81,18 @@ public function handle(Repository $config,Image $image)
             {
                 foreach($sizes as $key => $dimension)
                 {
+                    $targetDir = $this->getCurrentFullPath($config,$path).$key.DIRECTORY_SEPARATOR;
+
+                    if( ! $filesystem->exists($targetDir) )
+                    {
+                        $filesystem->makeDirectory($this->normalizePath($path).DIRECTORY_SEPARATOR.$key.DIRECTORY_SEPARATOR);
+                    }
+
                     $image::createThumbnail(
                         $filePath,
                         $dimension[0],
                         $dimension[1],
-                        $config->get('filesystems.disks.local.root').'/'.$this->normalizePath($path).'/'.$this->produceThumbFileName($file_name,$key,$extension)
+                        $targetDir.$file_name.'.'.$extension
                     );
                 }
             }
@@ -121,6 +129,16 @@ protected function produceThumbFileName($file_name, $file_size_name, $file_exten
         return $file_name.'_'.$file_size_name.'.'.$file_extension;
     }
 
+    /**
+     * @param Repository $config
+     * @param string $path
+     * @return string
+     */
+    protected function getCurrentFullPath($config, $path)
+    {
+        return $config->get('filesystems.disks.local.root').DIRECTORY_SEPARATOR.$this->normalizePath($path).DIRECTORY_SEPARATOR;
+    }
+
     /**
      * when uploading a file, we will remove dashes because dashes are use in UI as size convention
      *

src/Darryldecode/Backend/Components/MediaManager/Views/mediaManager.blade.php

@@ -58,7 +58,6 @@
                     </div>
                     <div data-ng-repeat="f in files.files" class="col-lg-2 col-md-2 col-sm-4">
                         <div class="file-thumb">
-                            <label class="label label-info pull-left label-file-size">Size: @{{::getSizeName(f)}}</label>
                             <file-preview file-source="@{{f}}"></file-preview>
                             <div class="text-wrap meta-data-holder trim-info-xs">
                                 <a href="" data-toggle="tooltip" data-placement="bottom" title="@{{f}}" class="file-name">@{{::getLastSegment(f)}}</a>