summaryrefslogtreecommitdiffstats
path: root/apps/files/ajax
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/ajax')
-rw-r--r--apps/files/ajax/scan.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 3f430cd27ed..7d47a538fa1 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -49,10 +49,14 @@ foreach ($users as $user) {
$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection());
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', array($listener, 'file'));
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', array($listener, 'folder'));
- if ($force) {
- $scanner->scan($dir);
- } else {
- $scanner->backgroundScan($dir);
+ try {
+ if ($force) {
+ $scanner->scan($dir);
+ } else {
+ $scanner->backgroundScan($dir);
+ }
+ } catch (\Exception $e) {
+ $eventSource->send('error', get_class($e) . ': ' . $e->getMessage());
}
}