diff options
author | Jocelyn Turcotte <jturcotte@woboq.com> | 2017-08-24 18:07:22 +0300 |
---|---|---|
committer | Jocelyn Turcotte <jturcotte@woboq.com> | 2017-09-18 12:46:09 +0300 |
commit | 0e97770c47e6000f6ef11251c81e48a9879d7760 (patch) | |
tree | 595e30ff5380399f39455b53cfcf43ac242f19b0 /src/libsync/syncfileitem.h | |
parent | 3d7bd7583b45a7f3ba7394a4daa58793053b5558 (diff) |
Remove SyncFileItem::log
This remove the remaining "other" fields of the sync log to save a
bit of memory.
other_etag and other_fileId don't give much information to the users
and other_instruction will always be INST_NONE anyway.
other_modtime and other_size are kept since they are sometimes used.
They were renamed to have a bit more meaningful name.
SyncEngine::checkPermissions will now fetch its information from the
csync trees since they are now preserved until right after this point.
Fixes #3213
Diffstat (limited to 'src/libsync/syncfileitem.h')
-rw-r--r-- | src/libsync/syncfileitem.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h index 45660f83f..9ea4e4d45 100644 --- a/src/libsync/syncfileitem.h +++ b/src/libsync/syncfileitem.h @@ -101,6 +101,8 @@ public: , _modtime(0) , _size(0) , _inode(0) + , _previousSize(0) + , _previousModtime(0) { } @@ -217,17 +219,12 @@ public: // - for conflicts (remote checksum) (what about eval_rename/new reconcile?) QByteArray _checksumHeader; + // The size and modtime of the file getting overwritten (on the disk for downloads, on the server for uploads). + quint64 _previousSize; + time_t _previousModtime; + QString _directDownloadUrl; QString _directDownloadCookies; - - struct - { - quint64 _other_size; - time_t _other_modtime; - QByteArray _other_etag; - QByteArray _other_fileId; - enum csync_instructions_e _other_instruction BITFIELD(16); - } log; }; typedef QSharedPointer<SyncFileItem> SyncFileItemPtr; |