Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-22 22:51:13 +01:00
Code Issues Packages Projects Releases Activity

Cleanup

Browse Source
This commit is contained in:
Djamil Legato
2014-09-11 14:09:21 -07:00
parent 1ad80acd72
commit c8d6bfa455
1 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
system/src/Grav/Console/Gpm/InstallCommand.php
View File

@@ -1,6 +1,7 @@
<?php
namespace Grav\Console\Gpm;
use Grav\Common\Filesystem\Folder;
use Grav\Common\GPM\GPM;
use Grav\Common\GPM\Installer;
use Grav\Common\GPM\Response;
@@ -20,6 +21,7 @@ class InstallCommand extends Command
protected $gpm;
protected $destination;
protected $file;
protected $tmp;
protected function configure()
{
@@ -119,27 +121,23 @@ class InstallCommand extends Command
}
$this->output->writeln('');
$this->rrmdir($this->destination . DS . 'tmp-gpm');
}
private function downloadPackage($package)
{
$tmp = $this->destination . DS . 'tmp-gpm';
$this->tmp = sys_get_temp_dir() . DS . 'Grav-' . uniqid();
$filename = $package->slug . basename($package->download);
$output = Response::get($package->download, [], [$this, 'progress']);
Folder::mkdir($this->tmp);
$this->output->write("\x0D");
$this->output->write(" |- Downloading package... 100%");
$this->output->writeln('');
if (!file_exists($tmp)) {
@mkdir($tmp);
}
file_put_contents($this->tmp . DS . $filename, $output);
file_put_contents($tmp . DS . $filename, $output);
return $tmp . DS . $filename;
return $this->tmp . DS . $filename;
}
private function checkDestination($package)
@@ -195,6 +193,7 @@ class InstallCommand extends Command
{
$installer = Installer::install($this->file, $this->destination, ['install_path' => $package->install_path]);
$errorCode = Installer::lastErrorCode();
Folder::delete($this->tmp);
if ($errorCode & (Installer::ZIP_OPEN_ERROR | Installer::ZIP_EXTRACT_ERROR)) {
$this->output->write("\x0D");
@@ -217,26 +216,4 @@ class InstallCommand extends Command
$this->output->write("\x0D");
$this->output->write(" |- Downloading package... " . str_pad($progress['percent'], 5, " ", STR_PAD_LEFT) . '%');
}
// Recursively Delete folder - DANGEROUS! USE WITH CARE!!!!
private function rrmdir($dir)
{
if (is_dir($dir)) {
$objects = scandir($dir);
foreach ($objects as $object) {
if ($object != "." && $object != "..") {
if (filetype($dir . "/" . $object) == "dir") {
$this->rrmdir($dir . "/" . $object);
} else {
unlink($dir . "/" . $object);
}
}
}
reset($objects);
rmdir($dir);
return true;
}
}
}