disable cron when using Ajax

Author: ArtificialOwl

lib/Cron/Backup.php

@@ -47,7 +47,6 @@ class Backup extends TimedJob {
 	use TNC23Logger;
 
 
-
 	/** @var PointService */
 	private $pointService;
 
@@ -82,7 +81,11 @@ public function __construct(
 	/**
 	 * @param $argument
 	 */
-	protected function run($argument) {
+	protected function run($argument):void {
+		if (!$this->cronService->isRealCron()) {
+			return;
+		}
+
 		$time = time();
 		if ($this->configService->getAppValueInt(ConfigService::MOCKUP_DATE) > 0) {
 			$time = $this->configService->getAppValueInt(ConfigService::MOCKUP_DATE);

lib/Cron/Event.php

@@ -37,6 +37,7 @@
 use OCA\Backup\Exceptions\RestoringPointNotFoundException;
 use OCA\Backup\Model\BackupEvent;
 use OCA\Backup\Service\ConfigService;
+use OCA\Backup\Service\CronService;
 use OCA\Backup\Service\FilesService;
 
 /**
@@ -54,6 +55,9 @@ class Event extends TimedJob {
 	/** @var FilesService */
 	private $filesService;
 
+	/** @var CronService */
+	private $cronService;
+
 	/** @var ConfigService */
 	private $configService;
 
@@ -63,17 +67,20 @@ class Event extends TimedJob {
 	 *
 	 * @param EventRequest $eventRequest
 	 * @param FilesService $filesService
+	 * @param CronService $cronService
 	 * @param ConfigService $configService
 	 */
 	public function __construct(
 		EventRequest $eventRequest,
 		FilesService $filesService,
+		CronService $cronService,
 		ConfigService $configService
 	) {
 		$this->setInterval(1);
 
 		$this->eventRequest = $eventRequest;
 		$this->filesService = $filesService;
+		$this->cronService = $cronService;
 		$this->configService = $configService;
 	}
 
@@ -82,6 +89,10 @@ public function __construct(
 	 * @param $argument
 	 */
 	protected function run($argument) {
+		if (!$this->cronService->isRealCron()) {
+			return;
+		}
+
 		foreach ($this->eventRequest->getQueue() as $event) {
 			if ($event->getType() === 'ScanLocalFolder') {
 				$this->scanLocalFolder($event);

lib/Cron/Manage.php

@@ -102,6 +102,10 @@ public function __construct(
 	 * @param $argument
 	 */
 	protected function run($argument) {
+		if (!$this->cronService->isRealCron()) {
+			return;
+		}
+
 		// uploading
 		foreach ($this->pointService->getLocalRestoringPoints() as $point) {
 			try {

lib/Service/ConfigService.php

@@ -118,6 +118,16 @@ public function __construct(IConfig $config) {
 	}
 
 
+	/**
+	 * @param string $key
+	 * @param string $default
+	 *
+	 * @return string
+	 */
+	public function getCoreValue(string $key, string $default): string {
+		return $this->config->getAppValue('core', $key, $default);
+	}
+
 	/**
 	 * Get a value by key
 	 *
@@ -350,4 +360,5 @@ public function setSettings(array $settings): array {
 
 		return $this->getSettings();
 	}
+
 }

lib/Service/CronService.php

@@ -118,9 +118,9 @@ public function nextBackups(): array {
 				if ($fullETA === -1 && $this->verifyFullBackup($time)) {
 					$fullETA = $time;
 				} elseif ($partialETA === -1
-						   && $this->verifyIncrementalBackup($time)
-						   && ($this->configService->getAppValueInt(ConfigService::DATE_FULL_RP) > 0
-							   || $fullETA > 0)) { // we check that the incremental backup can have a parent
+						  && $this->verifyIncrementalBackup($time)
+						  && ($this->configService->getAppValueInt(ConfigService::DATE_FULL_RP) > 0
+							  || $fullETA > 0)) { // we check that the incremental backup can have a parent
 					$partialETA = $time;
 				}
 
@@ -363,4 +363,14 @@ private function orderByDate(array $points, array $dates): array {
 	private function o(string $line, bool $ln = true): void {
 		$this->outputService->o($line, $ln);
 	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isRealCron(): bool {
+		$mode = $this->configService->getCoreValue('backgroundjobs_mode', '');
+
+		return (strtolower($mode) === 'cron' || strtolower($mode) === 'webcron');
+	}
 }