From 1a396d0c4d554f6b19a17a57d4735e3ddf8584d6 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 22 Jan 2026 14:39:48 +0100 Subject: [PATCH 1/2] Added helper to retrieve files in the import directory --- src/inc/apiv2/helper/importFile.routes.php | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/inc/apiv2/helper/importFile.routes.php b/src/inc/apiv2/helper/importFile.routes.php index fec46de03..6b3ec7c85 100644 --- a/src/inc/apiv2/helper/importFile.routes.php +++ b/src/inc/apiv2/helper/importFile.routes.php @@ -386,6 +386,31 @@ function processDelete(Request $request, Response $response, array $args): Respo ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable"); } + /** + * Scans the import-directory for files. Directories are ignored. + * @return array of all files in the top-level directory /../import + */ + function scanImportDirectory() { + $directory = Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/"; + if (file_exists($directory) && is_dir($directory)) { + $importDirectory = opendir($directory); + $importFiles = array(); + while ($file = readdir($importDirectory)) { + if ($file[0] != '.' && $file != "." && $file != ".." && !is_dir($file)) { + $importFiles[] = array("file" => $file, "size" => Util::filesize($directory . "/" . $file)); + } + } + sort($importFiles); + return $importFiles; + } + return array(); + } + + function processGet(Request $request, Response $response, array $args): Response { + $importFiles = $this->scanImportDirectory(); + return self::getMetaResponse($importFiles, $request, $response); + } + static public function register($app): void { $me = get_called_class(); @@ -404,6 +429,7 @@ static public function register($app): void { }); $group->post('', $me . ":processPost")->setName($me . ":processPost"); + $group->get('', $me . ":processGet")->setName($me . ":processGet"); }); $app->group($baseUri . "/{id:[0-9]{14}-[0-9a-f]{32}}", function (RouteCollectorProxy $group) use ($me) { From 5e75431e03f69b5fccc668c5b0ac9ec043d506f9 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 27 Jan 2026 11:55:16 +0100 Subject: [PATCH 2/2] Removed redundant check --- src/inc/apiv2/helper/importFile.routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/helper/importFile.routes.php b/src/inc/apiv2/helper/importFile.routes.php index 6b3ec7c85..862776034 100644 --- a/src/inc/apiv2/helper/importFile.routes.php +++ b/src/inc/apiv2/helper/importFile.routes.php @@ -396,7 +396,7 @@ function scanImportDirectory() { $importDirectory = opendir($directory); $importFiles = array(); while ($file = readdir($importDirectory)) { - if ($file[0] != '.' && $file != "." && $file != ".." && !is_dir($file)) { + if ($file[0] != '.' && !is_dir($file)) { $importFiles[] = array("file" => $file, "size" => Util::filesize($directory . "/" . $file)); } }