minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

REFACTORING #1880 @4h30m: another ugly refactoring commit

Browse Source
This commit is contained in:
Michal Kváček
2016-10-25 16:50:04 +02:00
parent 28f67ffe3c
commit cc999dd24e
71 changed files with 827 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/FileManager/ModelTraits/File.php
+11 -10
View File
@@ -3,7 +3,6 @@
namespace App\Models\FileManager\ModelTraits;
use App\Events\UploadFile;
use App\Http\Requests\Request;
use App\Models\FileManager\File as FileModel;
use Franzose\ClosureTable\Extensions\Str;
use Illuminate\Support\Facades\Auth;
@@ -34,13 +33,15 @@ trait File
* Saves file into FS and creates new record in database
*
* @param UploadedFile $file
* @param Request $request
* @param $data
*
* @return array associative array - key 'file' is type of SymphonyFile and contains info about real file, key 'id'
* is ID of row in files table
*/
public function upload(UploadedFile $file, Request $request)
public function upload(UploadedFile $file, $data = [])
{
$data = (object)$data;
$destination = config('app.upload_path');
$filename = $this->getFilename($file);
@@ -54,7 +55,7 @@ trait File
}
// insert record into database
$id = $this->saveIntoDatabase($uploadedFile, $request, $file->getClientOriginalName());
$id = $this->saveIntoDatabase($uploadedFile, $data, $file->getClientOriginalName());
// fire event about new file
Event::fire(new UploadFile($uploadedFile, $id));
@@ -72,12 +73,12 @@ trait File
* This file saves new record into database. It also calculates hash of given file, obtains MIME type etc.
*
* @param SymphonyFile $file
* @param Request $request
* @param $request
* @param $originalFilename
*
* @return mixed
*/
protected function saveIntoDatabase(SymphonyFile $file, Request $request, $originalFilename)
protected function saveIntoDatabase(SymphonyFile $file, $request, $originalFilename)
{
// get path and hash of uploaded file
$path = config('app.upload_path') . DIRECTORY_SEPARATOR . $file->getFilename();
@@ -92,10 +93,10 @@ trait File
'hash_algorithm' => FileModel::HASH_ALGORITHM,
'mime_type' => $file->getMimeType(),
'file_size' => $file->getSize(),
'name' => $request->name,
'description' => $request->description,
'directory_id' => $request->directoryId ? $request->directoryId : null,
'keywords' => $request->keywords
'name' => isset($request->name) ? $request->name : '',
'description' => isset($request->description) ? $request->description : '',
'directory_id' => isset($request->directoryId) ? $request->directoryId ? $request->directoryId : null : null,
'keywords' => isset($request->keyword) ? $request->keyword : ''
]);
return $newFile->id;