Move to non-static version
The static version is used nowhere in the code and just decreases coverage Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
parent
d805df7bb3
commit
086d43f26d
|
@ -32,26 +32,7 @@
|
||||||
|
|
||||||
namespace OC\Archive;
|
namespace OC\Archive;
|
||||||
|
|
||||||
abstract class Archive{
|
abstract class Archive {
|
||||||
/**
|
|
||||||
* Open any of the supported archive types
|
|
||||||
*
|
|
||||||
* @param string $path
|
|
||||||
* @return Archive|void
|
|
||||||
*/
|
|
||||||
public static function open($path) {
|
|
||||||
$mime = \OC::$server->getMimeTypeDetector()->detect($path);
|
|
||||||
|
|
||||||
switch($mime) {
|
|
||||||
case 'application/zip':
|
|
||||||
return new ZIP($path);
|
|
||||||
case 'application/x-gzip':
|
|
||||||
return new TAR($path);
|
|
||||||
case 'application/x-bzip2':
|
|
||||||
return new TAR($path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $source
|
* @param $source
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -46,6 +46,7 @@ use OC\App\CodeChecker\CodeChecker;
|
||||||
use OC\App\CodeChecker\EmptyCheck;
|
use OC\App\CodeChecker\EmptyCheck;
|
||||||
use OC\App\CodeChecker\PrivateCheck;
|
use OC\App\CodeChecker\PrivateCheck;
|
||||||
use OC\Archive\Archive;
|
use OC\Archive\Archive;
|
||||||
|
use OC\Archive\TAR;
|
||||||
use OC_App;
|
use OC_App;
|
||||||
use OC_DB;
|
use OC_DB;
|
||||||
use OC_Helper;
|
use OC_Helper;
|
||||||
|
@ -254,7 +255,7 @@ class Installer {
|
||||||
if($verified === true) {
|
if($verified === true) {
|
||||||
// Seems to match, let's proceed
|
// Seems to match, let's proceed
|
||||||
$extractDir = $this->tempManager->getTemporaryFolder();
|
$extractDir = $this->tempManager->getTemporaryFolder();
|
||||||
$archive = Archive::open($tempFile);
|
$archive = new TAR($tempFile);
|
||||||
|
|
||||||
if($archive) {
|
if($archive) {
|
||||||
$archive->extract($extractDir);
|
$archive->extract($extractDir);
|
||||||
|
|
Loading…
Reference in New Issue