Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>pull/12313/head
parent
54a30a4b81
commit
a9eef37456
@ -0,0 +1,72 @@ |
||||
<?php |
||||
/** |
||||
* @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com> |
||||
* |
||||
* @author John Molakvoæ <skjnldsv@protonmail.com> |
||||
* |
||||
* @license GNU AGPL version 3 or any later version |
||||
* |
||||
* This program is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License as |
||||
* published by the Free Software Foundation, either version 3 of the |
||||
* License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
||||
* |
||||
*/ |
||||
|
||||
namespace OC\Repair; |
||||
|
||||
use OC\AvatarManager; |
||||
use OCP\IConfig; |
||||
use OCP\Migration\IOutput; |
||||
use OCP\Migration\IRepairStep; |
||||
use OCP\Util; |
||||
|
||||
class ClearGeneratedAvatarCache implements IRepairStep { |
||||
|
||||
/** @var AvatarManager */ |
||||
protected $avatarManager; |
||||
|
||||
/** @var IConfig */ |
||||
private $config; |
||||
|
||||
public function __construct(IConfig $config, AvatarManager $avatarManager) { |
||||
$this->config = $config; |
||||
$this->avatarManager = $avatarManager; |
||||
} |
||||
|
||||
public function getName() { |
||||
return 'Clear every generated avatar on major updates'; |
||||
} |
||||
|
||||
/** |
||||
* Check if this repair step should run |
||||
* |
||||
* @return boolean |
||||
*/ |
||||
private function shouldRun() { |
||||
$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0'); |
||||
|
||||
// was added to 15.0.0.4 |
||||
return version_compare($versionFromBeforeUpdate, '15.0.0.4', '<='); |
||||
} |
||||
|
||||
public function run(IOutput $output) { |
||||
if ($this->shouldRun()) { |
||||
try { |
||||
$this->avatarManager->clearCachedAvatars(); |
||||
$output->info('Avatar cache cleared'); |
||||
} catch (\Exception $e) { |
||||
$output->warning('Unable to clear the avatar cache'); |
||||
} |
||||
|
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,82 @@ |
||||
<?php |
||||
/** |
||||
* @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net> |
||||
* |
||||
* @author Julius Härtl <jus@bitgrid.net> |
||||
* |
||||
* @license GNU AGPL version 3 or any later version |
||||
* |
||||
* This program is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License as |
||||
* published by the Free Software Foundation, either version 3 of the |
||||
* License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
||||
* |
||||
*/ |
||||
|
||||
namespace Test\Repair; |
||||
|
||||
use OCP\IConfig; |
||||
use OCP\Migration\IOutput; |
||||
use OC\AvatarManager; |
||||
use OC\Repair\ClearGeneratedAvatarCache; |
||||
|
||||
class ClearGeneratedAvatarCacheTest extends \Test\TestCase { |
||||
|
||||
/** @var AvatarManager */ |
||||
private $avatarManager; |
||||
|
||||
/** @var IOutput */ |
||||
private $outputMock; |
||||
|
||||
/** @var IConfig */ |
||||
private $config; |
||||
|
||||
/** @var ClearGeneratedAvatarCache */ |
||||
protected $repair; |
||||
|
||||
protected function setUp() { |
||||
parent::setUp(); |
||||
|
||||
$this->outputMock = $this->createMock(IOutput::class); |
||||
$this->avatarManager = $this->createMock(AvatarManager::class); |
||||
$this->config = $this->createMock(IConfig::class); |
||||
|
||||
$this->repair = new ClearGeneratedAvatarCache($this->config, $this->avatarManager); |
||||
} |
||||
|
||||
public function shouldRunDataProvider() { |
||||
return [ |
||||
['11.0.0.0', true], |
||||
['15.0.0.3', true], |
||||
['13.0.5.2', true], |
||||
['12.0.0.0', true], |
||||
['16.0.0.1', false], |
||||
['15.0.0.2', true], |
||||
['13.0.0.0', true], |
||||
['15.0.0.5', false] |
||||
]; |
||||
} |
||||
|
||||
/** |
||||
* @dataProvider shouldRunDataProvider |
||||
* |
||||
* @param string $from |
||||
* @param boolean $expected |
||||
*/ |
||||
public function testShouldRun($from, $expected) { |
||||
$this->config->expects($this->any()) |
||||
->method('getSystemValue') |
||||
->with('version', '0.0.0.0') |
||||
->willReturn($from); |
||||
|
||||
$this->assertEquals($expected, $this->invokePrivate($this->repair, 'shouldRun')); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue