nextcloud
/
bookmarks
mirror of https://github.com/nextcloud/bookmarks
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix Backup user setting and backup folder l10n 

Fixes #1779

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
This commit is contained in:
Marcel Klehr 2022-04-19 14:14:19 +02:00
parent da6b1e2cf1
commit 83726bd019
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/BackgroundJobs/BackupJob.php
View File

@ -16,6 +16,7 @@ use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession;
use Psr\Log\LoggerInterface;
class BackupJob extends TimedJob {
@ -55,9 +56,13 @@ class BackupJob extends TimedJob {
* @var IConfig
*/
private $config;
/**
* @var IUserSession
*/
private $session;
public function __construct(
BookmarkMapper $bookmarkMapper, ITimeFactory $timeFactory, IUserManager $userManager, BackupManager $backupManager, LoggerInterface $logger, IConfig $config
BookmarkMapper $bookmarkMapper, ITimeFactory $timeFactory, IUserManager $userManager, BackupManager $backupManager, LoggerInterface $logger, IConfig $config, IUserSession $session
) {
parent::__construct($timeFactory);
$this->bookmarkMapper = $bookmarkMapper;
@ -67,12 +72,13 @@ class BackupJob extends TimedJob {
$this->backupManager = $backupManager;
$this->logger = $logger;
$this->config = $config;
$this->session = $session;
}
protected function run($argument) {
$users = [];
$this->userManager->callForSeenUsers(function (IUser $user) use (&$users) {
$users[] = $user->getUID();
$users[] = $user;
});
$processed = 0;
@ -81,21 +87,23 @@ class BackupJob extends TimedJob {
if (!$user) {
return;
}
$userId = $user->getUID();
try {
if ($this->bookmarkMapper->countBookmarksOfUser($user) === 0) {
if ($this->bookmarkMapper->countBookmarksOfUser($userId) === 0) {
continue;
}
if (!$this->config->getUserValue($user, 'bookmarks', 'backup.enabled', true)) {
if (!$this->config->getUserValue($userId, 'bookmarks', 'backup.enabled', true)) {
continue;
}
if ($this->backupManager->backupExistsForToday($user)) {
$this->session->setUser($user);
if ($this->backupManager->backupExistsForToday($userId)) {
continue;
}
$this->backupManager->runBackup($user);
$this->backupManager->cleanupOldBackups($user);
$this->backupManager->runBackup($userId);
$this->backupManager->cleanupOldBackups($userId);
$processed++;
} catch (\Exception $e) {
$this->logger->warning('Bookmarks backup for user '.$user.'errored');
$this->logger->warning('Bookmarks backup for user '.$userId.'errored');
$this->logger->warning($e->getMessage());
continue;
}

2
src/components/Settings.vue
View File

@ -28,7 +28,7 @@
</label>
<label><h3>{{ t('bookmarks', 'Backups') }}</h3>
<p><label><input type="checkbox" :value="backupEnabled" @input="onChangeBackupEnabled">{{ t('bookmarks', 'Enable bookmarks backups') }}</label></p>
<p><label><input type="checkbox" :checked="backupEnabled" @input="onChangeBackupEnabled">{{ t('bookmarks', 'Enable bookmarks backups') }}</label></p>
<p>{{ t('bookmarks',
'Enter the path of a folder in your Files where backups will be stored.'
) }}</p>