Make Cache\Scanner an emitter

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 5588861fe9046c3af4d0aa97342c10c6cc7d4256..8f88de7a3514fe5e7d8e17dd29c640f79280c1b8 100644 (file)
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -9,8 +9,18 @@
 namespace OC\Files\Cache;
 
 use OC\Files\Filesystem;
+use OC\Hooks\BasicEmitter;
 
-class Scanner {
+/**
+ * Class Scanner
+ *
+ * Hooks available in scope \OC\Files\Cache\Scanner:
+ *  - scanFile(string $path, string $storageId)
+ *  - scanFolder(string $path, string $storageId)
+ *
+ * @package OC\Files\Cache
+ */
+class Scanner extends BasicEmitter {
        /**
         * @var \OC\Files\Storage\Storage $storage
         */
@@ -70,6 +80,7 @@ class Scanner {
                if (!self::isPartialFile($file)
                        and !Filesystem::isFileBlacklisted($file)
                ) {
+                       $this->emit('\OC\Files\Cache\Scanner', 'scanFile', array($file, $this->storageId));
                        \OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
                        $data = $this->getData($file);
                        if ($data) {
@@ -133,7 +144,7 @@ class Scanner {
                if ($reuse === -1) {
                        $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : 0;
                }
-               \OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_folder', array('path' => $path, 'storage' => $this->storageId));
+               $this->emit('\OC\Files\Cache\Scanner', 'scanFolder', array($path, $this->storageId));
                $size = 0;
                $childQueue = array();
                $existingChildren = array();