Merge pull request #20733 from owncloud/scan-eventsource-no-paths
Dont output paths in scan.php
This commit is contained in:
commit
6b5460f755
|
@ -49,7 +49,6 @@ foreach ($users as $user) {
|
||||||
$eventSource->send('user', $user);
|
$eventSource->send('user', $user);
|
||||||
$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection());
|
$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', 'scanFile', array($listener, 'file'));
|
||||||
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', array($listener, 'folder'));
|
|
||||||
try {
|
try {
|
||||||
if ($force) {
|
if ($force) {
|
||||||
$scanner->scan($dir);
|
$scanner->scan($dir);
|
||||||
|
@ -81,13 +80,6 @@ class ScanListener {
|
||||||
$this->eventSource = $eventSource;
|
$this->eventSource = $eventSource;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param string $path
|
|
||||||
*/
|
|
||||||
public function folder($path) {
|
|
||||||
$this->eventSource->send('folder', $path);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function file() {
|
public function file() {
|
||||||
$this->fileCount++;
|
$this->fileCount++;
|
||||||
if ($this->fileCount > $this->lastCount + 20) { //send a count update every 20 files
|
if ($this->fileCount > $this->lastCount + 20) { //send a count update every 20 files
|
||||||
|
|
Loading…
Reference in New Issue