Allow to specify apps that somethign is a dir

Signed-off-by: Joas Schilling <[email protected]>
HolgerHees · Dec 10, 2019 · 4a151c5 · 4a151c5
1 parent 511a4ba
commit 4a151c5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php
@@ -57,12 +57,18 @@ public function __construct(IL10N $l, IRequest $request, IMimeTypeDetector $mime
 	/**
 	 * @param IStorage $storage
 	 * @param string $path
+	 * @param bool $isDir
 	 */
-	public function setFileInfo(IStorage $storage, string $path) {
-		$this->_setFileInfo($storage, $path);
+	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
+		$this->_setFileInfo($storage, $path, $isDir);
 		if (!isset($this->mimeType[$this->storage->getId()][$this->path])
 			|| $this->mimeType[$this->storage->getId()][$this->path] === '') {
-			$this->mimeType[$this->storage->getId()][$this->path] = null;
+
+			if ($isDir) {
+				$this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
+			} else {
+				$this->mimeType[$this->storage->getId()][$this->path] = null;
+			}
 		}
 	}
 

diff --git a/apps/workflowengine/lib/Check/TFileCheck.php b/apps/workflowengine/lib/Check/TFileCheck.php
@@ -37,14 +37,19 @@ trait TFileCheck {
 	/** @var string */
 	protected $path;
 
+	/** @var bool */
+	protected $isDir;
+
 	/**
 	 * @param IStorage $storage
 	 * @param string $path
+	 * @param bool $isDir
 	 * @since 18.0.0
 	 */
-	public function setFileInfo(IStorage $storage, string $path) {
+	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
 		$this->storage = $storage;
 		$this->path = $path;
+		$this->isDir = $isDir;
 	}
 
 	/**

diff --git a/apps/workflowengine/lib/Service/RuleMatcher.php b/apps/workflowengine/lib/Service/RuleMatcher.php
@@ -71,9 +71,10 @@ public function __construct(
 		$this->l = $l;
 	}
 
-	public function setFileInfo(IStorage $storage, string $path): void {
+	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
 		$this->fileInfo['storage'] = $storage;
 		$this->fileInfo['path'] = $path;
+		$this->fileInfo['isDir'] = $isDir;
 	}
 
 	public function setEntitySubject(IEntity $entity, $subject): void {
@@ -168,7 +169,7 @@ public function check(array $check) {
 			if (empty($this->fileInfo)) {
 				throw new RuntimeException('Must set file info before running the check');
 			}
-			$checkInstance->setFileInfo($this->fileInfo['storage'], $this->fileInfo['path']);
+			$checkInstance->setFileInfo($this->fileInfo['storage'], $this->fileInfo['path'], $this->fileInfo['isDir']);
 		} elseif ($checkInstance instanceof IEntityCheck) {
 			foreach($this->contexts as $entityInfo) {
 				list($entity, $subject) = $entityInfo;

diff --git a/lib/public/WorkflowEngine/IFileCheck.php b/lib/public/WorkflowEngine/IFileCheck.php
@@ -37,8 +37,11 @@
  */
 interface IFileCheck extends IEntityCheck {
 	/**
+	 * @param IStorage $storage
+	 * @param string $path
+	 * @param bool $isDir
 	 * @since 18.0.0
 	 */
-	public function setFileInfo(IStorage $storage, string $path);
+	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void;
 
 }