diff --git a/src/BootExtension.php b/src/BootExtension.php index 2cd9bdf..268d91d 100644 --- a/src/BootExtension.php +++ b/src/BootExtension.php @@ -43,4 +43,4 @@ public static function import() parent::createPermission('Media manager', 'ext.media-manager', 'media*'); } -} \ No newline at end of file +} diff --git a/src/MediaController.php b/src/MediaController.php index 96ff2a0..47df705 100644 --- a/src/MediaController.php +++ b/src/MediaController.php @@ -12,7 +12,6 @@ class MediaController extends Controller public function index(Request $request) { return Admin::content(function (Content $content) use ($request) { - $content->header('Media manager'); $path = $request->get('path', '/'); @@ -25,7 +24,6 @@ public function index(Request $request) 'nav' => $manager->navigation(), 'url' => $manager->urls(), ])); - }); } @@ -65,13 +63,13 @@ public function delete(Request $request) try { if ($manager->delete($files)) { return response()->json([ - 'status' => true, - 'message' => trans('admin.delete_succeeded') + 'status' => true, + 'message' => trans('admin.delete_succeeded'), ]); } } catch (\Exception $e) { return response()->json([ - 'status' => true, + 'status' => true, 'message' => $e->getMessage(), ]); } @@ -80,20 +78,20 @@ public function delete(Request $request) public function move(Request $request) { $path = $request->get('path'); - $new = $request->get('new'); + $new = $request->get('new'); $manager = new MediaManager($path); try { if ($manager->move($new)) { return response()->json([ - 'status' => true, - 'message' => trans('admin.move_succeeded') + 'status' => true, + 'message' => trans('admin.move_succeeded'), ]); } } catch (\Exception $e) { return response()->json([ - 'status' => true, + 'status' => true, 'message' => $e->getMessage(), ]); } @@ -102,22 +100,22 @@ public function move(Request $request) public function newFolder(Request $request) { $dir = $request->get('dir'); - $name = $request->get('name'); + $name = $request->get('name'); $manager = new MediaManager($dir); try { if ($manager->newFolder($name)) { return response()->json([ - 'status' => true, - 'message' => trans('admin.move_succeeded') + 'status' => true, + 'message' => trans('admin.move_succeeded'), ]); } } catch (\Exception $e) { return response()->json([ - 'status' => true, + 'status' => true, 'message' => $e->getMessage(), ]); } } -} \ No newline at end of file +} diff --git a/src/MediaManager.php b/src/MediaManager.php index 69fd7b8..68710ff 100644 --- a/src/MediaManager.php +++ b/src/MediaManager.php @@ -10,8 +10,7 @@ use League\Flysystem\Adapter\Local; /** - * Class MediaManager - * @package Encore\Admin\Media + * Class MediaManager. */ class MediaManager extends Extension { @@ -39,11 +38,12 @@ class MediaManager extends Extension 'zip' => 'zip|tar\.gz|rar|rpm', 'txt' => 'txt|pac|log|md', 'audio' => 'mp3|wav|flac|3pg|aa|aac|ape|au|m4a|mpc|ogg', - 'video' => 'mkv|rmvb|flv|mp4|avi|wmv|rm|asf|mpeg' + 'video' => 'mkv|rmvb|flv|mp4|avi|wmv|rm|asf|mpeg', ]; /** * MediaManager constructor. + * * @param string $path */ public function __construct($path = '/') @@ -87,6 +87,7 @@ public function ls() * Get full path for a giving fiel path. * * @param string $path + * * @return string */ protected function getFullPath($path) @@ -129,7 +130,8 @@ public function move($new) /** * @param UploadedFile[] $files - * @param string $dir + * @param string $dir + * * @return mixed */ public function upload($files = []) @@ -173,7 +175,6 @@ public function urls() public function formatFiles($files = []) { $files = array_map(function ($file) { - return [ 'download' => route('media-download', compact('file')), 'icon' => '', @@ -185,7 +186,6 @@ public function formatFiles($files = []) 'url' => $this->storage->url($file), 'time' => $this->getFileChangeTime($file), ]; - }, $files); return collect($files); @@ -198,7 +198,6 @@ public function formatDirectories($dirs = []) $preview = ""; $dirs = array_map(function ($dir) use ($preview) { - return [ 'download' => '', 'icon' => '', @@ -210,7 +209,6 @@ public function formatDirectories($dirs = []) 'url' => $this->storage->url($dir), 'time' => $this->getFileChangeTime($dir), ]; - }, $dirs); return collect($dirs); @@ -227,11 +225,10 @@ public function navigation() $navigation = []; foreach ($folders as $folder) { - - $path = rtrim($path, '/') . '/'.$folder; + $path = rtrim($path, '/').'/'.$folder; $navigation[] = [ - 'name' => $folder, + 'name' => $folder, 'url' => route('media-index', ['path' => $path]), ]; } @@ -280,7 +277,7 @@ public function getFilePreview($file) $preview = ''; break; - default : + default: $preview = ''; } @@ -310,7 +307,7 @@ public function getFilesize($file) $bytes /= 1024; } - return round($bytes, 2) . ' ' . $units[$i]; + return round($bytes, 2).' '.$units[$i]; } public function getFileChangeTime($file) diff --git a/src/MediaServiceProvider.php b/src/MediaServiceProvider.php index 7a2d325..ea8ba36 100644 --- a/src/MediaServiceProvider.php +++ b/src/MediaServiceProvider.php @@ -12,4 +12,4 @@ public function boot() MediaManager::boot(); } -} \ No newline at end of file +}