v3.4.0

ctf0 · Sep 21, 2019 · 1535538 · 1535538
1 parent cc3e535
commit 1535538
Show file tree

Hide file tree

Showing 26 changed files with 1,047 additions and 635 deletions.
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
@@ -12,14 +12,14 @@
         "MediaManager"
     ],
     "authors": [
-       {
-           "name": "Muah",
-           "email": "[email protected]"
-       }
-   ],
+        {
+            "name": "Muah",
+            "email": "[email protected]"
+        }
+    ],
     "require": {
-        "php" : "~7.0",
-        "illuminate/support": "5.4 - 5.8",
+        "php": "~7.0",
+        "illuminate/support": "5.4 - 6.0",
         "maennchen/zipstream-php": "~1.0",
         "ctf0/package-changelog": "*"
     },

diff --git a/logs/v3.2.7.txt b/logs/v3.2.7.txt
diff --git a/logs/v3.4.0.txt b/logs/v3.4.0.txt
@@ -0,0 +1,8 @@
+- move db file from logs to database
+- remove db connection auto register for Lock Files & Folder, check: https://github.com/ctf0/Laravel-Media-Manager/wiki/Lock-Files-&-Folder
+- add support for laravel 6.0
+- some cleanup to the js code
+- add support to preview files before uploading (along with total uploads & size)
+- remove deprecated laravel helper methods
+- fix incorrect upload panel img paths
+- update date-fns imports
diff --git a/src/Commands/PackageSetup.php b/src/Commands/PackageSetup.php
@@ -2,6 +2,7 @@
 
 namespace ctf0\MediaManager\Commands;
 
+use Illuminate\Support\Str;
 use Illuminate\Console\Command;
 
 class PackageSetup extends Command
@@ -66,6 +67,6 @@ public function handle()
      */
     protected function checkExist($file, $search)
     {
-        return $this->file->exists($file) && !str_contains($this->file->get($file), $search);
+        return $this->file->exists($file) && !Str::contains($this->file->get($file), $search);
     }
 }
