Merge pull request #40203 from lhsazevedo/fix/mimetype-40064

nextcloud · Sep 16, 2023 · 7bba5ec · 7bba5ec
2 parents 006f5d0 + c587f68
commit 7bba5ec
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/lib/private/Files/Type/Loader.php b/lib/private/Files/Type/Loader.php
@@ -116,35 +116,33 @@ public function reset() {
 	 * @return int inserted ID
 	 */
 	protected function store($mimetype) {
-		$mimetypeId = $this->atomic(function () use ($mimetype) {
-			try {
+		try {
+			$mimetypeId = $this->atomic(function () use ($mimetype) {
 				$insert = $this->dbConnection->getQueryBuilder();
 				$insert->insert('mimetypes')
 					->values([
 						'mimetype' => $insert->createNamedParameter($mimetype)
 					])
 					->executeStatement();
 				return $insert->getLastInsertId();
-			} catch (DbalException $e) {
-				if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					throw $e;
-				}
-				$qb = $this->dbConnection->getQueryBuilder();
-				$qb->select('id')
-					->from('mimetypes')
-					->where($qb->expr()->eq('mimetype', $qb->createNamedParameter($mimetype)));
-				$result = $qb->executeQuery();
-				$id = $result->fetchOne();
-				$result->closeCursor();
-				if ($id !== false) {
-					return (int) $id;
-				}
+			}, $this->dbConnection);
+		} catch (DbalException $e) {
+			if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+				throw $e;
+			}
+
+			$qb = $this->dbConnection->getQueryBuilder();
+			$qb->select('id')
+				->from('mimetypes')
+				->where($qb->expr()->eq('mimetype', $qb->createNamedParameter($mimetype)));
+			$result = $qb->executeQuery();
+			$id = $result->fetchOne();
+			$result->closeCursor();
+			if ($id === false) {
 				throw new \Exception("Database threw an unique constraint on inserting a new mimetype, but couldn't return the ID for this very mimetype");
 			}
-		}, $this->dbConnection);
 
-		if (!$mimetypeId) {
-			throw new \Exception("Failed to get mimetype id for $mimetype after trying to store it");
+			$mimetypeId = (int) $id;
 		}
 
 		$this->mimetypes[$mimetypeId] = $mimetype;