Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
9821ef6f
Unverified
Commit
9821ef6f
authored
Sep 22, 2017
by
Nicolas Widart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding login to rename a folder on disk as well
parent
b84f1451
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
83 additions
and
2 deletions
+83
-2
FolderWasUpdated.php
Modules/Media/Events/FolderWasUpdated.php
+6
-1
RenameFolderOnDisk.php
Modules/Media/Events/Handlers/RenameFolderOnDisk.php
+44
-0
MediaServiceProvider.php
Modules/Media/Providers/MediaServiceProvider.php
+3
-0
EloquentFolderRepository.php
.../Media/Repositories/Eloquent/EloquentFolderRepository.php
+5
-1
EloquentFolderRepositoryTest.php
Modules/Media/Tests/EloquentFolderRepositoryTest.php
+25
-0
No files found.
Modules/Media/Events/FolderWasUpdated.php
View file @
9821ef6f
...
@@ -14,10 +14,15 @@ class FolderWasUpdated
...
@@ -14,10 +14,15 @@ class FolderWasUpdated
* @var array
* @var array
*/
*/
public
$data
;
public
$data
;
/**
* @var array
*/
public
$previousFolderData
;
public
function
__construct
(
File
$folder
,
array
$data
)
public
function
__construct
(
File
$folder
,
array
$data
,
array
$previousFolderData
)
{
{
$this
->
folder
=
$folder
;
$this
->
folder
=
$folder
;
$this
->
data
=
$data
;
$this
->
data
=
$data
;
$this
->
previousFolderData
=
$previousFolderData
;
}
}
}
}
Modules/Media/Events/Handlers/RenameFolderOnDisk.php
0 → 100644
View file @
9821ef6f
<?php
namespace
Modules\Media\Events\Handlers
;
use
Illuminate\Contracts\Filesystem\Factory
;
use
Modules\Media\Events\FolderWasUpdated
;
class
RenameFolderOnDisk
{
/**
* @var Factory
*/
private
$filesystem
;
public
function
__construct
(
Factory
$filesystem
)
{
$this
->
filesystem
=
$filesystem
;
}
public
function
handle
(
FolderWasUpdated
$event
)
{
$this
->
filesystem
->
disk
(
$this
->
getConfiguredFilesystem
())
->
move
(
$this
->
getDestinationPath
(
$event
->
previousFolderData
[
'path'
]
->
getRelativeUrl
()),
$this
->
getDestinationPath
(
$event
->
folder
->
path
->
getRelativeUrl
())
);
}
private
function
getDestinationPath
(
$path
)
{
if
(
$this
->
getConfiguredFilesystem
()
===
'local'
)
{
return
basename
(
public_path
())
.
$path
;
}
return
$path
;
}
/**
* @return string
*/
private
function
getConfiguredFilesystem
()
{
return
config
(
'asgard.media.config.filesystem'
);
}
}
Modules/Media/Providers/MediaServiceProvider.php
View file @
9821ef6f
...
@@ -15,10 +15,12 @@ use Modules\Media\Contracts\DeletingMedia;
...
@@ -15,10 +15,12 @@ use Modules\Media\Contracts\DeletingMedia;
use
Modules\Media\Contracts\StoringMedia
;
use
Modules\Media\Contracts\StoringMedia
;
use
Modules\Media\Entities\File
;
use
Modules\Media\Entities\File
;
use
Modules\Media\Events\FolderWasCreated
;
use
Modules\Media\Events\FolderWasCreated
;
use
Modules\Media\Events\FolderWasUpdated
;
use
Modules\Media\Events\Handlers\CreateFolderOnDisk
;
use
Modules\Media\Events\Handlers\CreateFolderOnDisk
;
use
Modules\Media\Events\Handlers\HandleMediaStorage
;
use
Modules\Media\Events\Handlers\HandleMediaStorage
;
use
Modules\Media\Events\Handlers\RegisterMediaSidebar
;
use
Modules\Media\Events\Handlers\RegisterMediaSidebar
;
use
Modules\Media\Events\Handlers\RemovePolymorphicLink
;
use
Modules\Media\Events\Handlers\RemovePolymorphicLink
;
use
Modules\Media\Events\Handlers\RenameFolderOnDisk
;
use
Modules\Media\Image\ThumbnailManager
;
use
Modules\Media\Image\ThumbnailManager
;
use
Modules\Media\Repositories\Eloquent\EloquentFileRepository
;
use
Modules\Media\Repositories\Eloquent\EloquentFileRepository
;
use
Modules\Media\Repositories\Eloquent\EloquentFolderRepository
;
use
Modules\Media\Repositories\Eloquent\EloquentFolderRepository
;
...
@@ -72,6 +74,7 @@ class MediaServiceProvider extends ServiceProvider
...
@@ -72,6 +74,7 @@ class MediaServiceProvider extends ServiceProvider
$events
->
listen
(
StoringMedia
::
class
,
HandleMediaStorage
::
class
);
$events
->
listen
(
StoringMedia
::
class
,
HandleMediaStorage
::
class
);
$events
->
listen
(
DeletingMedia
::
class
,
RemovePolymorphicLink
::
class
);
$events
->
listen
(
DeletingMedia
::
class
,
RemovePolymorphicLink
::
class
);
$events
->
listen
(
FolderWasCreated
::
class
,
CreateFolderOnDisk
::
class
);
$events
->
listen
(
FolderWasCreated
::
class
,
CreateFolderOnDisk
::
class
);
$events
->
listen
(
FolderWasUpdated
::
class
,
RenameFolderOnDisk
::
class
);
$this
->
app
[
TagManager
::
class
]
->
registerNamespace
(
new
File
());
$this
->
app
[
TagManager
::
class
]
->
registerNamespace
(
new
File
());
$this
->
registerThumbnails
();
$this
->
registerThumbnails
();
...
...
Modules/Media/Repositories/Eloquent/EloquentFolderRepository.php
View file @
9821ef6f
...
@@ -40,6 +40,10 @@ class EloquentFolderRepository extends EloquentBaseRepository implements FolderR
...
@@ -40,6 +40,10 @@ class EloquentFolderRepository extends EloquentBaseRepository implements FolderR
public
function
update
(
$model
,
$data
)
public
function
update
(
$model
,
$data
)
{
{
$previousData
=
[
'filename'
=>
$model
->
filename
,
'path'
=>
$model
->
path
,
];
$formattedData
=
[
$formattedData
=
[
'filename'
=>
array_get
(
$data
,
'name'
),
'filename'
=>
array_get
(
$data
,
'name'
),
'path'
=>
$this
->
getPath
(
$data
),
'path'
=>
$this
->
getPath
(
$data
),
...
@@ -47,7 +51,7 @@ class EloquentFolderRepository extends EloquentBaseRepository implements FolderR
...
@@ -47,7 +51,7 @@ class EloquentFolderRepository extends EloquentBaseRepository implements FolderR
event
(
$event
=
new
FolderIsUpdating
(
$formattedData
));
event
(
$event
=
new
FolderIsUpdating
(
$formattedData
));
$model
->
update
(
$event
->
getAttributes
());
$model
->
update
(
$event
->
getAttributes
());
event
(
new
FolderWasUpdated
(
$model
,
$formattedData
));
event
(
new
FolderWasUpdated
(
$model
,
$formattedData
,
$previousData
));
return
$model
;
return
$model
;
}
}
...
...
Modules/Media/Tests/EloquentFolderRepositoryTest.php
View file @
9821ef6f
...
@@ -9,6 +9,7 @@ use Modules\Media\Events\FolderIsUpdating;
...
@@ -9,6 +9,7 @@ use Modules\Media\Events\FolderIsUpdating;
use
Modules\Media\Events\FolderWasCreated
;
use
Modules\Media\Events\FolderWasCreated
;
use
Modules\Media\Events\FolderWasUpdated
;
use
Modules\Media\Events\FolderWasUpdated
;
use
Modules\Media\Repositories\FolderRepository
;
use
Modules\Media\Repositories\FolderRepository
;
use
Modules\Media\Services\FileService
;
final
class
EloquentFolderRepositoryTest
extends
MediaTestCase
final
class
EloquentFolderRepositoryTest
extends
MediaTestCase
{
{
...
@@ -164,4 +165,28 @@ final class EloquentFolderRepositoryTest extends MediaTestCase
...
@@ -164,4 +165,28 @@ final class EloquentFolderRepositoryTest extends MediaTestCase
$this
->
assertEquals
(
'NEW NAME!'
,
$folder
->
filename
);
$this
->
assertEquals
(
'NEW NAME!'
,
$folder
->
filename
);
}
}
/** @test */
public
function
it_can_rename_folder_on_disk
()
{
$folder
=
$this
->
folder
->
create
([
'name'
=>
'My Folder'
]);
$this
->
assertTrue
(
$this
->
app
[
'files'
]
->
isDirectory
(
public_path
(
'assets/media/my-folder'
)));
$folder
=
$this
->
folder
->
update
(
$folder
,
[
'name'
=>
'New Name!'
]);
$this
->
assertTrue
(
$this
->
app
[
'files'
]
->
isDirectory
(
public_path
(
'assets/media/new-name'
)));
}
/** @test */
public
function
it_can_rename_folder_with_content
()
{
$folder
=
$this
->
folder
->
create
([
'name'
=>
'My Folder'
]);
$file
=
\Illuminate\Http\UploadedFile
::
fake
()
->
image
(
'my-file.jpg'
);
app
(
FileService
::
class
)
->
store
(
$file
,
$folder
->
id
);
$folder
=
$this
->
folder
->
update
(
$folder
,
[
'name'
=>
'New Name!'
]);
$this
->
assertTrue
(
$this
->
app
[
'files'
]
->
isDirectory
(
public_path
(
'assets/media/new-name'
)));
$this
->
assertTrue
(
$this
->
app
[
'files'
]
->
exists
(
public_path
(
'assets/media/new-name/my-file.jpg'
)));
$this
->
assertTrue
(
$this
->
app
[
'files'
]
->
exists
(
public_path
(
'assets/media/new-name/my-file_smallThumb.jpg'
)));
$this
->
assertTrue
(
$this
->
app
[
'files'
]
->
exists
(
public_path
(
'assets/media/new-name/my-file_mediumThumb.jpg'
)));
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment