nextcloud / server

apps/files_trashbin/tests/Sabre/TrashbinPluginTest.php

Indentation +34 added lines, -34 removed lines

@@ -19,49 +19,49 @@
 use Test\TestCase;
 
 class TrashbinPluginTest extends TestCase {
-	private Server $server;
+    private Server $server;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$tree = $this->createMock(Tree::class);
-		$this->server = new Server($tree);
-	}
+        $tree = $this->createMock(Tree::class);
+        $this->server = new Server($tree);
+    }
 
-	/**
-	 * @dataProvider quotaProvider
-	 */
-	public function testQuota(int $quota, int $fileSize, bool $expectedResult): void {
-		$fileInfo = $this->createMock(ITrashItem::class);
-		$fileInfo->method('getSize')->willReturn($fileSize);
+    /**
+     * @dataProvider quotaProvider
+     */
+    public function testQuota(int $quota, int $fileSize, bool $expectedResult): void {
+        $fileInfo = $this->createMock(ITrashItem::class);
+        $fileInfo->method('getSize')->willReturn($fileSize);
 
-		$trashNode = $this->createMock(ITrash::class);
-		$trashNode->method('getFileInfo')->willReturn($fileInfo);
+        $trashNode = $this->createMock(ITrash::class);
+        $trashNode->method('getFileInfo')->willReturn($fileInfo);
 
-		$restoreNode = $this->createMock(RestoreFolder::class);
+        $restoreNode = $this->createMock(RestoreFolder::class);
 
-		$this->server->tree->method('getNodeForPath')->willReturn($trashNode, $restoreNode);
+        $this->server->tree->method('getNodeForPath')->willReturn($trashNode, $restoreNode);
 
-		$previewManager = $this->createMock(IPreview::class);
+        $previewManager = $this->createMock(IPreview::class);
 
-		$view = $this->createMock(View::class);
-		$view->method('free_space')->willReturn($quota);
+        $view = $this->createMock(View::class);
+        $view->method('free_space')->willReturn($quota);
 
-		$plugin = new TrashbinPlugin($previewManager, $view);
-		$plugin->initialize($this->server);
+        $plugin = new TrashbinPlugin($previewManager, $view);
+        $plugin->initialize($this->server);
 
-		$sourcePath = 'trashbin/test/trash/file1';
-		$destinationPath = 'trashbin/test/restore/file1';
-		$this->assertEquals($expectedResult, $plugin->beforeMove($sourcePath, $destinationPath));
-	}
+        $sourcePath = 'trashbin/test/trash/file1';
+        $destinationPath = 'trashbin/test/restore/file1';
+        $this->assertEquals($expectedResult, $plugin->beforeMove($sourcePath, $destinationPath));
+    }
 
-	public function quotaProvider(): array {
-		return [
-			[ 1024, 512, true ],
-			[ 512, 513, false ],
-			[ FileInfo::SPACE_NOT_COMPUTED, 1024, true ],
-			[ FileInfo::SPACE_UNKNOWN, 1024, true ],
-			[ FileInfo::SPACE_UNLIMITED, 1024, true ]
-		];
-	}
+    public function quotaProvider(): array {
+        return [
+            [ 1024, 512, true ],
+            [ 512, 513, false ],
+            [ FileInfo::SPACE_NOT_COMPUTED, 1024, true ],
+            [ FileInfo::SPACE_UNKNOWN, 1024, true ],
+            [ FileInfo::SPACE_UNLIMITED, 1024, true ]
+        ];
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -57,11 +57,11 @@
 
 	public function quotaProvider(): array {
 		return [
-			[ 1024, 512, true ],
-			[ 512, 513, false ],
-			[ FileInfo::SPACE_NOT_COMPUTED, 1024, true ],
-			[ FileInfo::SPACE_UNKNOWN, 1024, true ],
-			[ FileInfo::SPACE_UNLIMITED, 1024, true ]
+			[1024, 512, true],
+			[512, 513, false],
+			[FileInfo::SPACE_NOT_COMPUTED, 1024, true],
+			[FileInfo::SPACE_UNKNOWN, 1024, true],
+			[FileInfo::SPACE_UNLIMITED, 1024, true]
 		];
 	}
 }

