activity on restore

Author: ArtificialOwl

appinfo/info.xml

@@ -53,9 +53,9 @@
 	</settings>
 
 		<activity>
-<!--			<settings>-->
-<!--				<setting>OCA\Backup\Activity\GlobalSetting</setting>-->
-<!--			</settings>-->
+			<settings>
+				<setting>OCA\Backup\Activity\GlobalSetting</setting>
+			</settings>
 			<filters>
 				<filter>OCA\Backup\Activity\Filter</filter>
 			</filters>

lib/Activity/Filter.php

@@ -33,6 +33,7 @@
 
 
 use OCA\Backup\AppInfo\Application;
+use OCA\Backup\Service\ActivityService;
 use OCP\Activity\IFilter;
 use OCP\IL10N;
 use OCP\IURLGenerator;
@@ -95,7 +96,7 @@ public function getPriority(): int {
 	 * @return string[]
 	 */
 	public function filterTypes(array $types): array {
-		return $types;
+		return array_merge($types, [ActivityService::TYPE_GLOBAL]);
 	}
 
 

lib/Activity/Provider.php

@@ -92,9 +92,7 @@ public function __construct(
 	 */
 	public function parse($lang, IEvent $event, IEvent $previousEvent = null): IEvent {
 		$params = $event->getSubjectParameters();
-		\OC::$server->getLogger()->log(3, json_encode($params));
 		$this->initActivityParser($event, $params);
-
 		$this->setIcon($event);
 
 		if ($event->getType() !== ActivityService::TYPE_GLOBAL) {
@@ -105,6 +103,15 @@ public function parse($lang, IEvent $event, IEvent $previousEvent = null): IEven
 			case ActivityService::CREATE;
 				$this->parseCreate($event, $params);
 				break;
+
+			case ActivityService::RESTORE;
+				$this->parseRestore($event, $params);
+				break;
+
+			case ActivityService::RESTORE_FILE;
+				$this->parseRestoreFile($event, $params);
+				break;
+
 		}
 
 		return $event;
@@ -146,26 +153,63 @@ private function setIcon(IEvent $event): void {
 	 * @param array $params
 	 */
 	private function parseCreate(IEvent $activity, array $params): void {
-		$params['downtime'] = $this->getDateDiff(
-			$this->getInt('duration', $params),
-			0,
-			false,
-			[
-				'seconds' => $this->l10n->t('seconds'),
-				'minutes' => $this->l10n->t('minutes'),
-				'hours' => $this->l10n->t('hours'),
-				'days' => $this->l10n->t('days')
-			]
-		);
+		$params['type'] = ($this->getBool('complete', $params)) ?
+			$this->l10n->t('complete') :
+			$this->l10n->t('partial');
+
+		try {
+			$params['downtime'] = $this->getDateDiff(
+				$this->getInt('duration', $params),
+				0,
+				false,
+				[
+					'seconds' => $this->l10n->t('seconds'),
+					'minutes' => $this->l10n->t('minutes'),
+					'hours' => $this->l10n->t('hours'),
+					'days' => $this->l10n->t('days')
+				]
+			);
+		} catch (\Exception $e) {
+		}
+
 		$this->parseSimpleEvent(
 			$activity,
-			'A new restoring point have been generated, ' .
+			'A new restoring point ({type}) have been generated, ' .
 			'requiring maintenance mode for {downtime}. (id: {id}, status: {status})',
 			$params
 		);
 	}
 
 
+	/**
+	 * @param IEvent $activity
+	 * @param array $params
+	 */
+	private function parseRestore(IEvent $activity, array $params): void {
+		$this->readableRewing($params);
+
+		$this->parseSimpleEvent(
+			$activity,
+			'Your system have been fully restored based on a restoring point from {date} (estimated rewind: {rewind})',
+			$params
+		);
+	}
+
+
+	/**
+	 * @param IEvent $activity
+	 * @param array $params
+	 */
+	private function parseRestoreFile(IEvent $activity, array $params): void {
+		$this->readableRewing($params);
+
+		$this->parseSimpleEvent(
+			$activity,
+			'The file {file} have restored based on a restoring point from {date} (estimated rewind: {rewind})',
+			$params
+		);
+	}
+
 	/**
 	 * @param IEvent $activity
 	 * @param string $global
@@ -192,4 +236,27 @@ protected function setSubject(IEvent $event, string $line) {
 		$event->setRichSubject($line);
 	}
 
+
+	/**
+	 * @param array $params
+	 */
+	private function readableRewing(array &$params): void {
+		$params['date'] = date('Y-m-d H:i:s', $this->getInt('date', $params));
+
+		try {
+			$params['rewind'] = $this->getDateDiff(
+				$this->getInt('rewind', $params),
+				0,
+				false,
+				[
+					'seconds' => $this->l10n->t('seconds'),
+					'minutes' => $this->l10n->t('minutes'),
+					'hours' => $this->l10n->t('hours'),
+					'days' => $this->l10n->t('days')
+				]
+			);
+		} catch (\Exception $e) {
+		}
+	}
+
 }

lib/AppInfo/Application.php

@@ -32,7 +32,7 @@
 namespace OCA\Backup\AppInfo;
 
 
-use OCA\Backup\Activity\GlobalSetting;
+use OCA\Backup\Activity\Filter;
 use OCA\Backup\Handlers\WebfingerHandler;
 use OCA\Backup\Listeners\NodeEvent;
 use OCP\Activity\IManager as IActivityManager;
@@ -43,6 +43,8 @@
 use OCP\Files\Events\Node\NodeCreatedEvent;
 use OCP\Files\Events\Node\NodeRenamedEvent;
 use OCP\Files\Events\Node\NodeWrittenEvent;
+use OCP\IGroupManager;
+use OCP\IUserSession;
 
 
 require_once __DIR__ . '/../../vendor/autoload.php';
@@ -88,10 +90,6 @@ public function register(IRegistrationContext $context): void {
 	 * @param IBootContext $context
 	 */
 	public function boot(IBootContext $context): void {
-		/** @var IActivityManager $activityManager */
-		$activityManager = $context->getServerContainer()->get(IActivityManager::class);
-
-		$activityManager->registerSetting(GlobalSetting::class);
 	}
 
 }

lib/Command/PointRestore.php

@@ -49,6 +49,7 @@
 use OCA\Backup\Model\RestoringData;
 use OCA\Backup\Model\RestoringHealth;
 use OCA\Backup\Model\RestoringPoint;
+use OCA\Backup\Service\ActivityService;
 use OCA\Backup\Service\ChunkService;
 use OCA\Backup\Service\ConfigService;
 use OCA\Backup\Service\FilesService;
@@ -89,6 +90,9 @@ class PointRestore extends Base {
 	/** @var RestoreService */
 	private $restoreService;
 
+	/** @var ActivityService */
+	private $activityService;
+
 	/** @var ConfigService */
 	private $configService;
 
@@ -110,6 +114,7 @@ class PointRestore extends Base {
 	 * @param ChunkService $chunkService
 	 * @param FilesService $filesService
 	 * @param RestoreService $restoreService
+	 * @param ActivityService $activityService
 	 * @param ConfigService $configService
 	 * @param OutputService $outputService
 	 */
@@ -118,6 +123,7 @@ public function __construct(
 		ChunkService $chunkService,
 		FilesService $filesService,
 		RestoreService $restoreService,
+		ActivityService $activityService,
 		ConfigService $configService,
 		OutputService $outputService
 	) {
@@ -127,6 +133,7 @@ public function __construct(
 		$this->chunkService = $chunkService;
 		$this->filesService = $filesService;
 		$this->restoreService = $restoreService;
+		$this->activityService = $activityService;
 		$this->configService = $configService;
 		$this->outputService = $outputService;
 	}
@@ -226,6 +233,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$this->restorePointComplete($point);
 		$this->configService->maintenanceMode(false);
 
+		$this->activityService->newActivity(
+			ActivityService::RESTORE,
+			[
+				'id' => $point->getId(),
+				'date' => $point->getDate(),
+				'rewind' => time() - $point->getDate()
+			]
+		);
+
 		return 0;
 	}
 
@@ -263,7 +279,8 @@ public function restorePointComplete(RestoringPoint $point): void {
 
 			foreach ($data->getChunks() as $chunk) {
 				$this->output->write(
-					'   > Chunk: ' . $chunk->getPath() . $chunk->getFilename() . ' (' . $chunk->getCount() . ' files) '
+					'   > Chunk: ' . $chunk->getPath() . $chunk->getFilename() . ' (' . $chunk->getCount()
+					. ' files) '
 				);
 
 				try {
@@ -375,6 +392,16 @@ private function restoreUniqueFile(
 			$this->chunkService->restoreUniqueFile($point, $chunk, $root, $file->getName());
 			$this->output->writeln('<info>ok</info>');
 
+			$this->activityService->newActivity(
+				ActivityService::RESTORE_FILE,
+				[
+					'id' => $point->getId(),
+					'file' => $file->getName(),
+					'date' => $point->getDate(),
+					'rewind' => time() - $point->getDate()
+				]
+			);
+
 			// include restored file in next incremental backup
 			$changedFile = new ChangedFile($file->getName());
 			$this->filesService->changedFile($changedFile);

lib/Service/ActivityService.php

@@ -49,6 +49,8 @@ class ActivityService {
 
 	const TYPE_GLOBAL = 'backup_global';
 	const CREATE = 'backup_create';
+	const RESTORE = 'backup_restore';
+	const RESTORE_FILE = 'backup_restore_file';
 
 	const LIMIT_TO_GROUP = 'admin';
 

lib/Service/ChunkService.php

@@ -830,10 +830,11 @@ public function searchFileInChunk(RestoringPoint $point, RestoringChunk $chunk,
 			$this->listFilesFromChunk($point, $chunk);
 		}
 
+		$search = strtolower($search);
 		return array_filter(
 			array_map(
 				function (ArchiveFile $file) use ($search): ?ArchiveFile {
-					if (strpos($file->getName(), $search) !== false) {
+					if (strpos(strtolower($file->getName()), $search) !== false) {
 						return $file;
 					}
 

lib/Service/PointService.php

@@ -247,7 +247,8 @@ public function create(bool $complete): RestoringPoint {
 			'backup_create', [
 							   'id' => $point->getId(),
 							   'duration' => time() - $initTime,
-							   'status' => $point->getStatus()
+							   'status' => $point->getStatus(),
+							   'complete' => $complete
 						   ]
 		);