Skip to content

Commit

Permalink
fix(files_metadata): Don't run generation job on every upgrade
Browse files Browse the repository at this point in the history
Signed-off-by: Louis Chemineau <louis@chmn.me>
  • Loading branch information
artonge committed Jul 16, 2024
1 parent bb1f27f commit 38de802
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions core/BackgroundJobs/GenerateMetadataJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
use OCP\Files\IRootFolder;
use OCP\FilesMetadata\Exceptions\FilesMetadataNotFoundException;
use OCP\FilesMetadata\IFilesMetadataManager;
use OCP\IConfig;
use OCP\IAppConfig;
use OCP\IUserManager;
use Psr\Log\LoggerInterface;

class GenerateMetadataJob extends TimedJob {
public function __construct(
ITimeFactory $time,
private IConfig $config,
private IAppConfig $appConfig,
private IRootFolder $rootFolder,
private IUserManager $userManager,
private IFilesMetadataManager $filesMetadataManager,
Expand All @@ -36,8 +36,15 @@ public function __construct(
}

protected function run(mixed $argument): void {
$generationDone = $this->appConfig->getValueBool('core', 'metadataGenerationDone', false);

if ($generationDone) {
return;
}

$lastHandledUser = $this->appConfig->getValueString('core', 'metadataGenerationLastHandledUser', '');

$users = $this->userManager->search('');
$lastHandledUser = $this->config->getAppValue('core', 'metadataGenerationLastHandledUser', '');

// we'll only start timer once we have found a valid user to handle
// meaning NOW if we have not handled any user from a previous run
Expand All @@ -53,7 +60,7 @@ protected function run(mixed $argument): void {
continue;
}

$this->config->setAppValue('core', 'metadataGenerationLastHandledUser', $userId);
$this->appConfig->setValueString('core', 'metadataGenerationLastHandledUser', $userId);
$this->scanFilesForUser($user->getUID());

// Stop if execution time is more than one hour.
Expand All @@ -62,8 +69,8 @@ protected function run(mixed $argument): void {
}
}

$this->jobList->remove(GenerateMetadataJob::class);
$this->config->deleteAppValue('core', 'metadataGenerationLastHandledUser');
$this->appConfig->deleteKey('core', 'metadataGenerationLastHandledUser');
$this->appConfig->setValueBool('core', 'metadataGenerationDone', true);
}

private function scanFilesForUser(string $userId): void {
Expand Down

0 comments on commit 38de802

Please sign in to comment.