From 0aba549e7f11e1035fa7a2e880803b47cbadd919 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Sun, 1 Sep 2013 16:40:50 +0200 Subject: Use more object oriented way for console commands --- apps/files/command/scan.php | 55 +++++++++++++++++++++++++++++++++++++++++++++ apps/files/console/scan.php | 31 ------------------------- 2 files changed, 55 insertions(+), 31 deletions(-) create mode 100644 apps/files/command/scan.php delete mode 100644 apps/files/console/scan.php (limited to 'apps') diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php new file mode 100644 index 00000000000..fce4f6875d7 --- /dev/null +++ b/apps/files/command/scan.php @@ -0,0 +1,55 @@ +setName('files:scan') + ->setDescription('rescan filesystem') + ->addArgument( + 'user_id', + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, + 'will rescan all files of the given user(s)' + ) + ->addOption( + 'all', + null, + InputOption::VALUE_NONE, + 'will rescan all files of all known users' + ) + ; + } + + protected function scanFiles($user, OutputInterface $output) { + $scanner = new \OC\Files\Utils\Scanner($user); + $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) { + $output->writeln("Scanning $path"); + }); + $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) { + $output->writeln("Scanning $path"); + }); + $scanner->scan(''); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + if ($input->getOption('all')) { + $users = \OC_User::getUsers(); + } else { + $users = $input->getArgument('user_id'); + } + + foreach ($users as $user) { + $this->scanFiles($user, $output); + } + } +} diff --git a/apps/files/console/scan.php b/apps/files/console/scan.php deleted file mode 100644 index 70183fc888a..00000000000 --- a/apps/files/console/scan.php +++ /dev/null @@ -1,31 +0,0 @@ -" . PHP_EOL; - echo " will rescan all files of the given user" . PHP_EOL; - echo " files:scan --all" . PHP_EOL; - echo " will rescan all files of all known users" . PHP_EOL; - return; -} - -function scanFiles($user) { - $scanner = new \OC\Files\Utils\Scanner($user); - $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) { - echo "Scanning $path" . PHP_EOL; - }); - $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) { - echo "Scanning $path" . PHP_EOL; - }); - $scanner->scan(''); -} - -if ($argv[1] === '--all') { - $users = OC_User::getUsers(); -} else { - $users = array($argv[1]); -} - -foreach ($users as $user) { - scanFiles($user); -} -- cgit v1.2.3