set timeout to lockinfo

lib/Db/CoreRequestBuilder.php

@@ -32,6 +32,7 @@
 
 use OC;
 use OC\DB\SchemaWrapper;
+use OCA\FilesLock\Service\ConfigService;
 use OCA\FilesLock\Service\MiscService;
 use OCP\IDBConnection;
 use OCP\ILogger;
@@ -57,6 +58,9 @@ class CoreRequestBuilder {
 	/** @var IDBConnection */
 	protected $dbConnection;
 
+	/** @var ConfigService */
+	protected $configService;
+
 	/** @var MiscService */
 	protected $miscService;
 
@@ -70,11 +74,15 @@ class CoreRequestBuilder {
 	 *
 	 * @param IDBConnection $connection
 	 * @param ILogger $logger
+	 * @param ConfigService $configService
 	 * @param MiscService $miscService
 	 */
-	public function __construct(IDBConnection $connection, ILogger $logger, MiscService $miscService) {
+	public function __construct(
+		IDBConnection $connection, ILogger $logger, ConfigService $configService, MiscService $miscService
+	) {
 		$this->dbConnection = $connection;
 		$this->logger = $logger;
+		$this->configService = $configService;
 		$this->miscService = $miscService;
 	}
 

lib/Db/LocksRequestBuilder.php

@@ -34,6 +34,7 @@
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use OCA\FilesLock\Exceptions\LockNotFoundException;
 use OCA\FilesLock\Model\FileLock;
+use OCA\FilesLock\Service\ConfigService;
 
 
 /**
@@ -141,7 +142,7 @@ public function getLocksFromRequest(LocksQueryBuilder $qb): array {
 	 * @return FileLock
 	 */
 	public function parseLockSelectSql(array $data): FileLock {
-		$lock = new FileLock();
+		$lock = new FileLock($this->configService->getTimeoutSeconds());
 		$lock->importFromDatabase($data);
 
 		return $lock;

lib/Model/FileLock.php

@@ -61,14 +61,20 @@ class FileLock implements IQueryRow, JsonSerializable {
 	/** @var int */
 	private $fileId = 0;
 
+	/** @var int */
+	private $timeout = 1800;
+
 	/** @var int */
 	private $creation = 0;
 
 
 	/**
 	 * FileLock constructor.
+	 *
+	 * @param int $timeout
 	 */
-	public function __construct() {
+	public function __construct(int $timeout = 1800) {
+		$this->timeout = $timeout;
 	}
 
 
@@ -167,6 +173,25 @@ public function setToken(string $token): self {
 	}
 
 
+	/**
+	 * @return int
+	 */
+	public function getTimeout(): int {
+		return $this->timeout;
+	}
+
+	/**
+	 * @param int $timeout
+	 *
+	 * @return FileLock
+	 */
+	public function setTimeout(int $timeout): self {
+		$this->timeout = $timeout;
+
+		return $this;
+	}
+
+
 	/**
 	 * @return int
 	 */
@@ -193,7 +218,7 @@ public function toLockInfo(): LockInfo {
 		$lock = new LockInfo();
 		$lock->owner = $this->getUserId();
 		$lock->token = $this->getToken();
-		$lock->timeout = 100000;
+		$lock->timeout = $this->getTimeout();
 		$lock->created = $this->getCreation();
 		$lock->scope = LockInfo::EXCLUSIVE;
 		$lock->depth = 1;

lib/Service/ConfigService.php

@@ -79,6 +79,14 @@ public function __construct(
 	}
 
 
+	/**
+	 * @return int
+	 */
+	public function getTimeoutSeconds(): int {
+		return ((int)$this->getAppValue(ConfigService::LOCK_TIMEOUT)) * 60;
+	}
+
+
 	/**
 	 * Get a value by key
 	 *

lib/Service/LockService.php

@@ -155,7 +155,7 @@ public function lockFile(Node $file, IUser $user): FileLock {
 			throw new NotFileException('Must be a file, seems to be a folder.');
 		}
 
-		$lock = new FileLock();
+		$lock = new FileLock($this->configService->getTimeoutSeconds());
 		$lock->setUserId($user->getUID());
 		$lock->setFileId($file->getId());