diff options
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/ajax/scan.php | 12 | ||||
| -rw-r--r-- | apps/files/js/files.js | 3 |
2 files changed, 11 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()); } } diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 245648a79e2..4fdc9eb2110 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -333,6 +333,9 @@ function scanFiles(force, dir, users) { scannerEventSource.listen('folder',function(path) { console.log('now scanning ' + path); }); + scannerEventSource.listen('error',function(message) { + console.error('Scanner error: ', message); + }); scannerEventSource.listen('done',function(count) { scanFiles.scanning=false; console.log('done after ' + count + ' files'); |