mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(quota): do not prevent upload when quota info are not available

Browse Source 
if we did not query the server info, we have no quota info
so do not prevent upload because of no quota info available

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2025-05-15 16:59:27 +02:00
parent 54d98d5503
commit 9dd719c5ae
No known key found for this signature in database
GPG Key ID: 7D0F74F05C22F553
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libsync/discovery.cpp
View File

@ -767,8 +767,13 @@ void ProcessDirectoryJob::processFileAnalyzeRemoteInfo(const SyncFileItemPtr &it
item->_isLivePhoto = serverEntry.isLivePhoto;
item->_livePhotoFile = serverEntry.livePhotoFile;
item->_folderQuota.bytesUsed = serverEntry.folderQuota.bytesUsed;
item->_folderQuota.bytesAvailable = serverEntry.folderQuota.bytesAvailable;
if (serverEntry.isValid()) {
item->_folderQuota.bytesUsed = serverEntry.folderQuota.bytesUsed;
item->_folderQuota.bytesAvailable = serverEntry.folderQuota.bytesAvailable;
} else {
item->_folderQuota.bytesUsed = -1;
item->_folderQuota.bytesAvailable = -1;
}
// Check for missing server data
{
@ -1128,6 +1133,14 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
qCDebug(lcDisco) << "File" << item->_file << "- servermodified:" << serverModified
<< "noServerEntry:" << noServerEntry;
if (serverEntry.isValid()) {
item->_folderQuota.bytesUsed = serverEntry.folderQuota.bytesUsed;
item->_folderQuota.bytesAvailable = serverEntry.folderQuota.bytesAvailable;
} else {
item->_folderQuota.bytesUsed = -1;
item->_folderQuota.bytesAvailable = -1;
}
// Decay server modifications to UPDATE_METADATA if the local virtual exists
bool hasLocalVirtual = localEntry.isVirtualFile || (_queryLocal == ParentNotChanged && dbEntry.isVirtualFile());
bool virtualFileDownload = item->_type == ItemTypeVirtualFileDownload;
@ -1166,6 +1179,8 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
if (const auto folderQuota = folderQuotaAvailable(item);item->_size > folderQuota && folderQuota > -1) {
qCDebug(lcDisco) << "Folder" << item->_file
<< "item used:" << item->_folderQuota.bytesUsed
<< "item available:" << item->_folderQuota.bytesAvailable
<< "- quota used: " << serverEntry.folderQuota.bytesUsed
<< "- quota available: " << serverEntry.folderQuota.bytesAvailable;
item->_instruction = CSYNC_INSTRUCTION_ERROR;