apps/files_trashbin/lib/Sabre/TrashbinPlugin.php

Indentation +155 added lines, -155 removed lines

@@ -22,159 +22,159 @@
 use Sabre\HTTP\ResponseInterface;
 
 class TrashbinPlugin extends ServerPlugin {
-	public const TRASHBIN_FILENAME = '{http://nextcloud.org/ns}trashbin-filename';
-	public const TRASHBIN_ORIGINAL_LOCATION = '{http://nextcloud.org/ns}trashbin-original-location';
-	public const TRASHBIN_DELETION_TIME = '{http://nextcloud.org/ns}trashbin-deletion-time';
-	public const TRASHBIN_TITLE = '{http://nextcloud.org/ns}trashbin-title';
-	public const TRASHBIN_DELETED_BY_ID = '{http://nextcloud.org/ns}trashbin-deleted-by-id';
-	public const TRASHBIN_DELETED_BY_DISPLAY_NAME = '{http://nextcloud.org/ns}trashbin-deleted-by-display-name';
-	public const TRASHBIN_BACKEND = '{http://nextcloud.org/ns}trashbin-backend';
-
-	/** @var Server */
-	private $server;
-
-	public function __construct(
-		private IPreview $previewManager,
-		private View $view,
-	) {
-	}
-
-	public function initialize(Server $server) {
-		$this->server = $server;
-
-		$this->server->on('propFind', [$this, 'propFind']);
-		$this->server->on('afterMethod:GET', [$this,'httpGet']);
-		$this->server->on('beforeMove', [$this, 'beforeMove']);
-	}
-
-
-	public function propFind(PropFind $propFind, INode $node) {
-		if (!($node instanceof ITrash)) {
-			return;
-		}
-
-		$propFind->handle(self::TRASHBIN_FILENAME, function () use ($node) {
-			return $node->getFilename();
-		});
-
-		$propFind->handle(self::TRASHBIN_ORIGINAL_LOCATION, function () use ($node) {
-			return $node->getOriginalLocation();
-		});
-
-		$propFind->handle(self::TRASHBIN_TITLE, function () use ($node) {
-			return $node->getTitle();
-		});
-
-		$propFind->handle(self::TRASHBIN_DELETION_TIME, function () use ($node) {
-			return $node->getDeletionTime();
-		});
-
-		$propFind->handle(self::TRASHBIN_DELETED_BY_ID, function () use ($node) {
-			return $node->getDeletedBy()?->getUID();
-		});
-
-		$propFind->handle(self::TRASHBIN_DELETED_BY_DISPLAY_NAME, function () use ($node) {
-			return $node->getDeletedBy()?->getDisplayName();
-		});
-
-		// Pass the real filename as the DAV display name
-		$propFind->handle(FilesPlugin::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
-			return $node->getFilename();
-		});
-
-		$propFind->handle(FilesPlugin::SIZE_PROPERTYNAME, function () use ($node) {
-			return $node->getSize();
-		});
-
-		$propFind->handle(FilesPlugin::FILEID_PROPERTYNAME, function () use ($node) {
-			return $node->getFileId();
-		});
-
-		$propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function () {
-			return 'GD'; // read + delete
-		});
-
-		$propFind->handle(FilesPlugin::GETETAG_PROPERTYNAME, function () use ($node) {
-			// add fake etag, it is only needed to identify the preview image
-			return $node->getLastModified();
-		});
-
-		$propFind->handle(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, function () use ($node) {
-			// add fake etag, it is only needed to identify the preview image
-			return $node->getFileId();
-		});
-
-		$propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
-			return $this->previewManager->isAvailable($node->getFileInfo());
-		});
-
-		$propFind->handle(FilesPlugin::MOUNT_TYPE_PROPERTYNAME, function () {
-			return '';
-		});
-
-		$propFind->handle(self::TRASHBIN_BACKEND, function () use ($node) {
-			$fileInfo = $node->getFileInfo();
-			if (!($fileInfo instanceof ITrashItem)) {
-				return '';
-			}
-			return $fileInfo->getTrashBackend()::class;
-		});
-	}
-
-	/**
-	 * Set real filename on trashbin download
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	public function httpGet(RequestInterface $request, ResponseInterface $response): void {
-		$path = $request->getPath();
-		$node = $this->server->tree->getNodeForPath($path);
-		if ($node instanceof ITrash) {
-			$response->addHeader('Content-Disposition', 'attachment; filename="' . $node->getFilename() . '"');
-		}
-	}
-
-	/**
-	 * Check if a user has available space before attempting to
-	 * restore from trashbin unless they have unlimited quota.
-	 *
-	 * @param string $sourcePath
-	 * @param string $destinationPath
-	 * @return bool
-	 */
-	public function beforeMove(string $sourcePath, string $destinationPath): bool {
-		try {
-			$node = $this->server->tree->getNodeForPath($sourcePath);
-			$destinationNodeParent = $this->server->tree->getNodeForPath(dirname($destinationPath));
-		} catch (\Sabre\DAV\Exception $e) {
-			\OCP\Server::get(LoggerInterface::class)
-				->error($e->getMessage(), ['app' => 'files_trashbin', 'exception' => $e]);
-			return true;
-		}
-
-		// Check if a file is being restored before proceeding
-		if (!$node instanceof ITrash || !$destinationNodeParent instanceof RestoreFolder) {
-			return true;
-		}
-
-		$fileInfo = $node->getFileInfo();
-		if (!$fileInfo instanceof ITrashItem) {
-			return true;
-		}
-		$restoreFolder = dirname($fileInfo->getOriginalLocation());
-		$freeSpace = $this->view->free_space($restoreFolder);
-		if ($freeSpace === FileInfo::SPACE_NOT_COMPUTED ||
-			$freeSpace === FileInfo::SPACE_UNKNOWN ||
-			$freeSpace === FileInfo::SPACE_UNLIMITED) {
-			return true;
-		}
-		$filesize = $fileInfo->getSize();
-		if ($freeSpace < $filesize) {
-			$this->server->httpResponse->setStatus(507);
-			return false;
-		}
-
-		return true;
-	}
+    public const TRASHBIN_FILENAME = '{http://nextcloud.org/ns}trashbin-filename';
+    public const TRASHBIN_ORIGINAL_LOCATION = '{http://nextcloud.org/ns}trashbin-original-location';
+    public const TRASHBIN_DELETION_TIME = '{http://nextcloud.org/ns}trashbin-deletion-time';
+    public const TRASHBIN_TITLE = '{http://nextcloud.org/ns}trashbin-title';
+    public const TRASHBIN_DELETED_BY_ID = '{http://nextcloud.org/ns}trashbin-deleted-by-id';
+    public const TRASHBIN_DELETED_BY_DISPLAY_NAME = '{http://nextcloud.org/ns}trashbin-deleted-by-display-name';
+    public const TRASHBIN_BACKEND = '{http://nextcloud.org/ns}trashbin-backend';
+
+    /** @var Server */
+    private $server;
+
+    public function __construct(
+        private IPreview $previewManager,
+        private View $view,
+    ) {
+    }
+
+    public function initialize(Server $server) {
+        $this->server = $server;
+
+        $this->server->on('propFind', [$this, 'propFind']);
+        $this->server->on('afterMethod:GET', [$this,'httpGet']);
+        $this->server->on('beforeMove', [$this, 'beforeMove']);
+    }
+
+
+    public function propFind(PropFind $propFind, INode $node) {
+        if (!($node instanceof ITrash)) {
+            return;
+        }
+
+        $propFind->handle(self::TRASHBIN_FILENAME, function () use ($node) {
+            return $node->getFilename();
+        });
+
+        $propFind->handle(self::TRASHBIN_ORIGINAL_LOCATION, function () use ($node) {
+            return $node->getOriginalLocation();
+        });
+
+        $propFind->handle(self::TRASHBIN_TITLE, function () use ($node) {
+            return $node->getTitle();
+        });
+
+        $propFind->handle(self::TRASHBIN_DELETION_TIME, function () use ($node) {
+            return $node->getDeletionTime();
+        });
+
+        $propFind->handle(self::TRASHBIN_DELETED_BY_ID, function () use ($node) {
+            return $node->getDeletedBy()?->getUID();
+        });
+
+        $propFind->handle(self::TRASHBIN_DELETED_BY_DISPLAY_NAME, function () use ($node) {
+            return $node->getDeletedBy()?->getDisplayName();
+        });
+
+        // Pass the real filename as the DAV display name
+        $propFind->handle(FilesPlugin::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
+            return $node->getFilename();
+        });
+
+        $propFind->handle(FilesPlugin::SIZE_PROPERTYNAME, function () use ($node) {
+            return $node->getSize();
+        });
+
+        $propFind->handle(FilesPlugin::FILEID_PROPERTYNAME, function () use ($node) {
+            return $node->getFileId();
+        });
+
+        $propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function () {
+            return 'GD'; // read + delete
+        });
+
+        $propFind->handle(FilesPlugin::GETETAG_PROPERTYNAME, function () use ($node) {
+            // add fake etag, it is only needed to identify the preview image
+            return $node->getLastModified();
+        });
+
+        $propFind->handle(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, function () use ($node) {
+            // add fake etag, it is only needed to identify the preview image
+            return $node->getFileId();
+        });
+
+        $propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
+            return $this->previewManager->isAvailable($node->getFileInfo());
+        });
+
+        $propFind->handle(FilesPlugin::MOUNT_TYPE_PROPERTYNAME, function () {
+            return '';
+        });
+
+        $propFind->handle(self::TRASHBIN_BACKEND, function () use ($node) {
+            $fileInfo = $node->getFileInfo();
+            if (!($fileInfo instanceof ITrashItem)) {
+                return '';
+            }
+            return $fileInfo->getTrashBackend()::class;
+        });
+    }
+
+    /**
+     * Set real filename on trashbin download
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function httpGet(RequestInterface $request, ResponseInterface $response): void {
+        $path = $request->getPath();
+        $node = $this->server->tree->getNodeForPath($path);
+        if ($node instanceof ITrash) {
+            $response->addHeader('Content-Disposition', 'attachment; filename="' . $node->getFilename() . '"');
+        }
+    }
+
+    /**
+     * Check if a user has available space before attempting to
+     * restore from trashbin unless they have unlimited quota.
+     *
+     * @param string $sourcePath
+     * @param string $destinationPath
+     * @return bool
+     */
+    public function beforeMove(string $sourcePath, string $destinationPath): bool {
+        try {
+            $node = $this->server->tree->getNodeForPath($sourcePath);
+            $destinationNodeParent = $this->server->tree->getNodeForPath(dirname($destinationPath));
+        } catch (\Sabre\DAV\Exception $e) {
+            \OCP\Server::get(LoggerInterface::class)
+                ->error($e->getMessage(), ['app' => 'files_trashbin', 'exception' => $e]);
+            return true;
+        }
+
+        // Check if a file is being restored before proceeding
+        if (!$node instanceof ITrash || !$destinationNodeParent instanceof RestoreFolder) {
+            return true;
+        }
+
+        $fileInfo = $node->getFileInfo();
+        if (!$fileInfo instanceof ITrashItem) {
+            return true;
+        }
+        $restoreFolder = dirname($fileInfo->getOriginalLocation());
+        $freeSpace = $this->view->free_space($restoreFolder);
+        if ($freeSpace === FileInfo::SPACE_NOT_COMPUTED ||
+            $freeSpace === FileInfo::SPACE_UNKNOWN ||
+            $freeSpace === FileInfo::SPACE_UNLIMITED) {
+            return true;
+        }
+        $filesize = $fileInfo->getSize();
+        if ($freeSpace < $filesize) {
+            $this->server->httpResponse->setStatus(507);
+            return false;
+        }
+
+        return true;
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -43,7 +43,7 @@ 
 		$this->server = $server;
 
 		$this->server->on('propFind', [$this, 'propFind']);
-		$this->server->on('afterMethod:GET', [$this,'httpGet']);
+		$this->server->on('afterMethod:GET', [$this, 'httpGet']);
 		$this->server->on('beforeMove', [$this, 'beforeMove']);
 	}
 
