Remove explicit propagate calls

diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index a59dc7c08c64f17bedc2b7c0ed4f0f1aa83a79bb..c303ff24b1f76c668fb81dd47657bc137cdc48e3 100644 (file)
--- a/lib/private/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -34,8 +34,9 @@ class Updater {
         * Update the cache for $path
         *
         * @param string $path
+        * @param int $time
         */
-       public function update($path) {
+       public function update($path, $time = null) {
                /**
                 * @var \OC\Files\Storage\Storage $storage
                 * @var string $internalPath
@@ -48,6 +49,7 @@ class Updater {
                        $data = $scanner->scan($internalPath, Scanner::SCAN_SHALLOW);
                        $this->correctParentStorageMtime($storage, $internalPath);
                        $cache->correctFolderSize($internalPath, $data);
+                       $this->propagator->propagateChanges($time);
                }
        }
 
@@ -72,6 +74,7 @@ class Updater {
                        $cache->remove($internalPath);
                        $cache->correctFolderSize($parent);
                        $this->correctParentStorageMtime($storage, $internalPath);
+                       $this->propagator->propagateChanges();
                }
        }
 
@@ -115,18 +118,10 @@ class Updater {
                                $this->remove($source);
                                $this->update($target);
                        }
+                       $this->propagator->propagateChanges();
                }
        }
 
-       /**
-        * propagate the updates to their parent folders
-        *
-        * @param int $time (optional) the mtime to set for the folders, if not set the current time is used
-        */
-       public function propagate($time = null) {
-               $this->propagator->propagateChanges($time);
-       }
-
        /**
         * update the storage_mtime of the parent
         *

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index cc26bc5236abb568da81ccf24f1bd781e52cfc7d..95f3e9a2c7f2465c43583808dec9aec32195d8a2 100644 (file)
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -384,7 +384,6 @@ class View {
                                        fclose($target);
                                        fclose($data);
                                        $this->updater->update($path);
-                                       $this->updater->propagate();
                                        if ($this->shouldEmitHooks($path) && $result !== false) {
                                                $this->emit_file_hooks_post($exists, $path);
                                        }
@@ -506,13 +505,11 @@ class View {
                                if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
                                        // if it was a rename from a part file to a regular file it was a write and not a rename operation
                                        $this->updater->update($path2);
-                                       $this->updater->propagate();
                                        if ($this->shouldEmitHooks()) {
                                                $this->emit_file_hooks_post($exists, $path2);
                                        }
                                } elseif ($this->shouldEmitHooks() && $result !== false) {
                                        $this->updater->rename($path1, $path2);
-                                       $this->updater->propagate();
                                        \OC_Hook::emit(
                                                Filesystem::CLASSNAME,
                                                Filesystem::signal_post_rename,
@@ -592,7 +589,6 @@ class View {
                                        }
                                }
                                $this->updater->update($path2);
-                               $this->updater->propagate();
                                if ($this->shouldEmitHooks() && $result !== false) {
                                        \OC_Hook::emit(
                                                Filesystem::CLASSNAME,
@@ -776,15 +772,12 @@ class View {
 
                                if (in_array('delete', $hooks)) {
                                        $this->updater->remove($path);
-                                       $this->updater->propagate();
                                }
                                if (in_array('write', $hooks)) {
                                        $this->updater->update($path);
-                                       $this->updater->propagate();
                                }
                                if (in_array('touch', $hooks)) {
-                                       $this->updater->update($path);
-                                       $this->updater->propagate($extraParam);
+                                       $this->updater->update($path, $extraParam);
                                }
 
                                if ($this->shouldEmitHooks($path) && $result !== false) {