From f86cf3b0a18ff71745da9cc343fc823a068aba17 Mon Sep 17 00:00:00 2001
From: ARCANEDEV <arcanedev.maroc@gmail.com>
Date: Sun, 12 Feb 2017 16:26:32 +0000
Subject: [PATCH] Updating the Media Manager

---
 config/media.php                              |  28 +++-
 resources/assets/js/Helpers/Errors.vue        |  23 +++
 resources/assets/js/MediaManager.vue          |   9 +-
 .../assets/js/Modals/CreateFolderModal.vue    |  46 +++---
 .../assets/js/Modals/DeleteMediaModal.vue     |  38 +++--
 .../assets/js/Modals/RenameMediaModal.vue     |   3 +-
 .../assets/js/Modals/UploadMediaModal.vue     |   6 +-
 src/Contracts/Media.php                       |  40 ++++-
 src/Entities/DirectoryCollection.php          |  22 ++-
 src/Entities/FileCollection.php               |  23 ++-
 src/Exceptions/AccessNotAllowed.php           |   9 +
 src/Exceptions/DirectoryNotFound.php          |   9 +
 src/Exceptions/MediaException.php             |   9 +
 src/Helpers/ExcludePattern.php                |  36 ++++
 .../Controllers/Admin/MediasController.php    |   3 +-
 src/Media.php                                 | 156 +++++++++++++++---
 16 files changed, 375 insertions(+), 85 deletions(-)
 create mode 100644 resources/assets/js/Helpers/Errors.vue
 create mode 100644 src/Exceptions/AccessNotAllowed.php
 create mode 100644 src/Exceptions/DirectoryNotFound.php
 create mode 100644 src/Exceptions/MediaException.php
 create mode 100644 src/Helpers/ExcludePattern.php

diff --git a/config/media.php b/config/media.php
index 499eb1f..6e52afc 100644
--- a/config/media.php
+++ b/config/media.php
@@ -1,9 +1,9 @@
 <?php
 
 return [
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Filesystem
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     'filesystem' => [
         'default' => 'media',
@@ -17,11 +17,31 @@
         ],
     ],
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Route
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     'route' => [
         'prefix' => 'media',
     ],
+
+    /* -----------------------------------------------------------------
+     |  Directories
+     | -----------------------------------------------------------------
+     */
+    'directories' => [
+        'excluded' => [
+            //
+        ],
+    ],
+
+    /* -----------------------------------------------------------------
+     |  Files
+     | -----------------------------------------------------------------
+     */
+    'files' => [
+        'excluded' => [
+            '.gitignore',
+        ],
+    ],
 ];
diff --git a/resources/assets/js/Helpers/Errors.vue b/resources/assets/js/Helpers/Errors.vue
new file mode 100644
index 0000000..8fbc0d4
--- /dev/null
+++ b/resources/assets/js/Helpers/Errors.vue
@@ -0,0 +1,23 @@
+<template>
+    <ul class="list-unstyled" v-if="hasErrors">
+        <li v-for="error in errors">
+            <span class="label label-danger">{{ displayFirstError(error) }}</span>
+        </li>
+    </ul>
+</template>
+
+<script>
+    export default {
+        props: ['errors'],
+
+        methods: {
+            hasErrors() {
+                return this.errors.length > 0
+            },
+
+            displayFirstError(error) {
+                return _.first(error)
+            },
+        }
+    }
+</script>
diff --git a/resources/assets/js/MediaManager.vue b/resources/assets/js/MediaManager.vue
index e5d508d..646e8d6 100644
--- a/resources/assets/js/MediaManager.vue
+++ b/resources/assets/js/MediaManager.vue
@@ -86,8 +86,7 @@
 </template>
 
 <script>
