remove deleted files when re-scanning a folder

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index e7fbd856d5a425675e82730ec3e820d044d87567..9b94a24f48123e3e6e20eb1c531cb2ab23f6cfd1 100644 (file)
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -137,11 +137,20 @@ class Scanner {
                \OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_folder', array('path' => $path, 'storage' => $this->storageId));
                $size = 0;
                $childQueue = array();
+               $existingChildren = array();
+               if ($this->cache->inCache($path)) {
+                       $children = $this->cache->getFolderContents($path);
+                       foreach ($children as $child) {
+                               $existingChildren[] = $child['name'];
+                       }
+               }
+               $newChildren = array();
                if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
                        \OC_DB::beginTransaction();
                        while ($file = readdir($dh)) {
                                $child = ($path) ? $path . '/' . $file : $file;
                                if (!Filesystem::isIgnoredDir($file)) {
+                                       $newChildren[] = $file;
                                        $data = $this->scanFile($child, $reuse);
                                        if ($data) {
                                                if ($data['size'] === -1) {
@@ -156,6 +165,11 @@ class Scanner {
                                        }
                                }
                        }
+                       $removedChildren = \array_diff($existingChildren, $newChildren);
+                       foreach ($removedChildren as $childName) {
+                               $child = ($path) ? $path . '/' . $childName : $childName;
+                               $this->cache->remove($child);
+                       }
                        \OC_DB::commit();
                        foreach ($childQueue as $child) {
                                $childSize = $this->scanChildren($child, self::SCAN_RECURSIVE);

diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 3dacefa2b801dab56f6a34b8d26ddfb4f5312218..3ee7f099f388e8f93850216b8d74fa18edc83f58 100644 (file)
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -144,6 +144,16 @@ class Scanner extends \PHPUnit_Framework_TestCase {
                $this->assertEquals(-1, $newData['size']);
        }
 
+       public function testRemovedFile() {
+               $this->fillTestFolders();
+
+               $this->scanner->scan('');
+               $this->assertTrue($this->cache->inCache('foo.txt'));
+               $this->storage->unlink('foo.txt');
+               $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW);
+               $this->assertFalse($this->cache->inCache('foo.txt'));
+       }
+
        function setUp() {
                $this->storage = new \OC\Files\Storage\Temporary(array());
                $this->scanner = new \OC\Files\Cache\Scanner($this->storage);