Merge pull request #21785 from owncloud/cron-sync-system-addressbook
Add daily cron job to sync system address book
This commit is contained in:
commit
33171f5c78
|
@ -19,10 +19,9 @@
|
|||
*
|
||||
*/
|
||||
|
||||
use OCA\DAV\CardDAV\CardDavBackend;
|
||||
use OCA\DAV\CardDAV\SyncService;
|
||||
use OCA\Dav\AppInfo\Application;
|
||||
|
||||
$app = new \OCA\Dav\AppInfo\Application();
|
||||
$app = new Application();
|
||||
$app->registerHooks();
|
||||
|
||||
\OC::$server->registerService('CardDAVSyncService', function() use ($app) {
|
||||
|
|
|
@ -22,6 +22,7 @@ namespace OCA\Dav\AppInfo;
|
|||
|
||||
use OCA\DAV\CardDAV\CardDavBackend;
|
||||
use OCA\DAV\CardDAV\ContactsManager;
|
||||
use OCA\DAV\CardDAV\SyncJob;
|
||||
use OCA\DAV\CardDAV\SyncService;
|
||||
use OCA\DAV\HookManager;
|
||||
use \OCP\AppFramework\App;
|
||||
|
@ -95,4 +96,9 @@ class Application extends App {
|
|||
return $this->getContainer()->query('SyncService');
|
||||
}
|
||||
|
||||
public function setupCron() {
|
||||
$jl = $this->getContainer()->getServer()->getJobList();
|
||||
$jl->add(new SyncJob());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
<?php
|
||||
/**
|
||||
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
||||
*
|
||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* 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, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
use OCA\Dav\AppInfo\Application;
|
||||
|
||||
$app = new Application();
|
||||
$app->setupCron();
|
|
@ -0,0 +1,25 @@
|
|||
<?php
|
||||
/**
|
||||
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
||||
*
|
||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* 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, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
use OCA\Dav\AppInfo\Application;
|
||||
|
||||
$app = new Application();
|
||||
$app->setupCron();
|
|
@ -0,0 +1,40 @@
|
|||
<?php
|
||||
/**
|
||||
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
||||
*
|
||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* 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, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OCA\DAV\CardDAV;
|
||||
|
||||
use OC\BackgroundJob\TimedJob;
|
||||
use OCA\Dav\AppInfo\Application;
|
||||
|
||||
class SyncJob extends TimedJob {
|
||||
|
||||
public function __construct() {
|
||||
// Run once a day
|
||||
$this->setInterval(24 * 60 * 60);
|
||||
}
|
||||
|
||||
protected function run($argument) {
|
||||
$app = new Application();
|
||||
/** @var SyncService $ss */
|
||||
$ss = $app->getSyncService();
|
||||
$ss->syncInstance();
|
||||
}
|
||||
}
|
|
@ -240,11 +240,13 @@ class SyncService {
|
|||
return $this->localSystemAddressBook;
|
||||
}
|
||||
|
||||
public function syncInstance(\Closure $progressCallback) {
|
||||
public function syncInstance(\Closure $progressCallback = null) {
|
||||
$systemAddressBook = $this->getLocalSystemAddressBook();
|
||||
$this->userManager->callForAllUsers(function($user) use ($systemAddressBook, $progressCallback) {
|
||||
$this->updateUser($user);
|
||||
$progressCallback();
|
||||
if (!is_null($progressCallback)) {
|
||||
$progressCallback();
|
||||
}
|
||||
});
|
||||
|
||||
// remove no longer existing
|
||||
|
|
Loading…
Reference in New Issue