fixed progress digits limit

.l10nignore

@@ -0,0 +1,2 @@
+js/
+vendor/

appinfo/info.xml

@@ -5,7 +5,7 @@
     <name>Groupfolder Filesystem Snapshots</name>
     <summary>Allows restoring a groupfolder to a previous snapshot in the filesystem</summary>
     <description>App proving a PHP API for other apps, that allows (partially) restoring a groupfolder to a previous snapshot in the filesystem. Requires a filesystem with snapshot support (tested with and made for ZFS). It is made for other apps to integrate with, IT DOES NOT WORK STANDALONE</description>
-    <version>1.3.1</version>
+    <version>1.4.1</version>
     <licence>agpl</licence>
     <author homepage="https://verdigado.com/">verdigado eG</author>
     <author mail="jonathan.treffler@verdigado.com">Jonathan Treffler</author>
@@ -13,7 +13,7 @@
     <category>files</category>
     <bugs>https://git.verdigado.com/verdigado-public/nextcloud_groupfolder_filesystem_snapshots/issues</bugs>
     <dependencies>
-        <nextcloud min-version="28" max-version="29"/>
+        <nextcloud min-version="29" max-version="30"/>
         <database>pgsql</database>
         <database>sqlite</database>
         <database>mysql</database>

krankerl.toml

@@ -1,6 +1,6 @@
 [package]
 before_cmds = [
     "composer install",
-    "npm install",
+    "npm ci",
     "npm run build",
 ]

l10n/de.js

@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "groupfolder_filesystem_snapshots",
+    {
+    "Automated hourly backup" : "Stündliches automatisches Backup",
+    "Automated daily backup" : "Tägliches automatisches Backup",
+    "Automated weekly backup" : "Wöchentliches automatisches Backup",
+    "Automated monthly backup" : "Monatliches automatisches Backup"
+},
+"nplurals=2; plural=(n != 1);");

l10n/de.json

@@ -0,0 +1,7 @@
+{ "translations": {
+    "Automated hourly backup" : "Stündliches automatisches Backup",
+    "Automated daily backup" : "Tägliches automatisches Backup",
+    "Automated weekly backup" : "Wöchentliches automatisches Backup",
+    "Automated monthly backup" : "Monatliches automatisches Backup"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

l10n/de_DE.js

@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "groupfolder_filesystem_snapshots",
+    {
+    "Automated hourly backup" : "Stündliches automatisches Backup",
+    "Automated daily backup" : "Tägliches automatisches Backup",
+    "Automated weekly backup" : "Wöchentliches automatisches Backup",
+    "Automated monthly backup" : "Monatliches automatisches Backup"
+},
+"nplurals=2; plural=(n != 1);");

l10n/de_DE.json

@@ -0,0 +1,7 @@
+{ "translations": {
+    "Automated hourly backup" : "Stündliches automatisches Backup",
+    "Automated daily backup" : "Tägliches automatisches Backup",
+    "Automated weekly backup" : "Wöchentliches automatisches Backup",
+    "Automated monthly backup" : "Monatliches automatisches Backup"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

lib/Controller/AdminSettingsController.php

@@ -19,29 +19,29 @@ class AdminSettingsController extends Controller {
 		);
 	}
 
-    /**
+	/**
-     * @return JSONResponse
+	 * @return JSONResponse
-     */
+	 */
-    public function index(): JSONResponse {
+	public function index(): JSONResponse {
-        return new JSONResponse($this->settingsService->getAppValues());
+		return new JSONResponse($this->settingsService->getAppValues());
-    }
+	}
 
-    /**
+	/**
-     * @param $key
+	 * @param $key
-     *
+	 *
-     * @return JSONResponse
+	 * @return JSONResponse
-     */
+	 */
-    public function show($key): JSONResponse {
+	public function show($key): JSONResponse {
-        return new JSONResponse($this->settingsService->getAppValue($key));
+		return new JSONResponse($this->settingsService->getAppValue($key));
-    }
+	}
 
-    /**
+	/**
-     * @param $key
+	 * @param $key
-     * @param $value
+	 * @param $value
-     *
+	 *
-     * @return JSONResponse
+	 * @return JSONResponse
-     */
+	 */
-    public function update($key, $value): JSONResponse {
+	public function update($key, $value): JSONResponse {
 		return new JSONResponse($this->settingsService->setAppValue($key, $value));
-    }
+	}
 }

lib/Db/DiffTask.php

@@ -7,25 +7,25 @@ use OCP\AppFramework\Db\Entity;
 
 class DiffTask extends Entity implements JsonSerializable {
 
-    protected $userId;
+	protected $userId;
-    protected $groupfolderId;
+	protected $groupfolderId;
 	protected $relativePath;
-    protected $snapshotId;
+	protected $snapshotId;
-    protected $timestamp;
+	protected $timestamp;
 
-    public function __construct() {
+	public function __construct() {
-        $this->addType('id','integer');
+		$this->addType('id','integer');
-        $this->addType('groupfolderId','integer');
+		$this->addType('groupfolderId','integer');
-    }
+	}
 
-    public function jsonSerialize() {
+	public function jsonSerialize() {
-        return [
+		return [
-            'id' => $this->id,
+			'id' => $this->id,
 			'userId' => $this->userId,
-            'groupfolderId' => $this->groupfolderId,
+			'groupfolderId' => $this->groupfolderId,
 			'relativePath' => $this->relativePath,
-            'snapshotId' => $this->snapshotId,
+			'snapshotId' => $this->snapshotId,
-            'timestamp' => $this->timestamp,
+			'timestamp' => $this->timestamp,
-        ];
+		];
-    }
+	}
 }

lib/Db/DiffTaskMapper.php

@@ -9,29 +9,29 @@ use OCP\AppFramework\Db\QBMapper;
  */
 class DiffTaskMapper extends QBMapper {
 
-    public function __construct(IDBConnection $db) {
+	public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'groupfolder_snapshots_tasks', DiffTask::class);
+		parent::__construct($db, 'groupfolder_snapshots_tasks', DiffTask::class);
-    }
+	}
 
