зеркало из https://github.com/nextcloud/desktop.git
Check for live photo against db entry instead of server entry
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Родитель
9406131e52
Коммит
3b5222d457
|
@ -547,6 +547,7 @@ void ProcessDirectoryJob::processFile(PathTuple path,
|
||||||
<< " | e2eeMangledName: " << dbEntry.e2eMangledName() << "/" << serverEntry.e2eMangledName
|
<< " | e2eeMangledName: " << dbEntry.e2eMangledName() << "/" << serverEntry.e2eMangledName
|
||||||
<< " | file lock: " << localFileIsLocked << "//" << serverFileIsLocked
|
<< " | file lock: " << localFileIsLocked << "//" << serverFileIsLocked
|
||||||
<< " | file lock type: " << localFileLockType << "//" << serverFileLockType
|
<< " | file lock type: " << localFileLockType << "//" << serverFileLockType
|
||||||
|
<< " | live photo: " << dbEntry._isLivePhoto << "//" << serverEntry.isLivePhoto
|
||||||
<< " | metadata missing: /" << localEntry.isMetadataMissing << '/';
|
<< " | metadata missing: /" << localEntry.isMetadataMissing << '/';
|
||||||
|
|
||||||
qCInfo(lcDisco).nospace() << processingLog;
|
qCInfo(lcDisco).nospace() << processingLog;
|
||||||
|
@ -1122,7 +1123,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
|
||||||
qCWarning(lcDisco) << "Failed to delete a file record from the local DB" << path._original;
|
qCWarning(lcDisco) << "Failed to delete a file record from the local DB" << path._original;
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
} else if (serverEntry.isLivePhoto && QMimeDatabase().mimeTypeForFile(item->_file).inherits(QStringLiteral("video/quicktime"))) {
|
} else if (dbEntry._isLivePhoto && QMimeDatabase().mimeTypeForFile(item->_file).inherits(QStringLiteral("video/quicktime"))) {
|
||||||
// This is a live photo's video file; the server won't allow deletion of this file
|
// This is a live photo's video file; the server won't allow deletion of this file
|
||||||
// so we need to *not* propagate the .mov deletion to the server and redownload the file
|
// so we need to *not* propagate the .mov deletion to the server and redownload the file
|
||||||
qCInfo(lcDisco) << "Live photo video file deletion detected, redownloading" << item->_file;
|
qCInfo(lcDisco) << "Live photo video file deletion detected, redownloading" << item->_file;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче