nextcloud /
server
@@ -36,84 +36,84 @@ |
||
| 36 | 36 | * @package OCA\Files\BackgroundJob |
| 37 | 37 | */ |
| 38 | 38 | class ScanFiles extends \OC\BackgroundJob\TimedJob { |
| 39 | - /** @var IConfig */ |
|
| 40 | - private $config; |
|
| 41 | - /** @var IUserManager */ |
|
| 42 | - private $userManager; |
|
| 43 | - /** @var IDBConnection */ |
|
| 44 | - private $dbConnection; |
|
| 45 | - /** @var ILogger */ |
|
| 46 | - private $logger; |
|
| 47 | - /** Amount of users that should get scanned per execution */ |
|
| 48 | - const USERS_PER_SESSION = 500; |
|
| 39 | + /** @var IConfig */ |
|
| 40 | + private $config; |
|
| 41 | + /** @var IUserManager */ |
|
| 42 | + private $userManager; |
|
| 43 | + /** @var IDBConnection */ |
|
| 44 | + private $dbConnection; |
|
| 45 | + /** @var ILogger */ |
|
| 46 | + private $logger; |
|
| 47 | + /** Amount of users that should get scanned per execution */ |
|
| 48 | + const USERS_PER_SESSION = 500; |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @param IConfig|null $config |
|
| 52 | - * @param IUserManager|null $userManager |
|
| 53 | - * @param IDBConnection|null $dbConnection |
|
| 54 | - * @param ILogger|null $logger |
|
| 55 | - */ |
|
| 56 | - public function __construct(IConfig $config = null, |
|
| 57 | - IUserManager $userManager = null, |
|
| 58 | - IDBConnection $dbConnection = null, |
|
| 59 | - ILogger $logger = null) { |
|
| 60 | - // Run once per 10 minutes |
|
| 61 | - $this->setInterval(60 * 10); |
|
| 50 | + /** |
|
| 51 | + * @param IConfig|null $config |
|
| 52 | + * @param IUserManager|null $userManager |
|
| 53 | + * @param IDBConnection|null $dbConnection |
|
| 54 | + * @param ILogger|null $logger |
|
| 55 | + */ |
|
| 56 | + public function __construct(IConfig $config = null, |
|
| 57 | + IUserManager $userManager = null, |
|
| 58 | + IDBConnection $dbConnection = null, |
|
| 59 | + ILogger $logger = null) { |
|
| 60 | + // Run once per 10 minutes |
|
| 61 | + $this->setInterval(60 * 10); |
|
| 62 | 62 | |
| 63 | - if (is_null($userManager) || is_null($config)) { |
|
| 64 | - $this->fixDIForJobs(); |
|
| 65 | - } else { |
|
| 66 | - $this->config = $config; |
|
| 67 | - $this->userManager = $userManager; |
|
| 68 | - $this->logger = $logger; |
|
| 69 | - } |
|
| 70 | - } |
|
| 63 | + if (is_null($userManager) || is_null($config)) { |
|
| 64 | + $this->fixDIForJobs(); |
|
| 65 | + } else { |
|
| 66 | + $this->config = $config; |
|
| 67 | + $this->userManager = $userManager; |
|
| 68 | + $this->logger = $logger; |
|
| 69 | + } |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | - protected function fixDIForJobs() { |
|
| 73 | - $this->config = \OC::$server->getConfig(); |
|
| 74 | - $this->userManager = \OC::$server->getUserManager(); |
|
| 75 | - $this->logger = \OC::$server->getLogger(); |
|
| 76 | - } |
|
| 72 | + protected function fixDIForJobs() { |
|
| 73 | + $this->config = \OC::$server->getConfig(); |
|
| 74 | + $this->userManager = \OC::$server->getUserManager(); |
|
| 75 | + $this->logger = \OC::$server->getLogger(); |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - /** |
|
| 79 | - * @param IUser $user |
|
| 80 | - */ |
|
| 81 | - protected function runScanner(IUser $user) { |
|
| 82 | - try { |
|
| 83 | - $scanner = new Scanner( |
|
| 84 | - $user->getUID(), |
|
| 85 | - $this->dbConnection, |
|
| 86 | - $this->logger |
|
| 87 | - ); |
|
| 88 | - $scanner->backgroundScan(''); |
|
| 89 | - } catch (\Exception $e) { |
|
| 90 | - $this->logger->logException($e, ['app' => 'files']); |
|
| 91 | - } |
|
| 92 | - \OC_Util::tearDownFS(); |
|
| 93 | - } |
|
| 78 | + /** |
|
| 79 | + * @param IUser $user |
|
| 80 | + */ |
|
| 81 | + protected function runScanner(IUser $user) { |
|
| 82 | + try { |
|
| 83 | + $scanner = new Scanner( |
|
| 84 | + $user->getUID(), |
|
| 85 | + $this->dbConnection, |
|
| 86 | + $this->logger |
|
| 87 | + ); |
|
| 88 | + $scanner->backgroundScan(''); |
|
| 89 | + } catch (\Exception $e) { |
|
| 90 | + $this->logger->logException($e, ['app' => 'files']); |
|
| 91 | + } |
|
| 92 | + \OC_Util::tearDownFS(); |
|
| 93 | + } |
|
| 94 | 94 | |
| 95 | - /** |
|
| 96 | - * @param $argument |
|
| 97 | - * @throws \Exception |
|
| 98 | - */ |
|
| 99 | - protected function run($argument) { |
|
| 100 | - if ($this->config->getSystemValueBool('files_no_background_scan', false)) { |
|
| 101 | - return; |
|
| 102 | - } |
|
| 95 | + /** |
|
| 96 | + * @param $argument |
|
| 97 | + * @throws \Exception |
|
| 98 | + */ |
|
| 99 | + protected function run($argument) { |
|
| 100 | + if ($this->config->getSystemValueBool('files_no_background_scan', false)) { |
|
| 101 | + return; |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - $offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0); |
|
| 105 | - $users = $this->userManager->search('', self::USERS_PER_SESSION, $offset); |
|
| 106 | - if (!count($users)) { |
|
| 107 | - // No users found, reset offset and retry |
|
| 108 | - $offset = 0; |
|
| 109 | - $users = $this->userManager->search('', self::USERS_PER_SESSION); |
|
| 110 | - } |
|
| 104 | + $offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0); |
|
| 105 | + $users = $this->userManager->search('', self::USERS_PER_SESSION, $offset); |
|
| 106 | + if (!count($users)) { |
|
| 107 | + // No users found, reset offset and retry |
|
| 108 | + $offset = 0; |
|
| 109 | + $users = $this->userManager->search('', self::USERS_PER_SESSION); |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | - $offset += self::USERS_PER_SESSION; |
|
| 113 | - $this->config->setAppValue('files', 'cronjob_scan_files', $offset); |
|
| 112 | + $offset += self::USERS_PER_SESSION; |
|
| 113 | + $this->config->setAppValue('files', 'cronjob_scan_files', $offset); |
|
| 114 | 114 | |
| 115 | - foreach ($users as $user) { |
|
| 116 | - $this->runScanner($user); |
|
| 117 | - } |
|
| 118 | - } |
|
| 115 | + foreach ($users as $user) { |
|
| 116 | + $this->runScanner($user); |
|
| 117 | + } |
|
| 118 | + } |
|
| 119 | 119 | } |
