Added exceptions and fixed CS of the ZipDownloader

main
Jordi Boggiano 13 years ago
parent 99d55792f6
commit e43060eb72

@ -21,32 +21,36 @@ class ZipDownloader
{ {
public function download(PackageInterface $package, $path) public function download(PackageInterface $package, $path)
{ {
if (!class_exists('ZipArchive')) {
throw new \UnexpectedValueException('You need the zip extension enabled to use the ZipDownloader');
}
$tmpName = tempnam(sys_get_temp_dir(), ''); $tmpName = tempnam(sys_get_temp_dir(), '');
$this->downloadFile($package->getSourceUrl(), $tmpName); $this->downloadFile($package->getSourceUrl(), $tmpName);
if (!file_exists($tmpName)) { if (!file_exists($tmpName)) {
throw new \UnexpectedValueException($tmpName.' could not be created.'); throw new \UnexpectedValueException($path.' could not be saved into '.$tmpName.', make sure the'
.' directory is writable and you have internet connectivity.');
} }
$zipArchive = new ZipArchive(); $zipArchive = new ZipArchive();
if($zipArchive->open($tmpName) !== TRUE) { if (true === ($retval = $zipArchive->open($tmpName))) {
$zipArchive->extractTo($path.'/'.$package->getName()); $zipArchive->extractTo($path.'/'.$package->getName());
$zipArchive->close(); $zipArchive->close();
} } else {
else { throw new \UnexpectedValueException($tmpName.' is not a valid zip archive, got error code '.$retval);
throw new \UnexpectedValueException($tmpName.'is not a valid zip archive');
} }
} }
protected function downloadFile ($url, $path) protected function downloadFile ($url, $path)
{ {
$file = fopen ($url, "rb"); $file = fopen($url, "rb");
if ($file) { if ($file) {
$newf = fopen ($path, "wb"); $newf = fopen($path, "wb");
if ($newf) { if ($newf) {
while(!feof($file)) { while (!feof($file)) {
fwrite($newf, fread($file, 1024 * 8 ), 1024 * 8 ); fwrite($newf, fread($file, 1024 * 8), 1024 * 8);
} }
} }
} }

Loading…
Cancel
Save