Skip to content

[stable26] fix unencrypted_size for folders when scanning the filesystem with encryption enabled #38555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 5 commits into from
Oct 12, 2023
Merged

[stable26] fix unencrypted_size for folders when scanning the filesystem with encryption enabled #38555

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a70ba6
fix unencrypted_size for folders when scanning the filesystem with en…
icewind1991 Feb 24, 2023
ed6606e
fix unencrypted_size for files when scanning
icewind1991 Mar 3, 2023
0fde240
fix unencrypted folder size when no children with unencrypted size se…
icewind1991 Mar 9, 2023
29c36f8
fix type hints
icewind1991 Mar 22, 2023
96eca4a
fix(ci): update return type in php doc
blizzz Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix type hints 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @blizzz
icewind1991 authored and blizzz committed Oct 11, 2023
commit 29c36f85b0a008e1dc677c612b472488bcdd5f5e
8 changes: 3 additions & 5 deletions lib/private/Files/Cache/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,8 +882,7 @@ public function getIncompleteChildrenCount($fileId) {
* calculate the size of a folder and set it in the cache
*
* @param string $path
* @param array $entry (optional) meta data of the folder
* @param bool $ignoreUnknown don't mark the folder size as unknown if any of it's children are unknown
* @param array|null|ICacheEntry $entry (optional) meta data of the folder
* @return int|float
*/
public function calculateFolderSize($path, $entry = null) {
Expand All @@ -895,11 +894,11 @@ public function calculateFolderSize($path, $entry = null) {
* inner function because we can't add new params to the public function without breaking any child classes
*
* @param string $path
* @param array $entry (optional) meta data of the folder
* @param array|null|ICacheEntry $entry (optional) meta data of the folder
* @param bool $ignoreUnknown don't mark the folder size as unknown if any of it's children are unknown
* @return int
*/
protected function calculateFolderSizeInner(string $path, array $entry = null, bool $ignoreUnknown = false) {
protected function calculateFolderSizeInner(string $path, $entry = null, bool $ignoreUnknown = false) {
$totalSize = 0;
if (is_null($entry) || !isset($entry['fileid'])) {
$entry = $this->get($path);
Expand Down Expand Up @@ -959,7 +958,6 @@ protected function calculateFolderSizeInner(string $path, array $entry = null, b
$shouldWriteUnEncryptedSize = $unencryptedMax > 0 || $totalSize === 0 || $entry['unencrypted_size'] > 0;
if ($entry['size'] !== $totalSize || ($entry['unencrypted_size'] !== $unencryptedTotal && $shouldWriteUnEncryptedSize)) {
if ($shouldWriteUnEncryptedSize) {

// if all children have an unencrypted size of 0, just set the folder unencrypted size to 0 instead of summing the sizes
if ($unencryptedMax === 0) {
$unencryptedTotal = 0;
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Cache/HomeCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class HomeCache extends Cache {
* get the size of a folder and set it in the cache
*
* @param string $path
* @param array $entry (optional) meta data of the folder
* @param array|null|ICacheEntry $entry (optional) meta data of the folder
* @return int|float
*/
public function calculateFolderSize($path, $entry = null) {
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Cache/Wrapper/CacheJail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ public function correctFolderSize($path, $data = null, $isBackgroundScan = false
* get the size of a folder and set it in the cache
*
* @param string $path
* @param array $entry (optional) meta data of the folder
* @param array|null|ICacheEntry $entry (optional) meta data of the folder
* @return int|float
*/
public function calculateFolderSize($path, $entry = null) {
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Cache/Wrapper/CacheWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public function correctFolderSize($path, $data = null, $isBackgroundScan = false
* get the size of a folder and set it in the cache
*
* @param string $path
* @param array $entry (optional) meta data of the folder
* @param array|null|ICacheEntry $entry (optional) meta data of the folder
* @return int|float
*/
public function calculateFolderSize($path, $entry = null) {
Expand Down