fix: Avoid failing with duplicate checks

Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Feb 23, 2023 · 77e0403 · 77e0403
1 parent 710c593
commit 77e0403
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php
@@ -107,13 +107,7 @@ protected function cacheAndReturnMimeType(string $storageId, ?string $path, stri
 	 * @return bool
 	 */
 	public function executeCheck($operator, $value) {
-		$actualValue = $this->getActualValue();
-		$plainMimetypeResult = $this->executeStringCheck($operator, $value, $actualValue);
-		if ($actualValue === 'httpd/unix-directory') {
-			return $plainMimetypeResult;
-		}
-		$detectMimetypeBasedOnFilenameResult = $this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path));
-		return $plainMimetypeResult || $detectMimetypeBasedOnFilenameResult;
+		return $this->executeStringCheck($operator, $value, $this->getActualValue());
 	}
 
 	/**

diff --git a/apps/workflowengine/tests/Check/FileMimeTypeTest.php b/apps/workflowengine/tests/Check/FileMimeTypeTest.php
@@ -127,7 +127,7 @@ public function testNonCachedNotLocal() {
 		$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
 		$check->setFileInfo($storage, 'foo/bar.txt');
 
-		$this->assertTrue($check->executeCheck('is', 'text/plain-path-detected'));
+		$this->assertTrue($check->executeCheck('is', 'text/plain-content-detected'));
 	}
 
 	public function testFallback() {
@@ -142,7 +142,7 @@ public function testFallback() {
 	public function testFromCacheCached() {
 		$storage = new Temporary([]);
 		$storage->mkdir('foo');
-		$storage->file_put_contents('foo/bar.txt', 'asd');
+		$storage->file_put_contents('foo/bar.txt', 'text-content');
 		$storage->getScanner()->scan('');
 
 		$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
@@ -156,7 +156,7 @@ public function testFromCacheCached() {
 
 		$newCheck = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
 		$newCheck->setFileInfo($storage, 'foo/bar.txt');
-		$this->assertTrue($newCheck->executeCheck('is', 'text/plain-path-detected'));
+		$this->assertTrue($newCheck->executeCheck('is', 'text/plain-content-detected'));
 	}
 
 	public function testExistsCached() {