Skip to content

Commit e09feab

Browse files
author
miladimos
committed
edit
1 parent a530299 commit e09feab

13 files changed

+95
-304
lines changed

.version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v0.5.8

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ $service->listDirectoriesRecursive($path); // list all directories in given path
137137
```php
138138
use Miladimos\FileManager\Services\FileService;
139139

140-
$service = new FileService();
140+
$service = new FileService(); // or resolve(FileService::class)
141141
```
142142

143143
##### FileGroup service:

routes/filemanger-api.php

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
Route::post('files/move', [FileController::class, 'moveFile'])->name('move');
2424
});
2525

26+
2627
Route::get("download/{file}", [DownloadController::class, 'download']);
2728

2829
//Route::post('/browser/folders/parent', ['uses' => 'FolderController@getParentFolderId'])->name('browser.folder.parent');

src/Http/Controllers/BrowseController.php

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88

99
class BrowseController extends Controller
1010
{
11+
public function __construct()
12+
{
13+
//
14+
}
15+
1116
public function index(Request $request)
1217
{
1318
$data = [

src/Http/Controllers/DirectoryController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ class DirectoryController extends Controller
1212

1313
private $directoryService;
1414

15-
public function __construct()
15+
public function __construct(DirectoryService $directoryService)
1616
{
17-
$this->directoryService = new DirectoryService();
17+
$this->directoryService = $directoryService;
1818
}
1919

2020
public function createDirectory(Request $request)

src/Http/Controllers/DownloadController.php

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
class DownloadController extends Controller
1212
{
1313

14+
public function __construct()
15+
{
16+
//
17+
}
18+
1419
public function download($file_id)
1520
{
1621
/** @var File $file_id */

src/Http/Controllers/FileController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ class FileController extends Controller
1111
{
1212
private $fileService;
1313

14-
public function __construct()
14+
public function __construct(FileService $fileService)
1515
{
16-
$this->fileService = new FileService();
16+
$this->fileService = $fileService;
1717
}
1818

1919
public function deleteFile($uuid)

src/Http/Controllers/FileManager.php

-243
This file was deleted.

src/Http/Controllers/UploadController.php

+12-51
Original file line numberDiff line numberDiff line change
@@ -4,64 +4,25 @@
44
namespace Miladimos\FileManager\Http\Controllers;
55

66

7+
use Illuminate\Http\Request;
8+
use Miladimos\FileManager\Services\UploadService;
9+
710
class UploadController extends Controller
811
{
9-
public function uploadFile(Request $request)
10-
{
11-
if ($request->hasFile('file')) {
12-
13-
$path = $request->file('file')->store('uploads');
14-
15-
$folder = $request->input('folder');
16-
//$folder = 0;
17-
$path = str_replace("uploads/", "", $path);
18-
19-
$size = $request->file('file')->getClientSize();
20-
$fileName = $request->file('file')->getClientOriginalName();
21-
$fileExt = $request->file('file')->getClientOriginalExtension();
22-
23-
// first check that the user has got some quota space
24-
$userQuota = QuotaHelper::getUserQuotaUsed(Auth::id());
25-
26-
$userQuota = json_decode($userQuota);
27-
28-
$diskQuota = $userQuota->{'disk_quota'};
29-
$diskUsed = $userQuota->{'disk_usage'};
12+
private $uploadService;
3013

31-
if (($size / 1024 / 1024) + $diskUsed > $diskQuota) {
32-
return response()->json(['msg' => 'You do not have enough of you quota left to upload this file.', 'status' => '500'], 500);
33-
}
34-
35-
$file = new File();
36-
$file->user_id = Auth::id();
37-
$file->folder_id = $folder;
38-
$file->file_name = $fileName;
39-
$file->file_extension = $fileExt;
40-
$file->file_size = $size;
41-
$file->file_hash = $path;
42-
$file->save();
43-
44-
return response()->json(['msg' => 'File uploaded.', 'status' => '200'], 200);
45-
} else {
46-
return response()->json(['msg' => 'No file was specified.', 'status' => '500'], 500);
47-
}
14+
public function __construct(UploadService $uploadService)
15+
{
16+
$this->uploadService = $uploadService;
4817
}
4918

50-
19+
public function uploadFile(Request $request)
20+
{
21+
//
22+
}
5123

5224
public function uploadFiles(Request $request)
5325
{
54-
$request->validate([
55-
'files.*' => 'mimetypes:image/png,image/jpeg'
56-
]);
57-
$path = $request->path ? $request->path : '';
58-
59-
foreach ($request->file('files') as $key => $file) {
60-
$file->storeAs($path, $file->getClientOriginalName());
61-
}
62-
63-
return response()->json([
64-
'result' => true
65-
]);
26+
//
6627
}
6728
}

src/Http/Requests/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)