diff --git a/src/Controllers/MediaController.php b/src/Controllers/MediaController.php
@@ -43,15 +43,16 @@ class MediaController extends Controller
 
     public function __construct()
     {
-        $config                = app('config')->get('mediaManager');
-        $this->fileSystem      = array_get($config, 'storage_disk');
-        $this->ignoreFiles     = array_get($config, 'ignore_files');
-        $this->fileChars       = array_get($config, 'allowed_fileNames_chars');
-        $this->folderChars     = array_get($config, 'allowed_folderNames_chars');
-        $this->sanitizedText   = array_get($config, 'sanitized_text');
-        $this->unallowedMimes  = array_get($config, 'unallowed_mimes');
-        $this->LMF             = array_get($config, 'last_modified_format');
-        $this->GFI             = array_get($config, 'get_folder_info', true);
+        $config = app('config')->get('mediaManager');
+
+        $this->fileSystem     = $config['storage_disk'];
+        $this->ignoreFiles    = $config['ignore_files'];
+        $this->fileChars      = $config['allowed_fileNames_chars'];
+        $this->folderChars    = $config['allowed_folderNames_chars'];
+        $this->sanitizedText  = $config['sanitized_text'];
+        $this->unallowedMimes = $config['unallowed_mimes'];
+        $this->LMF            = $config['last_modified_format'];
+        $this->GFI            = $config['get_folder_info'] ?? true;
 
         $this->storageDisk     = app('filesystem')->disk($this->fileSystem);
         $this->storageDiskInfo = app('config')->get("filesystems.disks.{$this->fileSystem}");

diff --git a/src/Controllers/Modules/Move.php b/src/Controllers/Modules/Move.php
@@ -57,9 +57,9 @@ public function moveItem(Request $request)
                             if (app('files')->copyDirectory($old, $new)) {
                                 $result[] = array_merge($defaults, ['success' => true]);
                             } else {
-                                $exc = array_get($this->storageDiskInfo, 'root')
-                                            ? trans('MediaManager::messages.error.moving')
-                                            : trans('MediaManager::messages.error.moving_cloud');
+                                $exc = isset($this->storageDiskInfo['root'])
+                                        ? trans('MediaManager::messages.error.moving')
+                                        : trans('MediaManager::messages.error.moving_cloud');
 
                                 throw new Exception($exc);
                             }
@@ -92,7 +92,7 @@ public function moveItem(Request $request)
                         } else {
                             $exc = trans('MediaManager::messages.error.moving');
 
-                            if ($file_type == 'folder' && !array_get($this->storageDiskInfo, 'root')) {
+                            if ($file_type == 'folder' && !isset($this->storageDiskInfo['root'])) {
                                 $exc = trans('MediaManager::messages.error.moving_cloud');
                             }
 

diff --git a/src/Controllers/Modules/Upload.php b/src/Controllers/Modules/Upload.php
@@ -3,6 +3,7 @@
 namespace ctf0\MediaManager\Controllers\Moduels;
 
 use Exception;
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use ctf0\MediaManager\Events\MediaFileOpsNotifications;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -39,7 +40,7 @@ public function upload(Request $request)
 
                 try {
                     // check for mime type
-                    if (str_contains($file_type, $this->unallowedMimes)) {
+                    if (Str::contains($file_type, $this->unallowedMimes)) {
                         throw new Exception(
                             trans('MediaManager::messages.not_allowed_file_ext', ['attr' => $file_type])
                         );
@@ -103,10 +104,10 @@ public function upload(Request $request)
     public function uploadEditedImage(Request $request)
     {
         if ($this->allowUpload()) {
-            $type        = $request->mime_type;
-            $path        = $request->path;
-            $original    = $request->name;
-            $data        = explode(',', $request->data)[1];
+            $type     = $request->mime_type;
+            $path     = $request->path;
+            $original = $request->name;
+            $data     = explode(',', $request->data)[1];
 
             $name_only   = pathinfo($original, PATHINFO_FILENAME) . '_' . $this->getRandomString();
             $ext_only    = pathinfo($original, PATHINFO_EXTENSION);
@@ -126,14 +127,14 @@ public function uploadEditedImage(Request $request)
 
                 // fire event
                 event('MMFileSaved', [
-                    'file_path'  => $this->getItemPath($destination),
-                    'mime_type'  => $type,
+                    'file_path' => $this->getItemPath($destination),
+                    'mime_type' => $type,
                 ]);
 
                 // broadcast
                 broadcast(new MediaFileOpsNotifications([
-                    'op'      => 'upload',
-                    'path'    => $path,
+                    'op'   => 'upload',
+                    'path' => $path,
                 ]))->toOthers();
 
                 $result = [
@@ -182,7 +183,7 @@ public function uploadLink(Request $request)
 
             try {
                 // check for mime type
-                if (str_contains($file_type, $this->unallowedMimes)) {
+                if (Str::contains($file_type, $this->unallowedMimes)) {
                     throw new Exception(
                         trans('MediaManager::messages.not_allowed_file_ext', ['attr' => $file_type])
                     );
@@ -200,8 +201,8 @@ public function uploadLink(Request $request)
 
                 // fire event
                 event('MMFileSaved', [
-                    'file_path'  => $this->getItemPath($destination),
-                    'mime_type'  => $file_type,
+                    'file_path' => $this->getItemPath($destination),
+                    'mime_type' => $file_type,
                 ]);
 
                 // broadcast

diff --git a/src/Controllers/Modules/Utils.php b/src/Controllers/Modules/Utils.php
@@ -40,14 +40,14 @@ protected function getItemPath($path)
     {
         $info = $this->storageDiskInfo;
         $url  = $this->resolveUrl($path); // get the file url
-        $root = array_get($info, 'root');
+        $root = $info['root'] ?? null;
 
         // for other disks without root ex."cloud"
         if (!$root) {
             return preg_replace('/(.*\/\/.*?)\//', '', $url); // get the full path
         }
 
-        $dir = str_replace(array_get($info, 'url'), '', $url); // remove the uri
+        $dir = str_replace($info['url'], '', $url); // remove the uri
 
         return $root . $dir; // get the full path
     }

diff --git a/src/MediaManagerServiceProvider.php b/src/MediaManagerServiceProvider.php
@@ -16,7 +16,6 @@ public function boot()
         $this->file = $this->app['files'];
 
         $this->packagePublish();
-        $this->extraConfigs();
         $this->socketRoute();
         $this->viewComp();
         $this->command();
@@ -36,7 +35,7 @@ protected function packagePublish()
 
         // database
         $this->publishes([
-            __DIR__ . '/database' => storage_path('logs'),
+            __DIR__ . '/database/MediaManager.sqlite' => database_path('MediaManager.sqlite'),
         ], 'db');
 
         $this->publishes([
@@ -61,19 +60,6 @@ protected function packagePublish()
         ], 'view');
     }
 
-    protected function extraConfigs()
-    {
-        // database
-        $db = storage_path('logs/MediaManager.sqlite');
-
-        if ($this->file->exists($db)) {
-            $this->app['config']->set('database.connections.mediamanager', [
-                'driver'   => 'sqlite',
-                'database' => $db,
-            ]);
-        }
-    }
-
     protected function socketRoute()
     {
         Broadcast::channel('User.{id}.media', function ($user, $id) {
@@ -93,8 +79,8 @@ protected function viewComp()
         // base url
         $config = $this->app['config']->get('mediaManager');
         $url    = $this->app['filesystem']
-            ->disk(array_get($config, 'storage_disk'))
-            ->url('/');
+                    ->disk($config['storage_disk'])
+                    ->url('/');
 
         $data['base_url'] = preg_replace('/\/+$/', '/', $url);
 
@@ -105,7 +91,9 @@ protected function viewComp()
             $patterns = collect(
                 $this->file->allFiles($pattern_path)
             )->map(function ($item) {
-                return preg_replace('/.*\/patterns/', '/assets/vendor/MediaManager/patterns', $item->getPathName());
+                $name = str_replace('\\', '/', $item->getPathName());
+
+                return preg_replace('/.*\/patterns/', '/assets/vendor/MediaManager/patterns', $name);
             });
 
             $data['patterns'] = json_encode($patterns);
@@ -138,4 +126,4 @@ public function register()
     {
         $this->app->register(PackageChangeLogServiceProvider::class);
     }
-}
+}
diff --git a/src/config/mediaManager.php b/src/config/mediaManager.php
@@ -65,7 +65,7 @@
     /*
      * when file names gets cleand up
      *
-     * put here any global function that 
+     * put here any global function that
      * doesnt take arguments
      */
     'sanitized_text' => 'uniqid',
@@ -119,4 +119,9 @@
      * above the manager
      */
     'show_ratio_bar' => true,
+
+    /*
+     * preview and remove files b4 uploading
+     */
+    'preview_files_before_upload' => true,
 ];
diff --git a/src/resources/assets/dist/noPreview.jpg b/src/resources/assets/dist/noPreview.jpg
diff --git a/src/resources/assets/js/components/imageEditor/main.vue b/src/resources/assets/js/components/imageEditor/main.vue
@@ -1,6 +1,5 @@
 <template>
     <div ref="editor" class="card __editor">
-
         <!-- btns -->
         <div class="top">
             <div class="__top-toolbar">
@@ -13,8 +12,8 @@
                              :caman-filters="camanFilters"
                              class="__left-index"/>
 
-                             <!-- glitch -->
-                             <!-- <glitch v-if="showGlitch"
+                    <!-- glitch -->
+                    <!-- <glitch v-if="showGlitch"
                             :cropper="imageCropper"
                             :show-glitch="showGlitch"
                             :get-cropper-data="getCropperData"
@@ -32,8 +31,8 @@
                     </button> -->
 
                     <!-- diff toggle -->
-                    <button v-tippy="{arrow: true, theme: 'mm'}"
-                            v-if="showDiffBtn()"
+                    <button v-if="showDiffBtn()"
+                            v-tippy="{arrow: true, theme: 'mm'}"
                             :disabled="processing && !imageDiffIsReady || showGlitch"
                             :class="{'is-active': showDiff}"
                             :title="trans('diff')"
@@ -149,6 +148,7 @@ export default {
     },
     props: [
         'file',
+        'noScroll',
         'translations',
         'route',
         'url'
@@ -205,9 +205,12 @@ export default {
                     'pointer-events': 'none'
                 }
             }
+
+            return {}
         }
     },
     created() {
+        this.noScroll('add')
         window.addEventListener('dblclick', this.onDblClick)
     },
     mounted() {
@@ -217,6 +220,7 @@ export default {
     beforeDestroy() {
         window.removeEventListener('dblclick', this.onDblClick)
         this.imageCropper.destroy()
+        this.noScroll('remove')
     },
     methods: {
         // init
@@ -322,14 +326,13 @@ export default {
             let cropper = this.imageCropper
             let getData = cropper.getData()
 
-            this.hasChanged =
+            this.hasChanged = (
                 getData.rotate != 0 ||
                 getData.scaleX != 1 ||
                 getData.scaleY != 1 ||
                 cropper.cropped ||
                 this.haveFilters()
-                    ? true
-                    : false
+            ) ? true : false
         },
         resetAll() {
             this.$nextTick(() => {