Skip to content
Snippets Groups Projects
Unverified Commit b996c1f4 authored by Christian Jürges's avatar Christian Jürges Committed by Vincent Petry
Browse files

Check if file needs to decrypted or not for speed up large oc setups.

parent 0e3a0e0f
No related branches found
No related tags found
No related merge requests found
...@@ -133,6 +133,7 @@ class DecryptAll { ...@@ -133,6 +133,7 @@ class DecryptAll {
/** /**
* iterate over all user and encrypt their files * iterate over all user and encrypt their files
*
* @param string $user which users files should be decrypted, default = all users * @param string $user which users files should be decrypted, default = all users
*/ */
protected function decryptAllUsersFiles($user = '') { protected function decryptAllUsersFiles($user = '') {
...@@ -200,9 +201,9 @@ class DecryptAll { ...@@ -200,9 +201,9 @@ class DecryptAll {
$this->setupUserFS($uid); $this->setupUserFS($uid);
$directories = array(); $directories = array();
$directories[] = '/' . $uid . '/files'; $directories[] = '/' . $uid . '/files';
while($root = array_pop($directories)) { while ($root = array_pop($directories)) {
$content = $this->rootView->getDirectoryContent($root); $content = $this->rootView->getDirectoryContent($root);
foreach ($content as $file) { foreach ($content as $file) {
$path = $root . '/' . $file['name']; $path = $root . '/' . $file['name'];
...@@ -213,9 +214,14 @@ class DecryptAll { ...@@ -213,9 +214,14 @@ class DecryptAll {
try { try {
$progress->setMessage("decrypt files for user $userCount: $path"); $progress->setMessage("decrypt files for user $userCount: $path");
$progress->advance(); $progress->advance();
if ($this->decryptFile($path) === false) { if ($file->getData()['encrypted'] == 0) {
$progress->setMessage("decrypt files for user $userCount: $path (already decrypted)"); $progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
$progress->advance(); $progress->advance();
} else {
if ($this->decryptFile($path) === false) {
$progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
$progress->advance();
}
} }
} catch (\Exception $e) { } catch (\Exception $e) {
if (isset($this->failed[$uid])) { if (isset($this->failed[$uid])) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment