diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-04-19 17:04:16 -0500 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-04-19 17:04:16 -0500 |
| commit | fbedea08076355f9c94b7aa4d14f6157749a4fe7 (patch) | |
| tree | c054b2702b62c5edde7935b9b0a9e1f9e05edf11 | |
| parent | ce2dba079605204293373652a53627eb50dd39d7 (diff) | |
| download | nextcloud-server-fbedea08076355f9c94b7aa4d14f6157749a4fe7.tar.gz nextcloud-server-fbedea08076355f9c94b7aa4d14f6157749a4fe7.zip | |
Add PHPDoc and handle exception in ScanAppData as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| -rw-r--r-- | apps/files/lib/Command/ScanAppData.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/Utils/Scanner.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/apps/files/lib/Command/ScanAppData.php b/apps/files/lib/Command/ScanAppData.php index 365e2e3cb2e..6ad83d9a182 100644 --- a/apps/files/lib/Command/ScanAppData.php +++ b/apps/files/lib/Command/ScanAppData.php @@ -128,6 +128,8 @@ class ScanAppData extends Base { } catch (InterruptedException $e) { # exit the function if ctrl-c has been pressed $output->writeln('Interrupted by user'); + } catch (NotFoundException $e) { + $output->writeln('<error>Path not found: ' . $e->getMessage() . '</error>'); } catch (\Exception $e) { $output->writeln('<error>Exception during scan: ' . $e->getMessage() . '</error>'); $output->writeln('<error>' . $e->getTraceAsString() . '</error>'); diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php index f845ac31fe2..5d126f2bcc3 100644 --- a/lib/private/Files/Utils/Scanner.php +++ b/lib/private/Files/Utils/Scanner.php @@ -162,6 +162,7 @@ class Scanner extends PublicEmitter { /** * @param string $dir * @throws \OC\ForbiddenException + * @throws \OCP\Files\NotFoundException */ public function scan($dir = '') { if (!Filesystem::isValidPath($dir)) { |