Avatar migration step
* Skip move avatar if avatars disabled Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
6807cb684f
commit
92dc9e6899
|
@ -36,6 +36,7 @@ use OC\Repair\CleanTags;
|
||||||
use OC\Repair\Collation;
|
use OC\Repair\Collation;
|
||||||
use OC\Repair\DropOldJobs;
|
use OC\Repair\DropOldJobs;
|
||||||
use OC\Repair\MoveUpdaterStepFile;
|
use OC\Repair\MoveUpdaterStepFile;
|
||||||
|
use OC\Repair\NC11\MoveAvatars;
|
||||||
use OC\Repair\OldGroupMembershipShares;
|
use OC\Repair\OldGroupMembershipShares;
|
||||||
use OC\Repair\RemoveGetETagEntries;
|
use OC\Repair\RemoveGetETagEntries;
|
||||||
use OC\Repair\RemoveOldShares;
|
use OC\Repair\RemoveOldShares;
|
||||||
|
@ -149,6 +150,12 @@ class Repair implements IOutput{
|
||||||
\OC::$server->getGroupManager()
|
\OC::$server->getGroupManager()
|
||||||
),
|
),
|
||||||
new MoveUpdaterStepFile(\OC::$server->getConfig()),
|
new MoveUpdaterStepFile(\OC::$server->getConfig()),
|
||||||
|
new MoveAvatars(
|
||||||
|
\OC::$server->getUserManager(),
|
||||||
|
\OC::$server->getRootFolder(),
|
||||||
|
\OC::$server->getAppDataDir('avatar'),
|
||||||
|
\OC::$server->getSystemConfig()
|
||||||
|
),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,134 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright 2016 Roeland Jago Douma <roeland@famdouma.nl>
|
||||||
|
*
|
||||||
|
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
||||||
|
*
|
||||||
|
* @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\NC11;
|
||||||
|
|
||||||
|
use OC\SystemConfig;
|
||||||
|
use OCP\Files\File;
|
||||||
|
use OCP\Files\Folder;
|
||||||
|
use OCP\Files\IAppData;
|
||||||
|
use OCP\Files\IRootFolder;
|
||||||
|
use OCP\Files\NotFoundException;
|
||||||
|
use OCP\IUser;
|
||||||
|
use OCP\IUserManager;
|
||||||
|
use OCP\Migration\IOutput;
|
||||||
|
use OCP\Migration\IRepairStep;
|
||||||
|
|
||||||
|
class MoveAvatars implements IRepairStep {
|
||||||
|
|
||||||
|
/** @var IUserManager */
|
||||||
|
private $userManager;
|
||||||
|
|
||||||
|
/** @var IRootFolder */
|
||||||
|
private $rootFolder;
|
||||||
|
|
||||||
|
/** @var IAppData */
|
||||||
|
private $appData;
|
||||||
|
|
||||||
|
/** @var SystemConfig */
|
||||||
|
private $systemConfig;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* MoveAvatars constructor.
|
||||||
|
*
|
||||||
|
* @param IUserManager $userManager
|
||||||
|
* @param IRootFolder $rootFolder
|
||||||
|
* @param IAppData $appData
|
||||||
|
* @param SystemConfig $systemConfig
|
||||||
|
*/
|
||||||
|
public function __construct(IUserManager $userManager,
|
||||||
|
IRootFolder $rootFolder,
|
||||||
|
IAppData $appData,
|
||||||
|
SystemConfig $systemConfig) {
|
||||||
|
$this->userManager = $userManager;
|
||||||
|
$this->rootFolder = $rootFolder;
|
||||||
|
$this->appData = $appData;
|
||||||
|
$this->systemConfig = $systemConfig;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getName() {
|
||||||
|
return 'Move avatars to AppData folder';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function run(IOutput $output) {
|
||||||
|
if ($this->systemConfig->getValue('enable_avatars', true) === false) {
|
||||||
|
$output->info('Avatars are disabled');
|
||||||
|
} else {
|
||||||
|
$output->startProgress($this->userCount());
|
||||||
|
$this->moveAvatar($output);
|
||||||
|
$output->finishProgress();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function moveAvatar(IOutput $output) {
|
||||||
|
$this->userManager->callForAllUsers(function (IUser $user) use ($output) {
|
||||||
|
if ($user->getLastLogin() !== 0) {
|
||||||
|
$uid = $user->getUID();
|
||||||
|
|
||||||
|
\OC\Files\Filesystem::initMountPoints($uid);
|
||||||
|
/** @var Folder $userFolder */
|
||||||
|
$userFolder = $this->rootFolder->get($uid);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$userData = $this->appData->getFolder($uid);
|
||||||
|
} catch (NotFoundException $e) {
|
||||||
|
$userData = $this->appData->newFolder($uid);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$regex = '/^avatar\.([0-9]+\.)?(jpg|png)$/';
|
||||||
|
$avatars = $userFolder->getDirectoryListing();
|
||||||
|
|
||||||
|
foreach ($avatars as $avatar) {
|
||||||
|
/** @var File $avatar */
|
||||||
|
if (preg_match($regex, $avatar->getName())) {
|
||||||
|
/*
|
||||||
|
* This is not the most effective but it is the most abstract way
|
||||||
|
* to handle this. Avatars should be small anyways.
|
||||||
|
*/
|
||||||
|
$newAvatar = $userData->newFile($avatar->getName());
|
||||||
|
$newAvatar->putContent($avatar->getContent());
|
||||||
|
$avatar->delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$output->advance();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
private function userCount() {
|
||||||
|
$backends = $this->userManager->countUsers();
|
||||||
|
$count = 0;
|
||||||
|
|
||||||
|
foreach ($backends as $backend => $amount) {
|
||||||
|
$count += $amount;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $count;
|
||||||
|
}
|
||||||
|
}
|
|
@ -25,7 +25,7 @@
|
||||||
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
|
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
|
||||||
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
|
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
|
||||||
// when updating major/minor version number.
|
// when updating major/minor version number.
|
||||||
$OC_Version = array(9, 2, 0, 3);
|
$OC_Version = array(9, 2, 0, 4);
|
||||||
|
|
||||||
// The human readable string
|
// The human readable string
|
||||||
$OC_VersionString = '11.0 alpha';
|
$OC_VersionString = '11.0 alpha';
|
||||||
|
|
Loading…
Reference in New Issue