Allow FTP deleteDir function to be recursive on multiple levels #306
Conversation
|
Rebased the PR to fit with the interface changes in 0.6 |
|
Hi @kristianedlund, could this be moved to the Synology adapter? Seems more appropriate. |
|
@FrenkyNet I realise that my description is wrong, but the solution is correct. The problem was that it can't handle nested directories, and that goes for "normal" FTP servers as well. So I think it would be good to include it in the general FTP. Since right now it can only handle one level nesting. |
|
Just updated the pull request to be compliant with the lastest master. |
|
Could you rebase without the commits please? Also, squashing to one commit would be a good idea. |
|
@GrahamCampbell Sorry about that. I have very limited experience with Github. I think it is rebased and squashed it into one commit.... I think. |
| @@ -28,6 +28,11 @@ function ftp_rmdir($connection, $dirname) | |||
| return false; | |||
| } | |||
|
|
|||
| if (strpos($dirname, 'rmdir.dontexist') !== false) { | |||
| throw new \ErrorException("ftp_rmdir(): Can't remove directory: No such file or directory"); | |||
|
|
|||
There was a problem hiding this comment.
No extra line here please.
|
@GrahamCampbell fixed the two issues. |
|
Updated the PR to be mergable with the current master |
kristianedlund
changed the title
| return ftp_rmdir($connection, $dirname); | ||
| try { | ||
| return ftp_rmdir($connection, $dirname); | ||
| } catch (\Exception $e) { |
There was a problem hiding this comment.
This shouldn't happen, the original implementation doesn't throw an exception.
|
I am pretty sure I managed to get it to throw an exception at some point, which was why I added the try catch. But I can't recreate that situation. So it is removed now. |
|
This was fixed in a different PR. |
Hi
Currently the implementation of deleteDir assumes that the ftp_rawlist returns with an array with all files at the end. However, that seems not to be the case for all FTP servers. I have tested both on a synology FTP and pureftp server.
I have changed the function to be recursive instead of relaying on the server to return the array correctly.
Also the ftp_rmdir throws an exception when the file it tries to delete does not exist. I have changed the code to return false instead, to be aligned with the other specification.
PS: I am sorry if I mess something up, this is my very first pull request.