Merge pull request #139 from nextcloud/fix138

Attempt to fix postWrite hook, fix #138
nextcloud · Sep 15, 2019 · f546946 · f546946
2 parents 9a4edd7 + c06ad59
commit f546946
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/appinfo/application.php b/appinfo/application.php
@@ -42,7 +42,8 @@ public function __construct (array $urlParams=array()) {
                 \OC::$server->query(PhotofilesService::class),
                 \OC::$server->query(TracksService::class),
                 $c->query('ServerContainer')->getLogger(),
-                $c->query('AppName')
+                $c->query('AppName'),
+                $c->query('ServerContainer')->getLockingProvider()
             );
         });
 

diff --git a/lib/Hooks/FileHooks.php b/lib/Hooks/FileHooks.php
@@ -18,6 +18,7 @@
 use OCP\ILogger;
 use OCP\Files\Node;
 use OCP\Files\IRootFolder;
+use OCP\Lock\ILockingProvider;
 use OCP\Util;
 use OCP\Share;
 
@@ -36,19 +37,26 @@ class FileHooks {
 
     private $root;
 
-    public function __construct(IRootFolder $root, PhotofilesService $photofilesService, TracksService $tracksService, ILogger $logger, $appName) {
+    public function __construct(IRootFolder $root, PhotofilesService $photofilesService, TracksService $tracksService,
+                                ILogger $logger, $appName, ILockingProvider $lockingProvider) {
         $this->photofilesService = $photofilesService;
         $this->tracksService = $tracksService;
         $this->logger = $logger;
         $this->root = $root;
+        $this->lockingProvider = $lockingProvider;
     }
 
     public function register() {
         $fileWriteCallback = function(\OCP\Files\Node $node) {
-            if ($this->isUserNode($node)) {
-                $isPhoto = $this->photofilesService->safeAddByFile($node);
-                if (!$isPhoto) {
-                    $this->tracksService->safeAddByFile($node);
+            if ($this->isUserNode($node) && $node->getSize() > 0) {
+                $path = $node->getPath();
+                if (!$this->lockingProvider->isLocked($path, ILockingProvider::LOCK_SHARED)
+                    and !$this->lockingProvider->isLocked($path, ILockingProvider::LOCK_EXCLUSIVE)
+                ) {
+                    $isPhoto = $this->photofilesService->safeAddByFile($node);
+                    if (!$isPhoto) {
+                        $this->tracksService->safeAddByFile($node);
+                    }
                 }
             }
         };