nextcloud / server

lib/private/Preview/BackgroundCleanupJob.php

Indentation +116 added lines, -116 removed lines

@@ -35,100 +35,100 @@ 
 use OCP\IDBConnection;
 
 class BackgroundCleanupJob extends TimedJob {
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var Root */
-	private $previewFolder;
-
-	/** @var bool */
-	private $isCLI;
-
-	/** @var IMimeTypeLoader */
-	private $mimeTypeLoader;
-
-	public function __construct(ITimeFactory $timeFactory,
-								IDBConnection $connection,
-								Root $previewFolder,
-								IMimeTypeLoader $mimeTypeLoader,
-								bool $isCLI) {
-		parent::__construct($timeFactory);
-		// Run at most once an hour
-		$this->setInterval(3600);
-
-		$this->connection = $connection;
-		$this->previewFolder = $previewFolder;
-		$this->isCLI = $isCLI;
-		$this->mimeTypeLoader = $mimeTypeLoader;
-	}
-
-	public function run($argument) {
-		foreach ($this->getDeletedFiles() as $fileId) {
-			try {
-				$preview = $this->previewFolder->getFolder((string)$fileId);
-				$preview->delete();
-			} catch (NotFoundException $e) {
-				// continue
-			} catch (NotPermittedException $e) {
-				// continue
-			}
-		}
-	}
-
-	private function getDeletedFiles(): \Iterator {
-		yield from $this->getOldPreviewLocations();
-		yield from $this->getNewPreviewLocations();
-	}
-
-	private function getOldPreviewLocations(): \Iterator {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('a.name')
-			->from('filecache', 'a')
-			->leftJoin('a', 'filecache', 'b', $qb->expr()->eq(
-				$qb->expr()->castColumn('a.name', IQueryBuilder::PARAM_INT), 'b.fileid'
-			))
-			->where(
-				$qb->expr()->isNull('b.fileid')
-			)->andWhere(
-				$qb->expr()->eq('a.parent', $qb->createNamedParameter($this->previewFolder->getId()))
-			)->andWhere(
-				$qb->expr()->like('a.name', $qb->createNamedParameter('__%'))
-			);
-
-		if (!$this->isCLI) {
-			$qb->setMaxResults(10);
-		}
-
-		$cursor = $qb->execute();
-
-		while ($row = $cursor->fetch()) {
-			yield $row['name'];
-		}
-
-		$cursor->closeCursor();
-	}
-
-	private function getNewPreviewLocations(): \Iterator {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('path', 'mimetype')
-			->from('filecache')
-			->where($qb->expr()->eq('fileid', $qb->createNamedParameter($this->previewFolder->getId())));
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === null) {
-			return [];
-		}
-
-		/*
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var Root */
+    private $previewFolder;
+
+    /** @var bool */
+    private $isCLI;
+
+    /** @var IMimeTypeLoader */
+    private $mimeTypeLoader;
+
+    public function __construct(ITimeFactory $timeFactory,
+                                IDBConnection $connection,
+                                Root $previewFolder,
+                                IMimeTypeLoader $mimeTypeLoader,
+                                bool $isCLI) {
+        parent::__construct($timeFactory);
+        // Run at most once an hour
+        $this->setInterval(3600);
+
+        $this->connection = $connection;
+        $this->previewFolder = $previewFolder;
+        $this->isCLI = $isCLI;
+        $this->mimeTypeLoader = $mimeTypeLoader;
+    }
+
+    public function run($argument) {
+        foreach ($this->getDeletedFiles() as $fileId) {
+            try {
+                $preview = $this->previewFolder->getFolder((string)$fileId);
+                $preview->delete();
+            } catch (NotFoundException $e) {
+                // continue
+            } catch (NotPermittedException $e) {
+                // continue
+            }
+        }
+    }
+
+    private function getDeletedFiles(): \Iterator {
+        yield from $this->getOldPreviewLocations();
+        yield from $this->getNewPreviewLocations();
+    }
+
+    private function getOldPreviewLocations(): \Iterator {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('a.name')
+            ->from('filecache', 'a')
+            ->leftJoin('a', 'filecache', 'b', $qb->expr()->eq(
+                $qb->expr()->castColumn('a.name', IQueryBuilder::PARAM_INT), 'b.fileid'
+            ))
+            ->where(
+                $qb->expr()->isNull('b.fileid')
+            )->andWhere(
+                $qb->expr()->eq('a.parent', $qb->createNamedParameter($this->previewFolder->getId()))
+            )->andWhere(
+                $qb->expr()->like('a.name', $qb->createNamedParameter('__%'))
+            );
+
+        if (!$this->isCLI) {
+            $qb->setMaxResults(10);
+        }
+
+        $cursor = $qb->execute();
+
+        while ($row = $cursor->fetch()) {
+            yield $row['name'];
+        }
+
+        $cursor->closeCursor();
+    }
+
+    private function getNewPreviewLocations(): \Iterator {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('path', 'mimetype')
+            ->from('filecache')
+            ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($this->previewFolder->getId())));
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === null) {
+            return [];
+        }
+
+        /*
 		 * This lovely like is the result of the way the new previews are stored
 		 * We take the md5 of the name (fileid) and split the first 7 chars. That way
 		 * there are not a gazillion files in the root of the preview appdata.
 		 */
