Skip to content

Apply fixes from StyleCI #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2017
Merged

Apply fixes from StyleCI #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ public static function import()

parent::createPermission('Media manager', 'ext.media-manager', 'media*');
}
}
}
26 changes: 12 additions & 14 deletions src/MediaController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', '/');
Expand All @@ -25,7 +24,6 @@ public function index(Request $request)
'nav' => $manager->navigation(),
'url' => $manager->urls(),
]));

});
}

Expand Down Expand Up @@ -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(),
]);
}
Expand All @@ -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(),
]);
}
Expand All @@ -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(),
]);
}
}
}
}
23 changes: 10 additions & 13 deletions src/MediaManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
use League\Flysystem\Adapter\Local;

/**
* Class MediaManager
* @package Encore\Admin\Media
* Class MediaManager.
*/
class MediaManager extends Extension
{
Expand Down Expand Up @@ -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 = '/')
Expand Down Expand Up @@ -87,6 +87,7 @@ public function ls()
* Get full path for a giving fiel path.
*
* @param string $path
*
* @return string
*/
protected function getFullPath($path)
Expand Down Expand Up @@ -129,7 +130,8 @@ public function move($new)

/**
* @param UploadedFile[] $files
* @param string $dir
* @param string $dir
*
* @return mixed
*/
public function upload($files = [])
Expand Down Expand Up @@ -173,7 +175,6 @@ public function urls()
public function formatFiles($files = [])
{
$files = array_map(function ($file) {

return [
'download' => route('media-download', compact('file')),
'icon' => '',
Expand All @@ -185,7 +186,6 @@ public function formatFiles($files = [])
'url' => $this->storage->url($file),
'time' => $this->getFileChangeTime($file),
];

}, $files);

return collect($files);
Expand All @@ -198,7 +198,6 @@ public function formatDirectories($dirs = [])
$preview = "<a href=\"$url\"><span class=\"file-icon text-aqua\"><i class=\"fa fa-folder\"></i></span></a>";

$dirs = array_map(function ($dir) use ($preview) {

return [
'download' => '',
'icon' => '',
Expand All @@ -210,7 +209,6 @@ public function formatDirectories($dirs = [])
'url' => $this->storage->url($dir),
'time' => $this->getFileChangeTime($dir),
];

}, $dirs);

return collect($dirs);
Expand All @@ -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]),
];
}
Expand Down Expand Up @@ -280,7 +277,7 @@ public function getFilePreview($file)
$preview = '<span class="file-icon"><i class="fa fa-code"></i></span>';
break;

default :
default:
$preview = '<span class="file-icon"><i class="fa fa-file"></i></span>';
}

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/MediaServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ public function boot()

MediaManager::boot();
}
}
}