-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #41540 from nextcloud/artonge/feat/add_metadata_ge…
…neration_job Add metadata generation job
- Loading branch information
Showing
6 changed files
with
123 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
| /** | ||
| * @copyright Copyright (c) 2023 Louis Chemineau <[email protected]> | ||
| * | ||
| * @author Louis Chemineau <[email protected]> | ||
| * | ||
| * @license AGPL-3.0-or-later | ||
| * | ||
| * 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\Core\BackgroundJobs; | ||
|
|
||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\BackgroundJob\IJobList; | ||
| use OCP\BackgroundJob\TimedJob; | ||
| use OCP\Files\Folder; | ||
| use OCP\Files\IRootFolder; | ||
| use OCP\FilesMetadata\IFilesMetadataManager; | ||
| use OCP\IConfig; | ||
| use OCP\IUserManager; | ||
|
|
||
| class GenerateMetadataJob extends TimedJob { | ||
| public function __construct( | ||
| ITimeFactory $time, | ||
| private IConfig $config, | ||
| private IRootFolder $rootFolder, | ||
| private IUserManager $userManager, | ||
| private IFilesMetadataManager $filesMetadataManager, | ||
| private IJobList $jobList, | ||
| ) { | ||
| parent::__construct($time); | ||
|
|
||
| $this->setTimeSensitivity(\OCP\BackgroundJob\IJob::TIME_INSENSITIVE); | ||
| $this->setInterval(24 * 3600); | ||
| } | ||
|
|
||
| protected function run(mixed $argument): void { | ||
| $users = $this->userManager->search(''); | ||
| $lastMappedUser = $this->config->getAppValue('core', 'metadataGenerationLastHandledUser', ''); | ||
|
|
||
| if ($lastMappedUser === '') { | ||
| $user = array_key_first($users); | ||
| if ($user === null) { | ||
| return; | ||
| } | ||
|
|
||
| $lastMappedUser = $users[$user]->getUID(); | ||
| } | ||
|
|
||
| $startTime = null; | ||
| foreach ($users as $user) { | ||
| if ($startTime === null) { | ||
| // Skip all user before lastMappedUser. | ||
| if ($lastMappedUser !== $user->getUID()) { | ||
| continue; | ||
| } | ||
|
|
||
| $startTime = time(); | ||
| } | ||
|
|
||
| // Stop if execution time is more than one hour. | ||
| if (time() - $startTime > 60 * 60) { | ||
| return; | ||
| } | ||
|
|
||
| $this->scanFilesForUser($user->getUID()); | ||
| $this->config->setAppValue('core', 'metadataGenerationLastHandledUser', $user->getUID()); | ||
| } | ||
|
|
||
| $this->jobList->remove(GenerateMetadataJob::class); | ||
| } | ||
|
|
||
| private function scanFilesForUser(string $userId): void { | ||
| $userFolder = $this->rootFolder->getUserFolder($userId); | ||
| $this->scanFolder($userFolder); | ||
| } | ||
|
|
||
| private function scanFolder(Folder $folder): void { | ||
| // Do not scan share and other moveable mounts. | ||
| if ($folder->getMountPoint() instanceof \OC\Files\Mount\MoveableMount) { | ||
| return; | ||
| } | ||
|
|
||
| foreach ($folder->getDirectoryListing() as $node) { | ||
| if ($node instanceof Folder) { | ||
| $this->scanFolder($node); | ||
| continue; | ||
| } | ||
|
|
||
| $this->filesMetadataManager->refreshMetadata( | ||
| $node, | ||
| IFilesMetadataManager::PROCESS_LIVE | IFilesMetadataManager::PROCESS_BACKGROUND | ||
| ); | ||
| } | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2018 Morris Jobke <[email protected]> | ||
| * @copyright Copyright (c) 2023 Louis Chmn <[email protected]> | ||
| * | ||
| * @author Morris Jobke <[email protected]> | ||
| * @author Louis Chmn <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
|
|
@@ -22,22 +22,22 @@ | |
| */ | ||
| namespace OC\Repair; | ||
|
|
||
| use OC\Core\BackgroundJobs\MigrateMetadataJob; | ||
| use OC\Core\BackgroundJobs\GenerateMetadataJob; | ||
| use OCP\BackgroundJob\IJobList; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\IRepairStep; | ||
|
|
||
| class AddMetadataMigrationJob implements IRepairStep { | ||
| class AddMetadataGenerationJob implements IRepairStep { | ||
| public function __construct( | ||
| private IJobList $jobList, | ||
| ) { | ||
| } | ||
|
|
||
| public function getName() { | ||
| return 'Queue a job to migrate legacy metadata tables'; | ||
| return 'Queue a job to generate metadata'; | ||
| } | ||
|
|
||
| public function run(IOutput $output) { | ||
| $this->jobList->add(MigrateMetadataJob::class); | ||
| $this->jobList->add(GenerateMetadataJob::class); | ||
| } | ||
| } | ||