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

Re-download files when the cached copy is invalid, fixes #1496

pull/2473/merge
Jordi Boggiano 2013-12-31 17:28:27 +01:00
parent a89eb9adea
commit 81994f6b90
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Downloader/FileDownloader.php
View File

@ -105,8 +105,12 @@ class FileDownloader implements DownloaderInterface
} }
try { try {
$checksum = $package->getDistSha1Checksum();
$cacheKey = $this->getCacheKey($package);
try { try {
if (!$this->cache || !$this->cache->copyTo($this->getCacheKey($package), $fileName)) { // download if we don't have it in cache or the cache is invalidated
if (!$this->cache || ($checksum && $checksum !== $this->cache->sha1($cacheKey)) || !$this->cache->copyTo($cacheKey, $fileName)) {
if (!$this->outputProgress) { if (!$this->outputProgress) {
$this->io->write(' Downloading'); $this->io->write(' Downloading');
} }
@ -130,7 +134,7 @@ class FileDownloader implements DownloaderInterface
} }
if ($this->cache) { if ($this->cache) {
$this->cache->copyFrom($this->getCacheKey($package), $fileName); $this->cache->copyFrom($cacheKey, $fileName);
} }
} else { } else {
$this->io->write(' Loading from cache'); $this->io->write(' Loading from cache');
@ -158,7 +162,6 @@ class FileDownloader implements DownloaderInterface
.' directory is writable and you have internet connectivity'); .' directory is writable and you have internet connectivity');
} }
$checksum = $package->getDistSha1Checksum();
if ($checksum && hash_file('sha1', $fileName) !== $checksum) { if ($checksum && hash_file('sha1', $fileName) !== $checksum) {
throw new \UnexpectedValueException('The checksum verification of the file failed (downloaded from '.$url.')'); throw new \UnexpectedValueException('The checksum verification of the file failed (downloaded from '.$url.')');
} }