@@ -53,66 +53,66 @@ 
 			return;
 		}
 
-		$propFind->handle(self::TRASHBIN_FILENAME, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_FILENAME, function() use ($node) {
 			return $node->getFilename();
 		});
 
-		$propFind->handle(self::TRASHBIN_ORIGINAL_LOCATION, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_ORIGINAL_LOCATION, function() use ($node) {
 			return $node->getOriginalLocation();
 		});
 
-		$propFind->handle(self::TRASHBIN_TITLE, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_TITLE, function() use ($node) {
 			return $node->getTitle();
 		});
 
-		$propFind->handle(self::TRASHBIN_DELETION_TIME, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_DELETION_TIME, function() use ($node) {
 			return $node->getDeletionTime();
 		});
 
-		$propFind->handle(self::TRASHBIN_DELETED_BY_ID, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_DELETED_BY_ID, function() use ($node) {
 			return $node->getDeletedBy()?->getUID();
 		});
 
-		$propFind->handle(self::TRASHBIN_DELETED_BY_DISPLAY_NAME, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_DELETED_BY_DISPLAY_NAME, function() use ($node) {
 			return $node->getDeletedBy()?->getDisplayName();
 		});
 
 		// Pass the real filename as the DAV display name
-		$propFind->handle(FilesPlugin::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::DISPLAYNAME_PROPERTYNAME, function() use ($node) {
 			return $node->getFilename();
 		});
 