-		$like = $this->connection->escapeLikeParameter($data['path']) . '/_/_/_/_/_/_/_/%';
+        $like = $this->connection->escapeLikeParameter($data['path']) . '/_/_/_/_/_/_/_/%';
 
-		/*
+        /*
 		 * Deleting a file will not delete related previews right away.
 		 *
 		 * A delete request is usually an HTTP request.
@@ -143,31 +143,31 @@ 
 		 *
 		 * If the related file is deleted, b.fileid will be null and the preview folder can be deleted.
 		 */
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('a.name')
-			->from('filecache', 'a')
-			->leftJoin('a', 'filecache', 'b', $qb->expr()->eq(
-				$qb->expr()->castColumn('a.name', IQueryBuilder::PARAM_INT), 'b.fileid'
-			))
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->eq('a.storage', $qb->createNamedParameter($this->previewFolder->getStorageId())),
-					$qb->expr()->isNull('b.fileid'),
-					$qb->expr()->like('a.path', $qb->createNamedParameter($like)),
-					$qb->expr()->eq('a.mimetype', $qb->createNamedParameter($this->mimeTypeLoader->getId('httpd/unix-directory')))
-				)
-			);
-
-		if (!$this->isCLI) {
-			$qb->setMaxResults(10);
-		}
-
-		$cursor = $qb->execute();
-
-		while ($row = $cursor->fetch()) {
-			yield $row['name'];
-		}
-
-		$cursor->closeCursor();
-	}
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('a.name')
+            ->from('filecache', 'a')
+            ->leftJoin('a', 'filecache', 'b', $qb->expr()->eq(
+                $qb->expr()->castColumn('a.name', IQueryBuilder::PARAM_INT), 'b.fileid'
+            ))
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('a.storage', $qb->createNamedParameter($this->previewFolder->getStorageId())),
+                    $qb->expr()->isNull('b.fileid'),
+                    $qb->expr()->like('a.path', $qb->createNamedParameter($like)),
+                    $qb->expr()->eq('a.mimetype', $qb->createNamedParameter($this->mimeTypeLoader->getId('httpd/unix-directory')))
+                )
+            );
+
+        if (!$this->isCLI) {
+            $qb->setMaxResults(10);
+        }
+
+        $cursor = $qb->execute();
+
+        while ($row = $cursor->fetch()) {
+            yield $row['name'];
+        }
+
+        $cursor->closeCursor();
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 	public function run($argument) {
 		foreach ($this->getDeletedFiles() as $fileId) {
 			try {
-				$preview = $this->previewFolder->getFolder((string)$fileId);
+				$preview = $this->previewFolder->getFolder((string) $fileId);
 				$preview->delete();
 			} catch (NotFoundException $e) {
 				// continue
@@ -126,7 +126,7 @@ 
 		 * We take the md5 of the name (fileid) and split the first 7 chars. That way
 		 * there are not a gazillion files in the root of the preview appdata.
 		 */
-		$like = $this->connection->escapeLikeParameter($data['path']) . '/_/_/_/_/_/_/_/%';
+		$like = $this->connection->escapeLikeParameter($data['path']).'/_/_/_/_/_/_/_/%';
 
 		/*
 		 * Deleting a file will not delete related previews right away.