Skip to content

Commit cb3cdbc

Browse files
tamedeveloperstamedevelopers
committed
update
1 parent 650abc4 commit cb3cdbc

File tree

6 files changed

+56
-69
lines changed

6 files changed

+56
-69
lines changed

‎README.md

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ config_file(
136136
],
137137
config: [
138138
'limit' => 1,
139-
'mime' => 'image', // video|audio|file|image|general_image|general_media|general_file
140-
'size' => 2097152, // 2mb
139+
'mime' => 'image', // video|audio|file|image|zip|pdf|xls|doc|general_image|general_media|general_file
140+
'size' => '2mb',
141141
'baseDir' => 'public',
142142
'driver' => 'local',
143143
'structure' => 'default', // default|year|month|day
@@ -404,21 +404,11 @@ File::name('avatar')
404404

405405
### Mime
406406
- Takes one param `string` as mime type
407-
- The package already create list of mim types
408-
409-
| key | Description |
410-
|-------------------|-------------------------------------------------------------------------------------------------------------------|
411-
| video | `['video/mp4','video/mpeg','video/quicktime','video/x-msvideo','video/x-ms-wmv']` |
412-
| audio | `['audio/mpeg','audio/x-wav'] ` |
413-
| files | `['application/msword','application/pdf','text/plain'] ` |
414-
| images | `['image/jpeg', 'image/png', 'image/gif']` |
415-
| general_image | `['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/vnd.microsoft.icon']` |
416-
| general_media | `['audio/mpeg','audio/x-wav', 'video/mp4','video/mpeg','video/quicktime','video/x-msvideo','video/x-ms-wmv']` |
417-
| general_file | `['application/msword','application/pdf','text/plain','application/zip', 'application/x-zip-compressed', 'multipart/x-zip','application/x-zip-compressed' 'application/x-rar-compressed', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']`|
407+
- Goto `Mime Types` to see list
418408

419409
```
420410
File::name('avatar')
421-
->mime('images');
411+
->mime('image');
422412
```
423413

424414
### Width
@@ -617,22 +607,26 @@ if($file->isCompleted()){
617607
```
618608

619609
### Mime Types
610+
611+
| Key | Description |
612+
|-------------------|-------------------------------------------------------|
613+
| video | `.mp4\|.mpeg\|.mov\|.avi\|.wmv` |
614+
| audio | `.mp3\|.wav` |
615+
| file | `.docx\|.doc\|.pdf\|.txt` |
616+
| image | `.jpg\|.jpeg\|.png\|.gif` |
617+
| zip | `.zip\|.rar` |
618+
| pdf | `.pdf` |
619+
| xls | `.xlsx\|.xls` |
620+
| doc | `.docx\|.doc\|.txt` |
621+
| general_image | `.jpg\|.jpeg\|.png\|.gif\|.webp\|.ico` |
622+
| general_media | `.mp3\|.wav\|.mp4\|.mpeg\|.mov\|.avi\|.wmv` |
623+
| general_file | `.docx\|.doc\|.pdf\|.txt\|.zip\|.rar\|.xlsx\|.xls` |
624+
625+
```
626+
File::name('invoiceDescription')
627+
->mime('zip')
628+
->save();
620629
```
621-
'video' => ['.mp4', '.mpeg', '.mov', '.avi', '.wmv'],
622-
'audio' => ['.mp3', '.wav'],
623-
'file' => ['.docx', '.pdf', '.txt'],
624-
'image' => ['.jpg', '.jpeg', '.png'],
625-
'general_file' => ['.docx', '.pdf', '.txt', '.zip', '.rar', '.xlsx', '.xls'],
626-
'general_image' => ['.jpg', '.jpeg', '.png', '.webp'],
627-
'general_media' => ['.mp3', '.wav', '.mp4', '.mpeg', '.mov', '.avi', '.wmv']
628-
```
629-
- video
630-
- audio
631-
- file
632-
- image
633-
- general_file
634-
- general_image
635-
- general_media
636630

637631

638632
## Useful Links

‎src/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public function height($height, ?bool $actual = true)
346346
* Set Mime Type
347347
*
348348
* @param string $mime
349-
* - [video|audio|file|image|general_image|general_media|general_file]
349+
* - [video|audio|file|image|zip|pdf|xls|doc|general_image|general_media|general_file]
350350
*
351351
* @return $this
352352
*/

‎src/Methods/FileMethod.php

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -223,29 +223,37 @@ static protected function allowedMimeType()
223223
{
224224
// Extension MimeType
225225
$mimeType = [
226-
'video' => ['video/mp4','video/mpeg','video/quicktime','video/x-msvideo','video/x-ms-wmv'],
227-
'audio' => ['audio/mpeg','audio/x-wav'],
228-
'file' => ['application/msword','application/pdf','text/plain'],
226+
'video' => ['video/mp4', 'video/mpeg', 'video/quicktime', 'video/x-msvideo', 'video/x-ms-wmv'],
227+
'audio' => ['audio/mpeg', 'audio/x-wav'],
228+
'file' => ['application/msword', 'application/pdf', 'text/plain'],
229229
'image' => ['image/jpeg', 'image/png', 'image/gif'],
230+
'zip' => ['application/zip', 'application/x-zip-compressed', 'multipart/x-zip', 'application/x-rar-compressed', 'application/octet-stream'],
231+
'pdf' => ['application/pdf'],
232+
'xls' => ['application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],
233+
'doc' => ['application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'],
230234
'general_image' => ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/vnd.microsoft.icon'],
231-
'general_media' => ['audio/mpeg','audio/x-wav', 'video/mp4','video/mpeg','video/quicktime','video/x-msvideo','video/x-ms-wmv'],
235+
'general_media' => ['audio/mpeg', 'audio/x-wav', 'video/mp4', 'video/mpeg', 'video/quicktime', 'video/x-msvideo', 'video/x-ms-wmv'],
232236
'general_file' => [
233-
'application/msword','application/pdf','text/plain','application/zip', 'application/x-zip-compressed', 'multipart/x-zip',
234-
'application/x-zip-compressed', 'application/x-rar-compressed', 'application/octet-stream',
235-
'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel',
236-
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
237+
'application/msword', 'application/pdf', 'text/plain', 'application/zip', 'application/x-zip-compressed', 'multipart/x-zip',
238+
'application/x-rar-compressed', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
239+
'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
237240
]
238-
];
241+
];
242+
239243

240244
// Extension Type
241245
$extensionType = [
242246
'video' => ['.mp4', '.mpeg', '.mov', '.avi', '.wmv'],
243247
'audio' => ['.mp3', '.wav'],
244-
'file' => ['.docx', '.pdf', '.txt'],
248+
'file' => ['.docx', '.doc', '.pdf', '.txt'],
245249
'image' => ['.jpg', '.jpeg', '.png', '.gif'],
250+
'zip' => ['.zip', '.rar'],
251+
'pdf' => ['.pdf'],
252+
'xls' => ['.xlsx', '.xls'],
253+
'doc' => ['.docx', '.doc', '.txt'],
246254
'general_image' => ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.ico'],
247255
'general_media' => ['.mp3', '.wav', '.mp4', '.mpeg', '.mov', '.avi', '.wmv'],
248-
'general_file' => ['.docx', '.pdf', '.txt', '.zip', '.rar', '.xlsx', '.xls'],
256+
'general_file' => ['.docx', '.doc', '.pdf', '.txt', '.zip', '.rar', '.xlsx', '.xls'],
249257
];
250258

251259
return ['mime' => $mimeType, 'extension' => $extensionType];

‎src/Traits/FileTrait.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ public function globalConfig($message = [], $config = [], $class = [])
5252
// create config
5353
$config = array_merge([
5454
'limit' => 1,
55-
'size' => 2097152, // 2mb
56-
'mime' => 'image', // video|audio|file|image|general_image|general_media|general_file
55+
'size' => '2mb',
56+
'mime' => 'image',
5757
'baseDir' => $baseDirName,
58-
'driver' => 'local', // local|s3
59-
'structure' => 'default', // default|year|month|day
60-
'generate' => true, // will always generate a unique() name for each uploaded file
58+
'driver' => 'local',
59+
'structure' => 'default',
60+
'generate' => true,
6161
], $config);
6262

6363
// create class

‎tests/config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
],
2424
config: [
2525
'limit' => 1,
26-
'mime' => 'image', // video|audio|file|image|general_image|general_media|general_file
26+
'mime' => 'image', // video|audio|file|image|zip|pdf|xls|doc|general_image|general_media|general_file
2727
'size' => 2097152, // 2mb
2828
'baseDir' => 'public',
2929
'driver' => 'local',

‎tests/mime.php

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,17 @@
1717

1818

1919

20-
21-
22-
// Extension MimeType
23-
$mimeType = [
24-
'video' => ['video/mp4','video/mpeg','video/quicktime','video/x-msvideo','video/x-ms-wmv'],
25-
'audio' => ['audio/mpeg','audio/x-wav'],
26-
'file' => ['application/msword','application/pdf','text/plain'],
27-
'image' => ['image/jpeg', 'image/png', 'image/gif'],
28-
'general_image' => ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/vnd.microsoft.icon'],
29-
'general_media' => ['audio/mpeg','audio/x-wav', 'video/mp4','video/mpeg','video/quicktime','video/x-msvideo','video/x-ms-wmv'],
30-
'general_file' => [
31-
'application/msword','application/pdf','text/plain','application/zip', 'application/x-zip-compressed', 'multipart/x-zip',
32-
'application/x-zip-compressed', 'application/x-rar-compressed', 'application/octet-stream',
33-
'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel',
34-
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
35-
]
36-
];
37-
38-
39-
// Extension of mime Type
20+
// Extension Type
4021
$extensionType = [
4122
'video' => ['.mp4', '.mpeg', '.mov', '.avi', '.wmv'],
4223
'audio' => ['.mp3', '.wav'],
43-
'file' => ['.docx', '.pdf', '.txt'],
24+
'file' => ['.docx', '.doc', '.pdf', '.txt'],
4425
'image' => ['.jpg', '.jpeg', '.png', '.gif'],
26+
'zip' => ['.zip', '.rar'],
27+
'pdf' => ['.pdf'],
28+
'xls' => ['.xlsx', '.xls'],
29+
'doc' => ['.docx', '.doc', '.txt'],
4530
'general_image' => ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.ico'],
4631
'general_media' => ['.mp3', '.wav', '.mp4', '.mpeg', '.mov', '.avi', '.wmv'],
47-
'general_file' => ['.docx', '.pdf', '.txt', '.zip', '.rar', '.xlsx', '.xls'],
32+
'general_file' => ['.docx', '.doc', '.pdf', '.txt', '.zip', '.rar', '.xlsx', '.xls'],
4833
];

0 commit comments

Comments
 (0)