-    import config from './Config'
-    import eventHub from './../../../shared/EventHub'
+    import config from './Config';
 
     export default {
         props: {
@@ -173,12 +172,14 @@
             currentUri() {
                 return this.breadcrumbs.length == 0 ? '/' : this.breadcrumbs.join('/')
             },
+
             selectedUri() {
                 if (this.selected == null)
                     return this.currentUri;
 
                 return this.currentUri + this.selected.name;
             },
+
             mediasCount() {
                 return this.medias.length;
             }
@@ -189,7 +190,7 @@
                 this.breadcrumbs = [];
                 this.resetSelected();
 
-                axios.get(config.endpoint + '/all').then((response) => {
+                axios.get(config.endpoint+'/all').then((response) => {
                     this.medias = response.data.data;
                     this.loading = false;
                 });
@@ -244,7 +245,7 @@
                 this.resetSelected();
                 this.loading = true;
 
-                axios.get(config.endpoint + '/all?location=' + location).then(response => {
+                axios.get(config.endpoint+'/all?location='+location).then(response => {
                     this.medias  = response.data.data;
                     this.loading = false;
                 });
diff --git a/resources/assets/js/Modals/CreateFolderModal.vue b/resources/assets/js/Modals/CreateFolderModal.vue
index 71c9327..fff6584 100644
--- a/resources/assets/js/Modals/CreateFolderModal.vue
+++ b/resources/assets/js/Modals/CreateFolderModal.vue
@@ -10,11 +10,7 @@
                     <div class="modal-body">
                         <input type="text" placeholder="Folder name" v-model="newDirectory" class="form-control" autofocus>
 
-                        <ul class="list-unstyled">
-                            <li v-for="error in errors">
-                                <span class="label label-danger">{{ errors.length }} {{ displayFirstError(error) }}</span>
-                            </li>
-                        </ul>
+                        <media-errors :errors="errors"></media-errors>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-sm btn-default pull-left" data-dismiss="modal">
@@ -31,8 +27,7 @@
 </template>
 
 <script>
-    import config from './../Config'
-    import eventHub from './../../../../shared/EventHub'
+    import config from './../Config';
 
     export default {
         props: ['location'],
@@ -40,24 +35,32 @@
         data () {
             return {
                 newDirectory: '',
-                errors: {}
+                modal: null,
+                submitBtn: null,
+                errors: []
             }
         },
 
+        components: {
+            'media-errors': require('./../Helpers/Errors.vue')
+        },
+
         created() {
-            let that = this;
+            let me = this;
 
             eventHub.$on('open-new-folder-modal', data => {
-                let modal = $('div#newFolderModal');
+                me.modal = $('div#newFolderModal');
+
+                me.submitBtn = me.modal.find('button[type="submit"]');
 
-                modal.modal('show');
+                me.modal.modal('show');
 
-                modal.on('shown.bs.modal', () => {
+                me.modal.on('shown.bs.modal', () => {
                     $(this).find('[autofocus]').focus();
                 });
 
-                modal.on('hidden.bs.modal', () => {
-                    that.resetErrors();
+                me.modal.on('hidden.bs.modal', () => {
+                    me.resetErrors();
                 })
             });
         },
@@ -66,35 +69,30 @@
             createFolder(e) {
                 this.resetErrors();
 
-                let $submitBtn = $(e.target.querySelector('button[type="submit"]'));
-                    $submitBtn.button('loading');
+                this.submitBtn.button('loading');
 
-                axios.post(config.endpoint + '/create', {
+                axios.post(config.endpoint+'/create', {
                         name: this.newDirectory,
                         location: this.location
                     })
                     .then(response => {
                         this.$parent.refreshDirectory();
 
-                        $('div#newFolderModal').modal('hide');
+                        this.modal.modal('hide');
 
                         this.$parent.mediaModalClosed();
 
                         this.newDirectory = '';
                     })
                     .catch(error => {
-                        $submitBtn.button('reset');
+                        this.submitBtn.button('reset');
 
                         this.errors = error.response.data.errors;
                     });
             },
 
-            displayFirstError(error) {
-                return _.first(error)
-            },
-
             resetErrors() {
-                this.errors = {};
+                this.errors = [];
             }
         }
     }
diff --git a/resources/assets/js/Modals/DeleteMediaModal.vue b/resources/assets/js/Modals/DeleteMediaModal.vue
index e4c7471..3b3df87 100644
--- a/resources/assets/js/Modals/DeleteMediaModal.vue
+++ b/resources/assets/js/Modals/DeleteMediaModal.vue
@@ -25,43 +25,59 @@
 </template>
 
 <script>
-    import config from './../Config'
-    import eventHub from './../../../../shared/EventHub'
+    import config from './../Config';
 
     export default {
         props: ['media'],
 
+        data() {
+            return {
+                modal: null,
+                submitBtn: null
+            }
+        },
+
+        components: {
+            'media-errors': require('./../Helpers/Errors.vue')
+        },
+
         created() {
-            let that = this;
+            let me = this;
 
             eventHub.$on('open-delete-media-modal', data => {
-                let modal = $('div#deleteFolderModal');
+                me.modal = $('div#deleteFolderModal');
+
+                me.submitBtn = me.modal.find('button[type="submit"]');
 
-                modal.modal({
+                me.modal.modal({
                     backdrop: 'static',
                     keyboard: false
                 });
-            })
+            });
         },
 
         methods: {
             deleteFolder(e) {
-                let $submitBtn = $(e.target.querySelector('button[type="submit"]'));
-                    $submitBtn.button('loading');
+                this.submitBtn.button('loading');
 
-                axios.post(config.endpoint + '/delete', {
+                axios.post(config.endpoint+'/delete', {
                         media: this.media
                     })
                     .then(response => {
                         this.$parent.refreshDirectory();
 
-                        $('div#deleteFolderModal').modal('hide');
+                        this.modal.modal('hide');
 
                         this.$parent.mediaModalClosed();
 
                         this.newDirectory = '';
 
-                        $submitBtn.button('reset');
+                        this.submitBtn.button('reset');
+                    })
+                    .catch(error => {
+                        this.submitBtn.button('reset');
+
+                        this.errors = error.response.data.errors;
                     });
             }
         }
diff --git a/resources/assets/js/Modals/RenameMediaModal.vue b/resources/assets/js/Modals/RenameMediaModal.vue
index c3ecb4e..68301a6 100644
--- a/resources/assets/js/Modals/RenameMediaModal.vue
+++ b/resources/assets/js/Modals/RenameMediaModal.vue
@@ -25,8 +25,7 @@
 </template>
 
 <script>
-    import config from './../Config'
-    import eventHub from './../../../../shared/EventHub'
+    import config from './../Config';
 
     export default {
         props: ['location', 'media'],
diff --git a/resources/assets/js/Modals/UploadMediaModal.vue b/resources/assets/js/Modals/UploadMediaModal.vue
index b8c4bb6..d867a4c 100644
--- a/resources/assets/js/Modals/UploadMediaModal.vue
+++ b/resources/assets/js/Modals/UploadMediaModal.vue
@@ -25,10 +25,8 @@
 </template>
 
 <script>
-    import config from './../Config'
-    import eventHub from './../../../../shared/EventHub'
-
-    import Dropzone from 'dropzone'
+    import config from './../Config';
+    import Dropzone from 'dropzone';
 
     Dropzone.autoDiscover = false;
 
diff --git a/src/Contracts/Media.php b/src/Contracts/Media.php
index b764f0b..0d2e55f 100644
--- a/src/Contracts/Media.php
+++ b/src/Contracts/Media.php
@@ -49,31 +49,31 @@ public function disk($driver = null);
     public function defaultDisk();
 
     /**
-     * Get all of the directories within a given directory.
+     * Get all the directories & files from a given location.
      *
      * @param  string  $directory
      *
-     * @return \Arcanesoft\Media\Entities\DirectoryCollection
+     * @return array
      */
-    public function directories($directory);
+    public function all($directory);
 
     /**
-     * Get a collection of all files in a directory.
+     * Get all of the directories within a given directory.
      *
      * @param  string  $directory
      *
-     * @return \Arcanesoft\Media\Entities\FileCollection
+     * @return \Arcanesoft\Media\Entities\DirectoryCollection
      */
-    public function files($directory);
+    public function directories($directory);
 
     /**
-     * Get all the directories & files from a given location.
+     * Get a collection of all files in a directory.
      *
      * @param  string  $directory
      *
-     * @return array
+     * @return \Arcanesoft\Media\Entities\FileCollection
      */
-    public function all($directory);
+    public function files($directory);
 
     /**
      * Store an array of files.
@@ -111,4 +111,26 @@ public function makeDirectory($path);
      * @return bool
      */
     public function move($from, $to);
+
+    /* -----------------------------------------------------------------
+     |  Check Methods
+     | -----------------------------------------------------------------
+     */
+    /**
+     * Determine if a file/directory exists.
+     *
+     * @param  string  $path
+     *
+     * @return bool
+     */
+    public function exists($path);
+
+    /**
+     * Check if the directory is excluded.
+     *
+     * @param  string  $directory
+     *
+     * @return bool
+     */
+    public function isExcludedDirectory($directory);
 }
diff --git a/src/Entities/DirectoryCollection.php b/src/Entities/DirectoryCollection.php
index 9a1ffba..31d9fdc 100644
--- a/src/Entities/DirectoryCollection.php
+++ b/src/Entities/DirectoryCollection.php
@@ -1,6 +1,7 @@
 <?php namespace Arcanesoft\Media\Entities;
 
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 
 /**
  * Class     DirectoryCollection
@@ -10,5 +11,24 @@
  */
 class DirectoryCollection extends Collection
 {
-    //
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
+     */
+    /**
+     * ExcludePattern directories with the given patterns.
+     *
+     * @param  array  $patterns
+     *
+     * @return self
+     */
+    public function exclude(array $patterns)
+    {
+        return $this->reject(function ($directory) use ($patterns) {
+            foreach ($patterns as $pattern)
+                if (Str::is($pattern, $directory['path'])) return true;
+
+            return false;
+        });
+    }
 }
diff --git a/src/Entities/FileCollection.php b/src/Entities/FileCollection.php
index b6e2fcb..3d2152e 100644
--- a/src/Entities/FileCollection.php
+++ b/src/Entities/FileCollection.php
@@ -1,6 +1,7 @@
 <?php namespace Arcanesoft\Media\Entities;
 
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 
 /**
  * Class     FileCollection
@@ -10,5 +11,25 @@
  */
 class FileCollection extends Collection
 {
-    //
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
+     */
+    /**
+     * ExcludePattern files with the given patterns.
+     *
+     * @param  array  $patterns
+     *
+     * @return self
+     */
+    public function exclude(array $patterns)
+    {
+        return $this->reject(function ($file) use ($patterns) {
+            foreach ($patterns as $pattern) {
+                if (Str::is($pattern, $file['name'])) return true;
+            }
+
+            return false;
+        });
+    }
 }
diff --git a/src/Exceptions/AccessNotAllowed.php b/src/Exceptions/AccessNotAllowed.php
new file mode 100644
index 0000000..6091f4b
--- /dev/null
+++ b/src/Exceptions/AccessNotAllowed.php
@@ -0,0 +1,9 @@
+<?php namespace Arcanesoft\Media\Exceptions;
+
+/**
+ * Class     AccessNotAllowed
+ *
+ * @package  Arcanesoft\Media\Exceptions
+ * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
+ */
+class AccessNotAllowed extends MediaException {}
diff --git a/src/Exceptions/DirectoryNotFound.php b/src/Exceptions/DirectoryNotFound.php
new file mode 100644
index 0000000..42ed151
--- /dev/null
+++ b/src/Exceptions/DirectoryNotFound.php
@@ -0,0 +1,9 @@
+<?php namespace Arcanesoft\Media\Exceptions;
+
+/**
+ * Class     DirectoryNotFound
+ *
+ * @package  Arcanesoft\Media\Exceptions
+ * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
+ */
+class DirectoryNotFound extends MediaException {}
diff --git a/src/Exceptions/MediaException.php b/src/Exceptions/MediaException.php
new file mode 100644
index 0000000..88b19f1
--- /dev/null
+++ b/src/Exceptions/MediaException.php
@@ -0,0 +1,9 @@
+<?php namespace Arcanesoft\Media\Exceptions;
+
+/**
+ * Class     MediaException
+ *
+ * @package  Arcanesoft\Media\Exceptions
+ * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
+ */
+class MediaException extends \Exception {}
diff --git a/src/Helpers/ExcludePattern.php b/src/Helpers/ExcludePattern.php
new file mode 100644
index 0000000..05c293a
--- /dev/null
+++ b/src/Helpers/ExcludePattern.php
@@ -0,0 +1,36 @@
+<?php namespace Arcanesoft\Media\Helpers;
+
+use Illuminate\Support\Str;
+
+/**
+ * Class     ExcludePattern
+ *
+ * @package  Arcanesoft\Media\Helpers
+ * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
+ */
+class ExcludePattern
+{
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
+     */
+    /**
+     * @param  array  $patterns
+     *
+     * @return array
+     */
+    public static function directories(array $patterns)
+    {
+        $patterns = array_map(function ($pattern) {
+            return trim($pattern, '/');
+        }, $patterns);
+
+        foreach ($patterns as $pattern) {
+            $patterns[] = Str::endsWith($pattern, '/*')
+                ? Str::replaceLast('/*', '', $pattern)
+                : $pattern.'/*';
+        }
+
+        return array_unique($patterns);
+    }
+}
diff --git a/src/Http/Controllers/Admin/MediasController.php b/src/Http/Controllers/Admin/MediasController.php
index 6cbc952..84c41c8 100644
--- a/src/Http/Controllers/Admin/MediasController.php
+++ b/src/Http/Controllers/Admin/MediasController.php
@@ -66,8 +66,7 @@ public function index()
      */
     public function getAll(Request $request)
     {
-        $location = $request->get('location');
-        $location = trim($location, '/');
+        $location = $request->get('location', '/');
 
         return response()->json([
             'status' => 'success',
diff --git a/src/Media.php b/src/Media.php
index 6400c93..869d408 100644
--- a/src/Media.php
+++ b/src/Media.php
@@ -1,9 +1,11 @@
 <?php namespace Arcanesoft\Media;
 
 use Arcanesoft\Media\Contracts\Media as MediaContract;
+use Arcanesoft\Media\Exceptions\DirectoryNotFound;
 use Carbon\Carbon;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Str;
 
 /**
  * Class     Media
@@ -72,6 +74,28 @@ public function getDefaultDiskName()
         return $this->config()->get('arcanesoft.media.filesystem.default');
     }
 
+    /**
+     * Get excluded directories.
+     *
+     * @return array
+     */
+    public function getExcludedDirectories()
+    {
+        return Helpers\ExcludePattern::directories(
+            $this->config()->get('arcanesoft.media.directories.excluded', [])
+        );
+    }
+
+    /**
+     * Get excluded files.
+     *
+     * @return array
+     */
+    public function getExcludedFiles()
+    {
+        return $this->config()->get('arcanesoft.media.files.excluded', []);
+    }
+
     /* -----------------------------------------------------------------
      |  Main Methods
      | -----------------------------------------------------------------
@@ -98,6 +122,26 @@ public function defaultDisk()
         return $this->disk($this->getDefaultDiskName());
     }
 
+    /**
+     * Get all the directories & files from a given location.
+     *
+     * @param  string  $directory
+     *
+     * @return array
+     */
+    public function all($directory)
+    {
+        $directories = $this->directories($directory)->transform(function ($item) {
+            return $item + ['type' => self::MEDIA_TYPE_DIRECTORY];
+        })->toArray();
+
+        $files = $this->files($directory)->transform(function (array $item) {
+            return $item + ['type' => self::MEDIA_TYPE_FILE];
+        })->toArray();
+
+        return array_merge($directories, $files);
+    }
+
     /**
      * Get all of the directories within a given directory.
      *
@@ -107,6 +151,8 @@ public function defaultDisk()
      */
     public function directories($directory)
     {
+        $this->checkDirectory($directory);
+
         $directories = array_map(function ($dir) use ($directory) {
             return [
                 'name' => str_replace("$directory/", '', $dir),
@@ -114,7 +160,8 @@ public function directories($directory)
             ];
         }, $this->defaultDisk()->directories($directory));
 
-        return Entities\DirectoryCollection::make($directories);
+        return Entities\DirectoryCollection::make($directories)
+            ->exclude($this->getExcludedDirectories());
     }
 
     /**
@@ -126,7 +173,9 @@ public function directories($directory)
      */
     public function files($directory)
     {
-        $disk  = $this->defaultDisk();
+        $this->checkDirectory($directory);
+
+        $disk = $this->defaultDisk();
 
         // TODO: Add a feature to exclude unwanted files.
         $files = array_map(function ($filePath) use ($disk, $directory) {
@@ -141,27 +190,8 @@ public function files($directory)
             ];
         }, $disk->files($directory));
 
-        return Entities\FileCollection::make($files);
-    }
-
-    /**
-     * Get all the directories & files from a given location.
-     *
-     * @param  string  $directory
-     *
-     * @return array
-     */
-    public function all($directory)
-    {
-        $directories = $this->directories($directory)->transform(function ($item) {
-            return $item + ['type' => self::MEDIA_TYPE_DIRECTORY];
-        })->toArray();
-
-        $files = $this->files($directory)->transform(function (array $item) {
-            return $item + ['type' => self::MEDIA_TYPE_FILE];
-        })->toArray();
-
-        return array_merge($directories, $files);
+        return Entities\FileCollection::make($files)
+            ->exclude($this->getExcludedFiles());
     }
 
     /**
@@ -214,4 +244,84 @@ public function move($from, $to)
     {
         return $this->defaultDisk()->move($from, $to);
     }
+
+    /* -----------------------------------------------------------------
+     |  Check Methods
+     | -----------------------------------------------------------------
+     */
+    /**
+     * Determine if a file/directory exists.
+     *
+     * @param  string  $path
+     *
+     * @return bool
+     */
+    public function exists($path)
+    {
+        return $this->defaultDisk()->exists($path);
+    }
+
+    /**
+     * Check if the directory is excluded.
+     *
+     * @param  string  $directory
+     *
+     * @return bool
+     */
+    public function isExcludedDirectory($directory)
+    {
+        foreach ($this->getExcludedDirectories() as $pattern) {
+            if (Str::is($pattern, $directory)) return true;
+        }
+
+        return false;
+    }
+
+    /* -----------------------------------------------------------------
+     |  Other Methods
+     | -----------------------------------------------------------------
+     */
+    /**
+     * Check the given directory location.
+     *
+     * @param  string  &$directory
+     *
+     * @throws \Arcanesoft\Media\Exceptions\DirectoryNotFound
+     * @throws \Arcanesoft\Media\Exceptions\AccessNotAllowed
+     */
+    protected function checkDirectory(&$directory)
+    {
+        $directory = trim($directory, '/');
+
+        $this->checkDirectoryExists($directory);
+        $this->checkDirectoryAccess($directory);
+    }
+
+    /**
+     * Check if the directory exists.
+     *
+     * @param  string  $directory
+     *
+     * @throws \Arcanesoft\Media\Exceptions\DirectoryNotFound
+     */
+    protected function checkDirectoryExists($directory)
+    {
+        if ( ! empty($directory) && ! $this->exists($directory)) {
+            throw new DirectoryNotFound("Directory [$directory] not found !", 404);
+        }
+    }
+
+    /**
+     * Check if can access the directory.
+     *
+     * @param  string  $directory
+     *
+     * @throws \Arcanesoft\Media\Exceptions\AccessNotAllowed
+     */
+    protected function checkDirectoryAccess($directory)
+    {
+        if ($this->isExcludedDirectory($directory)) {
+            throw new Exceptions\AccessNotAllowed('Access not allowed.', 405);
+        }
+    }
 }