summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-21 21:09:25 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-21 21:09:25 +0200
commit1deeec93b74c5adde44bcac30538caf75442a1da (patch)
tree34140fd596e7758cfbd510663e4811cbbb3ce3d6 /apps
parent5cd14425f9cc4ff122bd3c324ce9f3be80844e91 (diff)
downloadnextcloud-server-1deeec93b74c5adde44bcac30538caf75442a1da.tar.gz
nextcloud-server-1deeec93b74c5adde44bcac30538caf75442a1da.zip
fixed postFileSize
Diffstat (limited to 'apps')
-rw-r--r--apps/files_encryption/lib/proxy.php30
1 files changed, 19 insertions, 11 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index ea6b3bf345c..7419a85e9ba 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -465,28 +465,36 @@ class Proxy extends \OC_FileProxy
return $size;
}
- // get file info from database/cache
- $fileInfo = \OC\Files\Filesystem::getFileInfo($path_f);
+ $fileInfo = false;
+ // get file info from database/cache if not .part file
+ if(!Keymanager::isPartialFilePath($path)) {
+ $fileInfo = $view->getFileInfo($path);
+ }
// if file is encrypted return real file size
if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
$size = $fileInfo['unencrypted_size'];
} else {
// self healing if file was removed from file cache
- if (is_array($fileInfo)) {
- $userId = \OCP\User::getUser();
- $util = new Util($view, $userId);
- $fixSize = $util->getFileSize($path);
- if ($fixSize > 0) {
- $size = $fixSize;
+ if (!is_array($fileInfo)) {
+ $fileInfo = array();
+ }
- $fileInfo['encrypted'] = true;
- $fileInfo['unencrypted_size'] = $size;
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
+ $fixSize = $util->getFileSize($path);
+ if ($fixSize > 0) {
+ $size = $fixSize;
- // put file info
+ $fileInfo['encrypted'] = true;
+ $fileInfo['unencrypted_size'] = $size;
+
+ // put file info if not .part file
+ if(!Keymanager::isPartialFilePath($path_f)) {
$view->putFileInfo($path, $fileInfo);
}
}
+
}
return $size;
}