[DownloadFile] Renamed wrapper directory after extract
This fixes error when the extracted directory (from an archive) contains a folder with the same name. Example: $ mv test/test test mv: test/test and test/test are identicalpull/303/head
parent
13183753e6
commit
7d5ba2d756
|
@ -111,6 +111,13 @@ abstract class FileDownloader implements DownloaderInterface
|
|||
$contentDir = glob($path . '/*');
|
||||
if (1 === count($contentDir)) {
|
||||
$contentDir = $contentDir[0];
|
||||
|
||||
// Rename the content directory to avoid error when moving up
|
||||
// a child folder with the same name
|
||||
$temporaryName = md5(time().rand());
|
||||
rename($contentDir, $temporaryName);
|
||||
$contentDir = $temporaryName;
|
||||
|
||||
foreach (array_merge(glob($contentDir . '/.*'), glob($contentDir . '/*')) as $file) {
|
||||
if (trim(basename($file), '.')) {
|
||||
rename($file, $path . '/' . basename($file));
|
||||
|
|
Loading…
Reference in New Issue