-		$propFind->handle(FilesPlugin::SIZE_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::SIZE_PROPERTYNAME, function() use ($node) {
 			return $node->getSize();
 		});
 
-		$propFind->handle(FilesPlugin::FILEID_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::FILEID_PROPERTYNAME, function() use ($node) {
 			return $node->getFileId();
 		});
 
-		$propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function () {
+		$propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function() {
 			return 'GD'; // read + delete
 		});
 
-		$propFind->handle(FilesPlugin::GETETAG_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::GETETAG_PROPERTYNAME, function() use ($node) {
 			// add fake etag, it is only needed to identify the preview image
 			return $node->getLastModified();
 		});
 
-		$propFind->handle(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, function() use ($node) {
 			// add fake etag, it is only needed to identify the preview image
 			return $node->getFileId();
 		});
 
-		$propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, function() use ($node) {
 			return $this->previewManager->isAvailable($node->getFileInfo());
 		});
 
-		$propFind->handle(FilesPlugin::MOUNT_TYPE_PROPERTYNAME, function () {
+		$propFind->handle(FilesPlugin::MOUNT_TYPE_PROPERTYNAME, function() {
 			return '';
 		});
 
-		$propFind->handle(self::TRASHBIN_BACKEND, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_BACKEND, function() use ($node) {
 			$fileInfo = $node->getFileInfo();
 			if (!($fileInfo instanceof ITrashItem)) {
 				return '';
@@ -131,7 +131,7 @@ 
 		$path = $request->getPath();
 		$node = $this->server->tree->getNodeForPath($path);
 		if ($node instanceof ITrash) {
-			$response->addHeader('Content-Disposition', 'attachment; filename="' . $node->getFilename() . '"');
+			$response->addHeader('Content-Disposition', 'attachment; filename="'.$node->getFilename().'"');
 		}
 	}