diff --git a/appinfo/routes.php b/appinfo/routes.php index 700fc17..c6a5ec2 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -7,7 +7,7 @@ return [ ['name' => 'main#Download', 'url' => '/new', 'verb' => 'POST'], ['name' => 'Aria2#Action', 'url' => '/aria2/{path}', 'verb' => 'POST'], ['name' => 'Aria2#getStatus', 'url' => '/status/{path}', 'verb' => 'POST'], - ['name' => 'Aria2#Update', 'url' => '/update', 'verb' => 'GET'], + ['name' => 'Main#scanFolder', 'url' => '/scanfolder', 'verb' => 'GET'], ['name' => 'Youtube#Index', 'url' => '/youtube/get', 'verb' => 'POST'], ['name' => 'Youtube#Download', 'url' => '/youtube/new', 'verb' => 'POST'], ['name' => 'Youtube#Delete', 'url' => '/youtube/delete', 'verb' => 'POST'], diff --git a/lib/Controller/Aria2Controller.php b/lib/Controller/Aria2Controller.php index e5a8675..8c03e68 100644 --- a/lib/Controller/Aria2Controller.php +++ b/lib/Controller/Aria2Controller.php @@ -6,7 +6,6 @@ use OCA\NCDownloader\Tools\Counters; use OCA\NCDownloader\Tools\DbHelper; use OCA\NCDownloader\Tools\folderScan; use OCA\NCDownloader\Tools\Helper; -use OCA\NCDownloader\Tools\Settings; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\JSONResponse; use OCP\Files\IRootFolder; @@ -121,15 +120,6 @@ class Aria2Controller extends Controller $data = $this->aria2->start(); return $data; } - /** - * @NoAdminRequired - * @NoCSRFRequired - */ - public function Update() - { - $resp = folderScan::create()->scan(); - return new JSONResponse($resp); - } private function createActionItem($name, $path) { diff --git a/lib/Controller/MainController.php b/lib/Controller/MainController.php index 0e049bc..066926c 100644 --- a/lib/Controller/MainController.php +++ b/lib/Controller/MainController.php @@ -15,6 +15,7 @@ use OCP\IL10N; //use OCP\Files\IRootFolder; use OCP\IRequest; use OC_Util; +use OCA\NCDownloader\Tools\folderScan; class MainController extends Controller { @@ -195,4 +196,14 @@ class MainController extends Controller return new JSONResponse($resp); } + /** + * @NoAdminRequired + * @NoCSRFRequired + */ + public function scanFolder() + { + $resp = folderScan::create()->scan(); + return new JSONResponse($resp); + } + }