public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Extract archives into temp dir to shorten paths and avoid issues on windows, fixes #1591

pull/1625/merge
Jordi Boggiano 2013-02-27 13:31:55 +01:00
parent f69418427f
commit 88ae6c023b
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Composer/Downloader/ArchiveDownloader.php
View File

@ -34,9 +34,12 @@ abstract class ArchiveDownloader extends FileDownloader
if ($this->io->isVerbose()) { if ($this->io->isVerbose()) {
$this->io->write(' Unpacking archive'); $this->io->write(' Unpacking archive');
} }
$temporaryDir = sys_get_temp_dir().'/cmp'.substr(md5(time().mt_rand()), 0, 5);
try { try {
$this->filesystem->ensureDirectoryExists($temporaryDir);
try { try {
$this->extract($fileName, $path); $this->extract($fileName, $temporaryDir);
} catch (\Exception $e) { } catch (\Exception $e) {
// remove cache if the file was corrupted // remove cache if the file was corrupted
parent::clearCache($package, $path); parent::clearCache($package, $path);
@ -49,31 +52,26 @@ abstract class ArchiveDownloader extends FileDownloader
unlink($fileName); unlink($fileName);
// If we have only a one dir inside it suppose to be a package itself // If we have only a one dir inside it suppose to be a package itself
$contentDir = glob($path . '/*'); $contentDir = glob($temporaryDir . '/*');
if (1 === count($contentDir)) { if (1 === count($contentDir)) {
$contentDir = $contentDir[0]; $contentDir = $contentDir[0];
}
if (is_file($contentDir)) { if (is_file($contentDir)) {
$this->filesystem->rename($contentDir, $path . '/' . basename($contentDir)); $this->filesystem->rename($contentDir, $path . '/' . basename($contentDir));
} else { } else {
// Rename the content directory to avoid error when moving up foreach (array_merge(glob($contentDir . '/.*'), glob($contentDir . '/*')) as $file) {
// a child folder with the same name if ('' !== trim(basename($file), '.')) {
$temporaryDir = sys_get_temp_dir().'/'.md5(time().mt_rand()); $this->filesystem->rename($file, $path . '/' . basename($file));
$this->filesystem->rename($contentDir, $temporaryDir);
$contentDir = $temporaryDir;
foreach (array_merge(glob($contentDir . '/.*'), glob($contentDir . '/*')) as $file) {
if (trim(basename($file), '.')) {
$this->filesystem->rename($file, $path . '/' . basename($file));
}
} }
$this->filesystem->removeDirectory($contentDir);
} }
} }
$this->filesystem->removeDirectory($temporaryDir);
} catch (\Exception $e) { } catch (\Exception $e) {
// clean up // clean up
$this->filesystem->removeDirectory($path); $this->filesystem->removeDirectory($path);
$this->filesystem->removeDirectory($temporaryDir);
throw $e; throw $e;
} }