refs #43 attempt to fix locked file during import

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
nextcloud · Jan 5, 2021 · 18034b4 · 18034b4
1 parent ab0dc8e
commit 18034b4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -4,7 +4,7 @@
     <name>Google integration</name>
     <summary>Import Google data into Nextcloud</summary>
     <description><![CDATA[Google integration allows you to automatically import your Google calendars, contacts, photos and files into Nextcloud.]]></description>
-    <version>0.1.4</version>
+    <version>0.1.5</version>
     <licence>agpl</licence>
     <author>Julien Veyssier</author>
     <namespace>Google</namespace>

diff --git a/lib/Service/GoogleDriveAPIService.php b/lib/Service/GoogleDriveAPIService.php
@@ -340,6 +340,8 @@ private function getFile(string $accessToken, string $userId, array $fileItem, a
 					);
 					return null;
 				}
+				$savedFile->unlock(\OCP\Lock\ILockingProvider::LOCK_SHARED);
+				$savedFile->unlock(\OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE);
 				$resource = $savedFile->fopen('w');
 				$res = $this->googleApiService->simpleDownload($accessToken, $userId, $fileUrl, $resource);
 				if (!isset($res['error'])) {
@@ -397,6 +399,8 @@ private function getFile(string $accessToken, string $userId, array $fileItem, a
 					);
 					return null;
 				}
+				$savedFile->unlock(\OCP\Lock\ILockingProvider::LOCK_SHARED);
+				$savedFile->unlock(\OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE);
 				$resource = $savedFile->fopen('w');
 				$res = $this->googleApiService->simpleDownload($accessToken, $userId, $fileUrl, $resource, $params);
 				if (!isset($res['error'])) {

diff --git a/lib/Service/GooglePhotosAPIService.php b/lib/Service/GooglePhotosAPIService.php
@@ -363,6 +363,8 @@ private function getPhoto(string $accessToken, string $userId, array $photo, Nod
 				return null;
 			}
 			$savedFile = $albumFolder->newFile($photoName);
+			$savedFile->unlock(\OCP\Lock\ILockingProvider::LOCK_SHARED);
+			$savedFile->unlock(\OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE);
 			$resource = $savedFile->fopen('w');
 			$res = $this->googleApiService->simpleDownload($accessToken, $userId, $photoUrl, $resource);
 			if (!isset($res['error'])) {