-    public function find(int $id, string $userId) {
+	public function find(int $id, string $userId) {
-        $qb = $this->db->getQueryBuilder();
+		$qb = $this->db->getQueryBuilder();
 
-        $qb->select('*')
+		$qb->select('*')
-             ->from($this->getTableName())
+			 ->from($this->getTableName())
-             ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+			 ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-             ->andWhere($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
+			 ->andWhere($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
 
-        return $this->findEntity($qb);
+		return $this->findEntity($qb);
-    }
+	}
 
-    public function findAll(string $userId) {
+	public function findAll(string $userId) {
-        $qb = $this->db->getQueryBuilder();
+		$qb = $this->db->getQueryBuilder();
 
-        $qb->select('*')
+		$qb->select('*')
-           ->from($this->getTableName())
+		   ->from($this->getTableName())
-           ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
+		   ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
 
-        return $this->findEntities($qb);
+		return $this->findEntities($qb);
-    }
+	}
 
 }

lib/Db/DiffTaskResult.php

@@ -7,45 +7,49 @@ use OCP\AppFramework\Db\Entity;
 
 class DiffTaskResult extends Entity implements JsonSerializable {
 
-    protected $taskId;
+	protected $taskId;
-    protected $timestamp;
+	protected $timestamp;
-    protected $type;
+	protected $type;
 
-    protected $beforeFileExists;
+	protected $beforeFileExists;
-    protected $beforePath;
+	protected $beforePath;
-    protected $beforeSize;
+	protected $beforeSize;
 
-    protected $currentFileExists;
+	protected $currentFileExists;
-    protected $currentPath;
+	protected $currentFileId;
-    protected $currentSize;
+
+	protected $currentPath;
+	protected $currentSize;
 	protected $reverted;
 
-    public function __construct() {
+	public function __construct() {
-        $this->addType('id','integer');
+		$this->addType('id','integer');
-        $this->addType('taskId','integer');
+		$this->addType('taskId','integer');
-        $this->addType('beforeFileExists','boolean');
+		$this->addType('beforeFileExists','boolean');
-        $this->addType('beforeSize','integer');
+		$this->addType('beforeSize','integer');
-        $this->addType('currentFileExists','boolean');
+		$this->addType('currentFileExists','boolean');
-        $this->addType('currentSize','integer');
+		$this->addType('currentFileId','integer');
+		$this->addType('currentSize','integer');
 		$this->addType('reverted','boolean');
-    }
+	}
 
-    public function jsonSerialize() {
+	public function jsonSerialize() {
-        return [
+		return [
-            'id' => $this->id,
+			'id' => $this->id,
-            'taskId' => $this->taskId,
+			'taskId' => $this->taskId,
-            'type' => $this->type,
+			'type' => $this->type,
-            'before' => [
+			'before' => [
-                'fileExists' => $this->beforeFileExists,
+				'fileExists' => $this->beforeFileExists,
-                'path' => $this->beforePath,
+				'path' => $this->beforePath,
-                'size' => $this->beforeSize,
+				'size' => $this->beforeSize,
-            ],
+			],
-            'current' => [
+			'current' => [
-                'fileExists' => $this->currentFileExists,
+				'fileExists' => $this->currentFileExists,
-                'path' => $this->currentPath,
+				'fileId' => $this->currentFileId,
-                'size' => $this->currentSize,
+				'path' => $this->currentPath,
+				'size' => $this->currentSize,
 			],
 			'reverted' => $this->reverted,
-        ];
+		];
-    }
+	}
 }

lib/Db/DiffTaskResultMapper.php

@@ -9,29 +9,29 @@ use OCP\AppFramework\Db\QBMapper;
  */
 class DiffTaskResultMapper extends QBMapper {
 
-    public function __construct(IDBConnection $db) {
+	public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'groupfolder_snapshots_task_results', DiffTaskResult::class);
+		parent::__construct($db, 'groupfolder_snapshots_task_results', DiffTaskResult::class);
-    }
+	}
 
-    public function find(int $id) {
+	public function find(int $id) {
-        $qb = $this->db->getQueryBuilder();
+		$qb = $this->db->getQueryBuilder();
 
-        $qb->select('*')
+		$qb->select('*')
-             ->from($this->getTableName())
+			 ->from($this->getTableName())
-             ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+			 ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
 
-        return $this->findEntity($qb);
+		return $this->findEntity($qb);
-    }
+	}
 
-    public function findAll(int $taskId) {
+	public function findAll(int $taskId) {
-        $qb = $this->db->getQueryBuilder();
+		$qb = $this->db->getQueryBuilder();
 
-        $qb->select('*')
+		$qb->select('*')
-           ->from($this->getTableName())
+		   ->from($this->getTableName())
-           ->where($qb->expr()->eq('task_id', $qb->createNamedParameter($taskId)));
+		   ->where($qb->expr()->eq('task_id', $qb->createNamedParameter($taskId)));
 
-        return $this->findEntities($qb);
+		return $this->findEntities($qb);
-    }
+	}
 
 	public function markReverted(int $id) {
 		$taskResult = $this->find($id);

lib/Entity/Snapshot.php

@@ -5,16 +5,30 @@ namespace OCA\GroupfolderFilesystemSnapshots\Entity;
 use JsonSerializable;
 
 class Snapshot implements JsonSerializable {
-    /** @var string */
+	public function __construct(
-    private $id;
+		private string $id,
+		private string $name,
+		private ?\DateTimeImmutable $createdTimestamp = null,
+	) {
+	}
 
-    public function __construct(string $id) {
+	public function getId(): string {
-        $this->id = $id;
+		return $this->id;
-    }
+	}
 
-    public function jsonSerialize(): mixed {
+	public function getName(): string {
+		return $this->name;
+	}
+
+	public function getCreatedTimestamp(): ?\DateTimeImmutable {
+		return $this->createdTimestamp;
+	}
+
+	public function jsonSerialize(): mixed {
 		return [
-			'id' => $this->id
+			'id' => $this->id,
+			'name' => $this->name,
+			'createdTimestamp' => $this->createdTimestamp?->getTimestamp(),
 		];
 	}
 }

lib/Helpers/FileHelper.php

@@ -3,34 +3,34 @@
 namespace OCA\GroupfolderFilesystemSnapshots\Helpers;
 
 class FileHelper {
-    private static function seperateFilesFromFolders($parentDir, $items) {
+	private static function seperateFilesFromFolders($parentDir, $items) {
-        $files = [];
+		$files = [];
-        $folders = [];
+		$folders = [];
 
-        foreach($items as $item) {
+		foreach($items as $item) {
-            if(is_dir($parentDir . DIRECTORY_SEPARATOR . $item)) {
+			if(is_dir($parentDir . DIRECTORY_SEPARATOR . $item)) {
-                $folders[] = $item;
+				$folders[] = $item;
-            } else {
+			} else {
-                $files[] = $item;
+				$files[] = $item;
-            }
+			}
-        }
+		}
 
-        return array($files, $folders);
+		return array($files, $folders);
-    }
+	}
 
-    public static function getFilesAndFolders($dir) {
+	public static function getFilesAndFolders($dir) {
-        $scan = array_diff(scandir($dir), array('..', '.'));
+		$scan = array_diff(scandir($dir), array('..', '.'));
 
-        return self::seperateFilesFromFolders($dir, $scan);
+		return self::seperateFilesFromFolders($dir, $scan);
-    }
+	}
 
-    public static function getFilesizesOfFiles($prefix, array $files) {
+	public static function getFilesizesOfFiles($prefix, array $files) {
-        $result = array();
+		$result = array();
 
-        foreach($files as $index=>$file) {
+		foreach($files as $index=>$file) {
-            $result[$index] = filesize($prefix . DIRECTORY_SEPARATOR . $file);
+			$result[$index] = filesize($prefix . DIRECTORY_SEPARATOR . $file);
-        }
+		}
 
-        return $result;
+		return $result;
-    }
+	}
 }

lib/Manager/PathManager.php

@@ -70,12 +70,12 @@ class PathManager {
 	private function checkIfGroupfolderExists(int $groupfolderId): bool {
 		$storageId = $this->getRootFolderStorageId();
 		if ($storageId === null) {
-			return "storage Id null";
+			return false;
 		}
 
 		$folder = $this->groupfolderFolderManager->getFolder($groupfolderId, $storageId);
 		if ($folder === false) {
-			return "Folder does not exist";
+			return false;
 		}
 		
 		return true;

lib/Manager/SnapshotManager.php

@@ -2,16 +2,21 @@
 
 namespace OCA\GroupfolderFilesystemSnapshots\Manager;
 
-use OCA\GroupfolderFilesystemSnapshots\Manager\PathManager;
+use OCP\IL10N;
 
+use OCA\GroupfolderFilesystemSnapshots\Manager\PathManager;
+use OCA\GroupfolderFilesystemSnapshots\Service\SettingsService;
 use OCA\GroupfolderFilesystemSnapshots\Entity\Snapshot;
 
 class SnapshotManager {
-    private PathManager $pathManager;
+	private string $snapshotNamingScheme = "";
 
-
+    public function __construct(
-    public function __construct(PathManager $pathManager){
+		protected readonly IL10N $l10n,
-        $this->pathManager = $pathManager;
+		private readonly PathManager $pathManager,
+		private readonly SettingsService $settingsService,
+	){
+		$this->snapshotNamingScheme = $this->settingsService->getAppValue("snapshot_naming_scheme");
     }
 
     private function validSnapshotId(string $snapshotId) {
@@ -27,20 +32,94 @@ class SnapshotManager {
         }
     }
 
+	private function createSnapshotEntity(string $id): Snapshot {
+		if ($this->snapshotNamingScheme === "zfs-auto-snapshot" && str_starts_with($id, "zfs-auto-snap")) {
+			if (str_starts_with($id, "zfs-auto-snap_hourly-")) {
+				$name = $this->l10n->t("Automated hourly backup");
+				$datetimestring = str_replace("zfs-auto-snap_hourly-", "", $id);
+			} elseif (str_starts_with($id, "zfs-auto-snap_daily-")) {
+				$name = $this->l10n->t("Automated daily backup");
+				$datetimestring = str_replace("zfs-auto-snap_daily-", "", $id);
+			} elseif (str_starts_with($id, "zfs-auto-snap_weekly-")) {
+				$name = $this->l10n->t("Automated weekly backup");
+				$datetimestring = str_replace("zfs-auto-snap_weekly-", "", $id);
+			} elseif (str_starts_with($id, "zfs-auto-snap_monthly-")) {
+				$name = $this->l10n->t("Automated monthly backup");
+				$datetimestring = str_replace("zfs-auto-snap_monthly-", "", $id);
+			}
+
+			if(isset($datetimestring)) {
+				$datetimearray = explode("-", $datetimestring);
+				$timestring = array_pop($datetimearray);
+
+				$year = (int)$datetimearray[0];
+				$month = (int)$datetimearray[1];
+				$day = (int)$datetimearray[2];
+				$hour = (int)substr($timestring, 0, 2);
+				$minute = (int)substr($timestring, 2, 2);
+
+				$createdTimestamp = (new \DateTimeImmutable())
+					->setDate($year, $month, $day)
+					->setTime($hour, $minute);
+			}
+
+			return new Snapshot(
+				id: $id,
+				name: $name ?: $id,
+				createdTimestamp: $createdTimestamp,
+			);
+		} else {
+			return new Snapshot(
+				id: $id,
+				name: $id,
+			);
+		}
+	}
+
     function get(string $snapshotId) {
         if(self::snapshotExists($snapshotId)) {
-            return new Snapshot($snapshotId);
+            return $this->createSnapshotEntity($snapshotId);
         } else {
             return false;
         }
-        
     }
 
-    function getAll() {
+	function getAll(): array {
+		$snapshots = [];
+
         $iterator = new \FilesystemIterator($this->pathManager->getFilesystemSnapshotsPath());
-        foreach ($iterator as $fileinfo) {
+
-            if(!$fileinfo->isDir()) continue;
+		foreach ($iterator as $fileinfo) {
-            yield new Snapshot($fileinfo->getFilename());
+			if(!$fileinfo->isDir()) continue;
-        }
+			$snapshots[] = $this->createSnapshotEntity($fileinfo->getFilename());
+		}
+
+		return $snapshots;
     }
+
+	function getAllGenerator(){
+        $iterator = new \FilesystemIterator($this->pathManager->getFilesystemSnapshotsPath());
+
+		foreach ($iterator as $fileinfo) {
+			if(!$fileinfo->isDir()) continue;
+			yield $this->createSnapshotEntity($fileinfo->getFilename());
+		}
+    }
+
+	/**
+	 * @var $subPathFilter Only return snapshots that have this subfolder in the specified groupfolder
+	 */
+    function getFilteredGenerator(int $groupfolderId, string $subDirectoryFilter) {
+        $iterator = new \FilesystemIterator($this->pathManager->getFilesystemSnapshotsPath());
+
+		$groupfolderSubdirectoryPath = $this->pathManager->getGroupFolderDirectory($groupfolderId, $subDirectoryFilter);
+
+		foreach ($iterator as $fileinfo) {
+			if(!$fileinfo->isDir()) continue;
+			$snapshotId = $fileinfo->getFilename();
+			$filterFullPath = $this->pathManager->convertToSnapshotPath($groupfolderSubdirectoryPath, $snapshotId);
+			if(!(is_dir($filterFullPath))) continue;
+			yield $this->createSnapshotEntity($snapshotId);
+		}
+	}
 }

lib/Migration/Version140Date20250701164500.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace OCA\GroupfolderFilesystemSnapshots\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\SimpleMigrationStep;
+use OCP\Migration\IOutput;
+
+class Version140Date20250701164500 extends SimpleMigrationStep {
+	const RESULTS_TABLE = "groupfolder_snapshots_task_results";
+
+	/**
+	* @param IOutput $output
+	* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	* @param array $options
+	* @return null|ISchemaWrapper
+	*/
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+		$table = $schema->getTable(self::RESULTS_TABLE);
+
+		if(!$table->hasColumn('current_file_id')) {
+			$table->addColumn('current_file_id', Types::BIGINT, [
+				'notnull' => false,
+			]);
+		}
+
+		return $schema;
+	}
+}

lib/RecursiveDiff.php

@@ -5,227 +5,223 @@ namespace OCA\GroupfolderFilesystemSnapshots;
 use OCA\GroupfolderFilesystemSnapshots\Helpers\FileHelper;
 
 class RecursiveDiff {
+	private $scan1files = [];
+	private $scan1folders = [];
 
-    public string $dir1;
+	private $scan2files = [];
-    public string $dir2;
+	private $scan2folders = [];
 
-    private $prefix;
+	private $subJobs = [];
 
-    private $newResultCallback;
+	private $subJobProgress = [];
-    private $progressCallback;
+	private $progress = 0;
 
-    private $scan1files = [];
+	public function __construct(
-    private $scan1folders = [];
+		public readonly string $dir1,
+		public readonly string $dir2,
+		private readonly string $prefix = "",
+		private readonly array $folderBlocklist = [],
+		private $newResultCallback,
+		private $progressCallback,
+	){}
 
-    private $scan2files = [];
+	public function scan() {
-    private $scan2folders = [];
+		$scan_num_files = 0;
 
-    private $subJobs = [];
+		if(file_exists($this->dir1) && is_dir($this->dir1)) {
+			[$this->scan1files, $this->scan1folders] = FileHelper::getFilesAndFolders($this->dir1);
+		}
+		
+		if(file_exists($this->dir2) && is_dir($this->dir2)) {
+			[$this->scan2files, $this->scan2folders] = FileHelper::getFilesAndFolders($this->dir2);
+		}
 
-    private $subJobProgress = [];
+		$scan_num_files += sizeof($this->scan1files);
-    private $progress = 0;
+		$scan_num_files += sizeof($this->scan2files);
+		
+		$allSubfolders = array_unique(array_merge($this->scan1folders, $this->scan2folders));
 
-    public function __construct($dir1, $dir2, $prefix = "", $newResultCallback, $progressCallback){
+		foreach($allSubfolders as $key=>$folder) {
-        $this->dir1 = $dir1;
+			$subdir1 = $this->dir1 . DIRECTORY_SEPARATOR . $folder;
-        $this->dir2 = $dir2;
+			$subdir2 = $this->dir2 . DIRECTORY_SEPARATOR . $folder;
-        $this->prefix = $prefix;
+			$subprefix = $this->prefix . DIRECTORY_SEPARATOR . $folder;
+			$subFolderBlocklist = $this->folderBlocklist[$folder] ?? [];
 
-        $this->newResultCallback = $newResultCallback;
+			if($subFolderBlocklist === true) {
-        $this->progressCallback = $progressCallback;
+				continue;
-    }
+			}
+			
+			$newJob = new RecursiveDiff($subdir1, $subdir2, $subprefix, $subFolderBlocklist, $this->newResultCallback, function($numDoneFiles) use ($key) {
+				$this->subJobProgress[$key] = $numDoneFiles;
 
-    public function scan() {
+				$this->updateProgress();
-        $scan_num_files = 0;
+			});
 
-        if(file_exists($this->dir1) && is_dir($this->dir1)) {
+			$this->subJobs[] = $newJob;
-            [$this->scan1files, $this->scan1folders] = FileHelper::getFilesAndFolders($this->dir1);
-        }
-        
-        if(file_exists($this->dir2) && is_dir($this->dir2)) {
-            [$this->scan2files, $this->scan2folders] = FileHelper::getFilesAndFolders($this->dir2);
-        }
 
-        $scan_num_files += sizeof($this->scan1files);
+			$scan_num_files += $newJob->scan();
-        $scan_num_files += sizeof($this->scan2files);
+		}
-        
-        $allSubfolders = array_unique(array_merge($this->scan1folders, $this->scan2folders));
 
-        foreach($allSubfolders as $key=>$folder) {
+		return $scan_num_files;
-            $subdir1 = $this->dir1 . DIRECTORY_SEPARATOR . $folder;
+	}
-            $subdir2 = $this->dir2 . DIRECTORY_SEPARATOR . $folder;
-            $subprefix = $this->prefix . DIRECTORY_SEPARATOR . $folder;
-            
-            $newJob = new RecursiveDiff($subdir1, $subdir2, $subprefix, $this->newResultCallback, function($numDoneFiles) use ($key) {
-                $this->subJobProgress[$key] = $numDoneFiles;
 
-                $this->updateProgress();
+	private function updateProgress() {
-            });
+		($this->progressCallback)(array_sum($this->subJobProgress) + $this->progress);
+	}
 
-            $this->subJobs[] = $newJob;
+	function diff() {
+		$diff = [];
 
-            $scan_num_files += $newJob->scan();
+		foreach($this->subJobs as $job) {
-        }
+			$result = $job->diff();
+			array_push($diff, ...$result);
+		}
 
-        return $scan_num_files;
+		$fileCreations = array_diff($this->scan2files, $this->scan1files);
-    }
+		$fileCreationsFilesizes = FileHelper::getFilesizesOfFiles($this->dir2, $fileCreations);
 
-    private function updateProgress() {
+		$fileDeletions = array_diff($this->scan1files, $this->scan2files);
-        ($this->progressCallback)(array_sum($this->subJobProgress) + $this->progress);
+		$fileDeletionsFilesizes = FileHelper::getFilesizesOfFiles($this->dir1, $fileDeletions);
-    }
 
-    function diff() {
+		$filePossibleEdits = array_intersect($this->scan1files, $this->scan2files);
-        $diff = [];
 
-        foreach($this->subJobs as $job) {
+		/*$diff[] = [
-            $result = $job->diff();
+			"type" => "DEBUG",
-            array_push($diff, ...$result);
+			"prefix" => $this->prefix,
-        }
+			"fileCreations" => $fileCreations,
+			"fileCreationsFilesizes" => $fileCreationsFilesizes,
+			"fileDeletions" => $fileDeletions,
+			"fileDeletionsFilesizes" => $fileDeletionsFilesizes,
+			//"folderCreations" => $folderCreations,
+			//"folderDeletions" => $folderDeletions,
+			"allSubfolders" => $allSubfolders,
+		];*/
 
-        $fileCreations = array_diff($this->scan2files, $this->scan1files);
+		// search for creations and deletions, that are actually renames
-        $fileCreationsFilesizes = FileHelper::getFilesizesOfFiles($this->dir2, $fileCreations);
+		foreach($fileCreations as $creationIndex=>$creation) {
+			$creationPath = $this->dir2 . DIRECTORY_SEPARATOR . $creation;
+			$creationSize = $fileCreationsFilesizes[$creationIndex];
+			
+			$renameContenders = array_keys($fileDeletionsFilesizes, $creationSize);
 
-        $fileDeletions = array_diff($this->scan1files, $this->scan2files);
+			if(sizeof($renameContenders) != 0) {
-        $fileDeletionsFilesizes = FileHelper::getFilesizesOfFiles($this->dir1, $fileDeletions);
+				/*$diff[] = [
+					"type" => "DEBUG",
+					"comparing" => [
+						"creation" => $creationIndex,
+						"deletions" => $renameContenders,
+					],
+				];*/
 
-        $filePossibleEdits = array_intersect($this->scan1files, $this->scan2files);
+				$creationSHA = sha1_file($creationPath);
+				foreach($renameContenders as $contender) {
+					$deletion = $fileDeletions[$contender];
+					$deletionPath = $this->dir1 . DIRECTORY_SEPARATOR . $deletion;
+					$deletionSHA = sha1_file($deletionPath);
 
-        /*$diff[] = [
+					if($deletionSHA == $creationSHA) {
-            "type" => "DEBUG",
+						($this->newResultCallback)(
-            "prefix" => $this->prefix,
+							type: "RENAME",
-            "fileCreations" => $fileCreations,
+							beforeFileExists: True,
-            "fileCreationsFilesizes" => $fileCreationsFilesizes,
+							beforePath: $this->prefix . DIRECTORY_SEPARATOR . $deletion,
-            "fileDeletions" => $fileDeletions,
+							beforeSize: $creationSize,
-            "fileDeletionsFilesizes" => $fileDeletionsFilesizes,
+							currentFileExists: True,
-            //"folderCreations" => $folderCreations,
+							currentPath: $this->prefix . DIRECTORY_SEPARATOR . $creation,
-            //"folderDeletions" => $folderDeletions,
+							currentSize: $creationSize,
-            "allSubfolders" => $allSubfolders,
+						);
-        ];*/
 
-        // search for creations and deletions, that are actually renames
+						unset($fileCreations[$creationIndex]);
-        foreach($fileCreations as $creationIndex=>$creation) {
+						unset($fileDeletions[$contender]);
-            $creationPath = $this->dir2 . DIRECTORY_SEPARATOR . $creation;
-            $creationSize = $fileCreationsFilesizes[$creationIndex];
-            
-            $renameContenders = array_keys($fileDeletionsFilesizes, $creationSize);
 
-            if(sizeof($renameContenders) != 0) {
+						$this->progress += 2;
-                /*$diff[] = [
+						$this->updateProgress();
-                    "type" => "DEBUG",
-                    "comparing" => [
-                        "creation" => $creationIndex,
-                        "deletions" => $renameContenders,
-                    ],
-                ];*/
 
-                $creationSHA = sha1_file($creationPath);
+						break;
-                foreach($renameContenders as $contender) {
+					}
-                    $deletion = $fileDeletions[$contender];
+				}
-                    $deletionPath = $this->dir1 . DIRECTORY_SEPARATOR . $deletion;
+			}
-                    $deletionSHA = sha1_file($deletionPath);
+		}
 
-                    if($deletionSHA == $creationSHA) {
+		foreach($fileCreations as $index=>$creation) {
-                        ($this->newResultCallback)(
+			($this->newResultCallback)(
-                            type: "RENAME",
+				type: "CREATION",
-                            beforeFileExists: True,
+				beforeFileExists: False,
-                            beforePath: $this->prefix . DIRECTORY_SEPARATOR . $deletion,
+				beforePath: NULL,
-                            beforeSize: $creationSize,
+				beforeSize: NULL,
-                            currentFileExists: True,
+				currentFileExists: True,
-                            currentPath: $this->prefix . DIRECTORY_SEPARATOR . $creation,
+				currentPath: $this->prefix . DIRECTORY_SEPARATOR . $creation,
-                            currentSize: $creationSize,
+				currentSize: $fileCreationsFilesizes[$index],
-                        );
+			);
 
-                        unset($fileCreations[$creationIndex]);
+			$this->progress++;
-                        unset($fileDeletions[$contender]);
+			$this->updateProgress();
+		}
 
-                        $this->progress += 2;
+		foreach($fileDeletions as $index=>$deletion) {
-                        $this->updateProgress();
+			($this->newResultCallback)(
+				type: "DELETION",
+				beforeFileExists: True,
+				beforePath: $this->prefix . DIRECTORY_SEPARATOR . $deletion,
+				beforeSize: $fileDeletionsFilesizes[$index],
+				currentFileExists: False,
+				currentPath: NULL,
+				currentSize: NULL,
+			);
 
-                        break;
+			$this->progress++;
-                    }
+			$this->updateProgress();
-                }
+		}
-            }
-        }
 
-        foreach($fileCreations as $index=>$creation) {
+		foreach($filePossibleEdits as $possibleEdit) {
-            ($this->newResultCallback)(
+			$file1 = $this->dir1 . DIRECTORY_SEPARATOR . $possibleEdit;
-                type: "CREATION",
+			$file2 = $this->dir2 . DIRECTORY_SEPARATOR . $possibleEdit;
-                beforeFileExists: False,
+			$file1Size = filesize($file1);
-                beforePath: NULL,
+			$file2Size = filesize($file2);
-                beforeSize: NULL,
-                currentFileExists: True,
-                currentPath: $this->prefix . DIRECTORY_SEPARATOR . $creation,
-                currentSize: $fileCreationsFilesizes[$index],
-            );
 
-            $this->progress++;
+			$this->progress += 2;
-            $this->updateProgress();
+			$this->updateProgress();
-        }
 
-        foreach($fileDeletions as $index=>$deletion) {
+			if(filemtime($file1) == filemtime($file2)) {
-            ($this->newResultCallback)(
+				//not different because same mtime
-                type: "DELETION",
+				continue;
-                beforeFileExists: True,
+			} else {
-                beforePath: $this->prefix . DIRECTORY_SEPARATOR . $deletion,
+				// mtime different, but could just have gotten touched without modifications
-                beforeSize: $fileDeletionsFilesizes[$index],
+				if($file1Size == $file2Size) {
-                currentFileExists: False,
+					// if filesize is the same check for binary differences
-                currentPath: NULL,
+					$handle1 = fopen($file1, 'rb');
-                currentSize: NULL,
+					$handle2 = fopen($file2, 'rb');
-            );
 
-            $this->progress++;
+					$filesdifferent = false;
-            $this->updateProgress();
-        }
 
-        foreach($filePossibleEdits as $possibleEdit) {
+					while(!feof($handle1)) {
-            $file1 = $this->dir1 . DIRECTORY_SEPARATOR . $possibleEdit;
+						if(fread($handle1, 8192) != fread($handle2, 8192)) {
-            $file2 = $this->dir2 . DIRECTORY_SEPARATOR . $possibleEdit;
+							// files are different
-            $file1Size = filesize($file1);
+							$filesdifferent = true;
-            $file2Size = filesize($file2);
+							break;
+						}
+					}
 
-            $this->progress += 2;
+					fclose($handle1);
-            $this->updateProgress();
+					fclose($handle2);
 
-            if(filemtime($file1) == filemtime($file2)) {
+					if(!$filesdifferent) {
-                //not different because same mtime
+						continue;
-                continue;
+					}
-            } else {
+				}
-                // mtime different, but could just have gotten touched without modifications
+			}
-                if($file1Size == $file2Size) {
-                    // if filesize is the same check for binary differences
-                    $handle1 = fopen($file1, 'rb');
-                    $handle2 = fopen($file2, 'rb');
 
-                    $filesdifferent = false;
+			
+			($this->newResultCallback)(
+				type: "EDIT",
+				beforeFileExists: True,
+				beforePath: $this->prefix . DIRECTORY_SEPARATOR . $possibleEdit,
+				beforeSize: $file1Size,
+				currentFileExists: True,
+				currentPath: $this->prefix . DIRECTORY_SEPARATOR . $possibleEdit,
+				currentSize: $file2Size,
+			);
+		}
 
-                    while(!feof($handle1)) {
+		return $diff;
-                        if(fread($handle1, 8192) != fread($handle2, 8192)) {
+	}
-                            // files are different
-                            $filesdifferent = true;
-                            break;
-                        }
-                    }
-
-                    fclose($handle1);
-                    fclose($handle2);
-
-                    if(!$filesdifferent) {
-                        continue;
-                    }
-                }
-            }
-
-            
-            ($this->newResultCallback)(
-                type: "EDIT",
-                beforeFileExists: True,
-                beforePath: $this->prefix . DIRECTORY_SEPARATOR . $possibleEdit,
-                beforeSize: $file1Size,
-                currentFileExists: True,
-                currentPath: $this->prefix . DIRECTORY_SEPARATOR . $possibleEdit,
-                currentSize: $file2Size,
-            );
-        }
-
-        return $diff;
-    }
 }

lib/Sections/SnapshotsSection.php

@@ -6,27 +6,27 @@ use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
 
 class SnapshotsSection implements IIconSection {
-    private IL10N $l;
+	private IL10N $l;
-    private IURLGenerator $urlGenerator;
+	private IURLGenerator $urlGenerator;
 
-    public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
+	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-        $this->l = $l;
+		$this->l = $l;
-        $this->urlGenerator = $urlGenerator;
+		$this->urlGenerator = $urlGenerator;
-    }
+	}
 
-    public function getIcon(): string {
+	public function getIcon(): string {
-        return $this->urlGenerator->imagePath('core', 'actions/settings-dark.svg');
+		return $this->urlGenerator->imagePath('core', 'actions/settings-dark.svg');
-    }
+	}
 
-    public function getID(): string {
+	public function getID(): string {
-        return 'groupfolder_filesystem_snapshots';
+		return 'groupfolder_filesystem_snapshots';
-    }
+	}
 
-    public function getName(): string {
+	public function getName(): string {
-        return $this->l->t('Groupfolder Filesystem Snapshots');
+		return $this->l->t('Groupfolder Filesystem Snapshots');
-    }
+	}
 
-    public function getPriority(): int {
+	public function getPriority(): int {
-        return 98;
+		return 98;
-    }
+	}
 }

lib/Service/DiffTaskResultService.php

@@ -58,7 +58,7 @@ class DiffTaskResultService {
 		$diffTaskResult = $this->find($id);
 
 		if($diffTaskResult->getReverted()) {
-			throw new AlreadyRevertedException;
+			throw new AlreadyRevertedException();
 		}
 
 		$taskId = $diffTaskResult->getTaskId();
@@ -66,35 +66,35 @@ class DiffTaskResultService {
 
 		$snapshotPath = $this->pathManager->getGroupFolderSnapshotDirectory($diffTask->getGroupfolderId(), $diffTask->getRelativePath(), $diffTask->getSnapshotId());
 		
-		$gruenerFolder = $this->pathManager->getGroupfolderMountById($diffTask->getGroupfolderId())->get($diffTask->getRelativePath());
+		$parentFolder = $this->pathManager->getGroupfolderMountById($diffTask->getGroupfolderId())->get($diffTask->getRelativePath());
 
 		switch($diffTaskResult->getType()) {
 			case "CREATION":
-				$currentFile = $this->getSubfolderMustExist($gruenerFolder, $diffTaskResult->getCurrentPath());
+				$currentFile = $this->getSubfolderMustExist($parentFolder, $diffTaskResult->getCurrentPath());
 				$currentFile->delete();
 				break;
 			case "RENAME":
-				$currentFile = $this->getSubfolderMustExist($gruenerFolder, $diffTaskResult->getCurrentPath());
+				$currentFile = $this->getSubfolderMustExist($parentFolder, $diffTaskResult->getCurrentPath());
-				$beforeDirectory = $this->getOrCreateSubdirectoryByFilepath($gruenerFolder, $diffTaskResult->getBeforePath());
+				$beforeDirectory = $this->getOrCreateSubdirectoryByFilepath($parentFolder, $diffTaskResult->getBeforePath());
 
 				$currentFile->move($beforeDirectory->getPath() . DIRECTORY_SEPARATOR . basename($diffTaskResult->getBeforePath()));
 				break;
 			case "DELETION":
 				$beforeFileFilesystemPath = $snapshotPath . DIRECTORY_SEPARATOR . $diffTaskResult->getBeforePath();
 
-				$beforeDirectory = $this->getOrCreateSubdirectoryByFilepath($gruenerFolder, $diffTaskResult->getBeforePath());
+				$beforeDirectory = $this->getOrCreateSubdirectoryByFilepath($parentFolder, $diffTaskResult->getBeforePath());
 				$restoredFile = $beforeDirectory->newFile(basename($diffTaskResult->getBeforePath()));
 
 				$this->copyFilesystemFileToNextcloudFile($beforeFileFilesystemPath, $restoredFile);
 				break;
 			case "EDIT":
-				$currentFile = $this->getSubfolderMustExist($gruenerFolder, $diffTaskResult->getCurrentPath());
+				$currentFile = $this->getSubfolderMustExist($parentFolder, $diffTaskResult->getCurrentPath());
 				$beforeFileFilesystemPath = $snapshotPath . DIRECTORY_SEPARATOR . $diffTaskResult->getBeforePath();
 
 				$this->copyFilesystemFileToNextcloudFile($beforeFileFilesystemPath, $currentFile);
 				break;
 			default:
-				throw new \Exception;
+				throw new Exception();
 		}
 
 		return $this->mapper->markReverted($id);
@@ -104,7 +104,7 @@ class DiffTaskResultService {
 		if($parent->nodeExists($path)) {
 			return $parent->get($path);
 		} else {
-			throw new ChangesMadeSinceDiffException;
+			throw new ChangesMadeSinceDiffException();
 		}
 	}
 
@@ -119,7 +119,7 @@ class DiffTaskResultService {
 				if($temp instanceof \OCP\Files\Folder) {
 					$beforeDirectory = $temp;
 				} else {
-					throw new ChangesMadeSinceDiffException;
+					throw new ChangesMadeSinceDiffException();
 				}
 			} else {
 				$beforeDirectory = $beforeDirectory->newFolder($subdir);

lib/Service/DiffTaskService.php

@@ -58,7 +58,8 @@ class DiffTaskService {
 		}
 	}
 
-	function create(string $relativePathInGroupfolder, int $groupfolderId, string $snapshotId, string $userId, Callable $progressCallback = null): ?DiffTask {
+	function create(string $relativePathInGroupfolder, int $groupfolderId, string $snapshotId, string $userId, array $folderBlocklist, Callable $progressCallback = null): ?DiffTask {
+		$parentNode = $this->pathManager->getGroupfolderMountById($groupfolderId)->get($relativePathInGroupfolder);
 		$snapshotPath = $this->pathManager->getGroupFolderSnapshotDirectory($groupfolderId, $relativePathInGroupfolder, $snapshotId);
 		$groupfolderPath = $this->pathManager->getGroupFolderDirectory($groupfolderId, $relativePathInGroupfolder);
 
@@ -80,16 +81,25 @@ class DiffTaskService {
 			$snapshotPath,
 			$groupfolderPath,
 			"",
-			function(string $type, bool $beforeFileExists, ?string $beforePath, ?int $beforeSize, bool $currentFileExists, ?string $currentPath, ?int $currentSize) use ($task) {
+			$folderBlocklist,
+			function(string $type, bool $beforeFileExists, ?string $beforePath, ?int $beforeSize, bool $currentFileExists, ?string $currentPath, ?int $currentSize) use ($task, $parentNode) {
 				$newResult = new DiffTaskResult();
 				$newResult->setTaskId($task->getId());
 				$newResult->setType($type);
+
 				$newResult->setBeforeFileExists($beforeFileExists);
-				$newResult->setBeforePath($beforePath);
+				if($beforeFileExists) {
-				$newResult->setBeforeSize($beforeSize);
+					$newResult->setBeforePath($beforePath);
+					$newResult->setBeforeSize($beforeSize);
+				}
+
 				$newResult->setCurrentFileExists($currentFileExists);
-				$newResult->setCurrentPath($currentPath);
+				if($currentFileExists) {
-				$newResult->setCurrentSize($currentSize);
+					$newResult->setCurrentFileId($parentNode->get($currentPath)?->getId());
+					$newResult->setCurrentPath($currentPath);
+					$newResult->setCurrentSize($currentSize);
+				}
+
 				$newResult = $this->diffTaskResultMapper->insert($newResult);
 			},
 			function($numDoneFiles) use ($progressCallback, &$numFiles) {
@@ -97,8 +107,7 @@ class DiffTaskService {
 					($progressCallback)([
 						"overallFiles" => $numFiles,
 						"doneFiles" => $numDoneFiles,
-						"progress" => number_format(($numDoneFiles / $numFiles),2),
+						"progress" => floor(($numDoneFiles / $numFiles) * 100) / 100,
-						"progressPercent" => (number_format(($numDoneFiles / $numFiles),2) * 100) . "%",
 					]);
 				}
 			},
@@ -113,7 +122,6 @@ class DiffTaskService {
 				"overallFiles" => $numFiles,
 				"doneFiles" => $numFiles,
 				"progress" => 1.0,
-				"progressPercent" => "100.00%",
 				"result" => $task,
 			]);
 		}

lib/Service/SettingsService.php

@@ -9,7 +9,7 @@ use OCP\IConfig;
 
 class SettingsService {
 
-	private static array $VALID_APP_SETTINGS = ["filesystem_mountpoint_path", "filesystem_snapshots_path"];
+	private static array $VALID_APP_SETTINGS = ["filesystem_mountpoint_path", "filesystem_snapshots_path", "snapshot_naming_scheme"];
 	
 	public function __construct(private IConfig $config) {
 	}
@@ -28,7 +28,7 @@ class SettingsService {
 		}
 	}
 
-    public function setAppValue(string $key, string $value): string {
+	public function setAppValue(string $key, string $value): string {
 		if(in_array($key, self::$VALID_APP_SETTINGS)) {
 			if($value !== '') {
 				$this->config->setAppValue(Application::APP_ID, $key, $value);
@@ -38,5 +38,5 @@ class SettingsService {
 
 			return $value;
 		}
-    }
+	}
 }

lib/Settings/SnapshotsAdmin.php

@@ -6,21 +6,21 @@ use OCP\Settings\ISettings;
 
 class SnapshotsAdmin implements ISettings {
 
-    public function __construct() {
+	public function __construct() {
-    }
+	}
 
-    /**
+	/**
-     * @return TemplateResponse
+	 * @return TemplateResponse
-     */
+	 */
-    public function getForm() {
+	public function getForm() {
-        return new TemplateResponse('groupfolder_filesystem_snapshots', 'settings/admin');
+		return new TemplateResponse('groupfolder_filesystem_snapshots', 'settings/admin');
-    }
+	}
 
-    public function getSection() {
+	public function getSection() {
-        return 'groupfolder_filesystem_snapshots';
+		return 'groupfolder_filesystem_snapshots';
-    }
+	}
 
-    public function getPriority() {
+	public function getPriority() {
-        return 10;
+		return 10;
-    }
+	}
 }

package.json

@@ -36,6 +36,6 @@
 	"devDependencies": {
 		"@nextcloud/babel-config": "^1.2.0",
 		"@nextcloud/browserslist-config": "^3.0.1",
-		"@nextcloud/webpack-vue-config": "^6.0.0"
+		"@nextcloud/webpack-vue-config": "^5.4.0"
 	}
 }

src/AdminSettings.vue

@@ -4,12 +4,13 @@
 			name="Groupfolder Filesystem Snapshots"
 			:limit-width="false">
 			<div v-if="!loading">
-				<Field :is="setting.sensitive ? NcPasswordField : NcTextField"
+				<Field :is="getAppSettingComponent(setting)"
 					v-for="setting in app_settings"
+					v-bind="getAppSettingProps(setting)"
 					:key="setting.id"
 					class="settings_field"
 					:value="settings?.[setting.id]"
-					:label="setting.name"
+					@update:modelValue="(newValue) => updateSetting(setting.id, newValue)"
 					@update:value="(newValue) => updateSetting(setting.id, newValue)" />
 			</div>
 		</NcSettingsSection>
@@ -18,7 +19,7 @@
 <script setup>
 import { ref } from "vue";
 import debounceFunction from 'debounce-fn';
-import { NcSettingsSection, NcTextField, NcPasswordField } from "@nextcloud/vue"
+import { NcSettingsSection, NcTextField, NcPasswordField, NcSelect } from "@nextcloud/vue"
 
 import { adminSettingsApi } from "./adminSettingsApi.js";
 
@@ -26,10 +27,53 @@ let loading = ref(true);
 let settings = ref({});
 
 const app_settings = [
-	{id: "filesystem_mountpoint_path", name: "Filesystem Mountpoint Path"},
+	{id: "filesystem_mountpoint_path", name: "Filesystem Mountpoint Path", type: "text" },
-	{id: "filesystem_snapshots_path", name: "Filesystem Snapshots Path"},
+	{id: "filesystem_snapshots_path", name: "Filesystem Snapshots Path", type: "text"},
+	{
+		id: "snapshot_naming_scheme",
+		name: "Snapshot Naming Scheme",
+		type: "select",
+		options: [
+			{
+				id: '',
+				label: 'None',
+			},
+			{
+				id: 'zfs-auto-snapshot',
+				label: 'zfs-auto-snapshot',
+			},
+		]
+	},
 ];
 
+const getAppSettingComponent = function(appSetting) {
+	if(appSetting.type === "select") {
+		return NcSelect;
+	} else {
+		if(appSetting?.sensitive) {
+			return NcPasswordField;
+		} else {
+			return NcTextField;
+		}
+	}
+}
+
+const getAppSettingProps = function(appSetting) {
+	if(appSetting.type === "select") {
+		return {
+			options: appSetting.options,
+			label: "label",
+			inputLabel: appSetting.name,
+			reduce: (option) => ( option.id )
+		};
+	} else {
+		return {
+			label: appSetting.name,
+			clearable: false,
+		};
+	}
+}
+
 adminSettingsApi.getAllSettings().then((result) => {
 	settings.value = result;
 	loading.value = false;