Use uint64_t for file size

TheOneRing · TheOneRing · commit f9703a39ca48 · 2025-12-04T10:39:47.000+01:00
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
@@ -80,7 +80,7 @@ namespace {
         // item if no items are in progress.
         SyncFileItem curItem = progress._lastCompletedItem;
         qint64 curItemProgress = -1; // -1 means finished
-        qint64 biggerItemSize = 0;
+        uint64_t biggerItemSize = 0;
         quint64 estimatedUpBw = 0;
         quint64 estimatedDownBw = 0;
         QStringList allFilenames;
diff --git a/src/libsync/common/syncjournaldb.cpp b/src/libsync/common/syncjournaldb.cpp
@@ -1170,6 +1170,13 @@ static bool deleteBatch(SqlQuery &query, const QStringList &entries, const QStri
     return true;
 }
 
+bool SyncJournalDb::UploadInfo::validate(uint64_t size, qint64 modtime, const QByteArray &checksum) const
+{
+    Q_ASSERT(!checksum.isEmpty());
+    Q_ASSERT(!_valid || !_contentChecksum.isEmpty());
+    return _valid && _size == size && _modtime == modtime && _contentChecksum == checksum;
+}
+
 SyncJournalDb::DownloadInfo SyncJournalDb::getDownloadInfo(const QString &file)
 {
     QMutexLocker locker(&_mutex);
diff --git a/src/libsync/common/syncjournaldb.h b/src/libsync/common/syncjournaldb.h
@@ -106,18 +106,13 @@ class OPENCLOUD_SYNC_EXPORT SyncJournalDb : public QObject
     {
         bool _valid = false;
 
-        qint64 _size = 0;
+        uint64_t _size = 0;
         qint64 _modtime = 0;
         QByteArray _contentChecksum;
         QUrl _url; // upload url (tus)
         QString _path; // stored as utf16, used in local discovery
 
-        bool validate(qint64 size, qint64 modtime, const QByteArray &checksum) const
-        {
-            Q_ASSERT(!checksum.isEmpty());
-            Q_ASSERT(!_valid || !_contentChecksum.isEmpty());
-            return _valid && _size == size && _modtime == modtime && _contentChecksum == checksum;
-        }
+        bool validate(uint64_t size, qint64 modtime, const QByteArray &checksum) const;
     };
 
     DownloadInfo getDownloadInfo(const QString &file);
diff --git a/src/libsync/common/syncjournalfilerecord.cpp b/src/libsync/common/syncjournalfilerecord.cpp
@@ -40,7 +40,7 @@ class OCC::SyncJournalFileRecordData : public QSharedData
     ItemType _type = ItemTypeUnsupported;
     QString _etag;
     QByteArray _fileId;
-    qint64 _fileSize = 0;
+    uint64_t _fileSize = 0;
     RemotePermissions _remotePerm;
     bool _serverHasIgnoredFiles = false;
     bool _hasDirtyPlaceholder = false;
@@ -195,7 +195,7 @@ time_t SyncJournalFileRecord::modtime() const
     return d->_modtime.value_or(0);
 }
 
-int64_t SyncJournalFileRecord::size() const
+uint64_t SyncJournalFileRecord::size() const
 {
     return d->_fileSize;
 }
diff --git a/src/libsync/common/syncjournalfilerecord.h b/src/libsync/common/syncjournalfilerecord.h
@@ -63,7 +63,7 @@ class OPENCLOUD_SYNC_EXPORT SyncJournalFileRecord
     RemotePermissions remotePerm() const;
     QByteArray checksumHeader() const;
     time_t modtime() const;
-    int64_t size() const;
+    uint64_t size() const;
     uint64_t inode() const;
     ItemType type() const;
 
diff --git a/src/libsync/common/utility.cpp b/src/libsync/common/utility.cpp
@@ -65,18 +65,16 @@ namespace OCC {
 
 Q_LOGGING_CATEGORY(lcUtility, "sync.utility", QtMsgType::QtInfoMsg)
 
-QString Utility::octetsToString(qint64 octets)
+QString Utility::octetsToString(uint64_t octets)
 {
-    OC_ASSERT(octets >= 0)
-
     using namespace FileSystem::SizeLiterals;
 
     // We do what macOS 10.8 and above do: 0 fraction digits for bytes and KB; 1 fraction digits for MB; 2 for GB and above.
     // See also https://developer.apple.com/documentation/foundation/nsbytecountformatter/1417887-adaptive
     int precision = 0;
-    if (quint64(octets) >= 1_GiB) {
+    if (octets >= 1_GiB) {
         precision = 2;
-    } else if (quint64(octets) >= 1_MiB) {
+    } else if (octets >= 1_MiB) {
         precision = 1;
     }
 
diff --git a/src/libsync/common/utility.h b/src/libsync/common/utility.h
@@ -28,7 +28,6 @@
 #include <QMap>
 #include <QMetaEnum>
 #include <QString>
-#include <QUrl>
 #include <QUrlQuery>
 
 #include <functional>
@@ -50,7 +49,7 @@ OPENCLOUD_SYNC_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcUtility)
     namespace Utility
 {
     OPENCLOUD_SYNC_EXPORT void setupFavLink(const QString &folder);
-    OPENCLOUD_SYNC_EXPORT QString octetsToString(qint64 octets);
+    OPENCLOUD_SYNC_EXPORT QString octetsToString(uint64_t octets);
     OPENCLOUD_SYNC_EXPORT QByteArray userAgentString();
 
     /**
diff --git a/src/libsync/discoveryinfo.cpp b/src/libsync/discoveryinfo.cpp
@@ -54,6 +54,7 @@ class OCC::LocalInfoData : public QSharedData
             return;
         }
         _inode = sb.st_ino;
+        Q_ASSERT(sb.st_size >= 0);
         _size = sb.st_size;
         _modtime = sb.st_mtime;
 #ifdef Q_OS_MAC
@@ -65,7 +66,7 @@ class OCC::LocalInfoData : public QSharedData
     QString _name;
     ItemType _type = ItemTypeUnsupported;
     time_t _modtime = 0;
-    int64_t _size = 0;
+    uint64_t _size = 0;
     uint64_t _inode = 0;
     bool _isHidden = false;
 };
@@ -129,7 +130,7 @@ time_t LocalInfo::modtime() const
     return d->_modtime;
 }
 
-int64_t LocalInfo::size() const
+uint64_t LocalInfo::size() const
 {
     return d->_size;
 }
diff --git a/src/libsync/discoveryinfo.h b/src/libsync/discoveryinfo.h
@@ -36,7 +36,7 @@ class OPENCLOUD_SYNC_EXPORT LocalInfo
     /** FileName of the entry (this does not contain any directory or path, just the plain name */
     QString name() const;
     time_t modtime() const;
-    int64_t size() const;
+    uint64_t size() const;
     uint64_t inode() const;
     ItemType type() const;
     bool isDirectory() const;
diff --git a/src/libsync/discoveryremoteinfo.cpp b/src/libsync/discoveryremoteinfo.cpp
@@ -31,8 +31,7 @@ class OCC::RemoteInfoData : public QSharedData
             _size = 0;
         } else {
             if (auto it = Utility::optionalFind(map, "getcontentlength"_L1)) {
-                // See #4573, sometimes negative size values are returned
-                _size = std::max<int64_t>(0, it->value().toLongLong());
+                _size = it->value().toULongLong();
             } else {
                 errors.append(u"size"_s);
             }
@@ -74,7 +73,7 @@ class OCC::RemoteInfoData : public QSharedData
     QByteArray _checksumHeader;
     RemotePermissions _remotePerm;
     time_t _modtime = 0;
-    int64_t _size = 0;
+    uint64_t _size = 0;
     bool _isDirectory = false;
 
     QString _error;
@@ -134,7 +133,7 @@ time_t RemoteInfo::modtime() const
     return d->_modtime;
 }
 
-int64_t RemoteInfo::size() const
+uint64_t RemoteInfo::size() const
 {
     return d->_size;
 }
diff --git a/src/libsync/discoveryremoteinfo.h b/src/libsync/discoveryremoteinfo.h
@@ -37,7 +37,7 @@ class OPENCLOUD_SYNC_EXPORT RemoteInfo
     RemotePermissions remotePerm() const;
     time_t modtime() const;
 
-    int64_t size() const;
+    uint64_t size() const;
 
     QString error() const;
 
diff --git a/src/libsync/filesystem.h b/src/libsync/filesystem.h
@@ -98,7 +98,7 @@ namespace FileSystem {
         static OPENCLOUD_SYNC_EXPORT FileChangedInfo fromSyncFileItemPrevious(const SyncFileItem *const item);
         static OPENCLOUD_SYNC_EXPORT FileChangedInfo fromSyncJournalFileRecord(const SyncJournalFileRecord &record);
 
-        qint64 size = {};
+        uint64_t size = {};
         std::optional<time_t> mtime = {};
         std::optional<quint64> inode = {};
         CSyncEnums::ItemType type = CSyncEnums::ItemTypeUnsupported;
diff --git a/src/libsync/networkjobs/getfilejob.cpp b/src/libsync/networkjobs/getfilejob.cpp
@@ -17,8 +17,6 @@ GETFileJob::GETFileJob(AccountPtr account, const QUrl &url, const QString &path,
     , _device(device)
     , _headers(headers)
     , _expectedEtagForResume(expectedEtagForResume)
-    , _expectedContentLength(-1)
-    , _contentLength(-1)
     , _resumeStart(resumeStart)
 {
     connect(this, &GETFileJob::networkError, this, [this] {
@@ -83,6 +81,26 @@ void GETFileJob::newReplyHook(QNetworkReply *reply)
     connect(reply, &QNetworkReply::downloadProgress, this, &GETFileJob::downloadProgress);
 }
 
+uint64_t GETFileJob::resumeStart() const
+{
+    return _resumeStart;
+}
+
+uint64_t GETFileJob::contentLength() const
+{
+    return _contentLength.value_or(0);
+}
+
+uint64_t GETFileJob::expectedContentLength() const
+{
+    return _expectedContentLength.value_or(0);
+}
+
+void GETFileJob::setExpectedContentLength(uint64_t size)
+{
+    _expectedContentLength = size;
+}
+
 void GETFileJob::slotMetaDataChanged()
 {
     // For some reason setting the read buffer in GETFileJob::start doesn't seem to go
@@ -132,22 +150,24 @@ void GETFileJob::slotMetaDataChanged()
     }
 
     bool ok;
-    _contentLength = reply()->header(QNetworkRequest::ContentLengthHeader).toLongLong(&ok);
-    if (ok && _expectedContentLength != -1 && _contentLength != _expectedContentLength) {
+    _contentLength = reply()->header(QNetworkRequest::ContentLengthHeader).toULongLong(&ok);
+    if (!ok) {
+        _contentLength.reset();
+    } else if (_expectedContentLength.has_value() && _contentLength != _expectedContentLength) {
         qCWarning(lcGetJob) << u"We received a different content length than expected!" << _expectedContentLength << u"vs" << _contentLength;
         _errorString = tr("We received an unexpected download Content-Length.");
         _errorStatus = SyncFileItem::NormalError;
         abort();
         return;
     }
 
-    qint64 start = 0;
+    uint64_t start = 0;
     const QString ranges = QString::fromUtf8(reply()->rawHeader("Content-Range"));
     if (!ranges.isEmpty()) {
         static QRegularExpression rx(QStringLiteral("bytes (\\d+)-"));
         const auto match = rx.match(ranges);
         if (match.hasMatch()) {
-            start = match.captured(1).toLongLong();
+            start = match.captured(1).toULongLong();
         }
     }
     if (start != _resumeStart) {
diff --git a/src/libsync/networkjobs/getfilejob.h b/src/libsync/networkjobs/getfilejob.h
@@ -21,9 +21,9 @@ class OPENCLOUD_SYNC_EXPORT GETFileJob : public AbstractNetworkJob
     QIODevice *_device;
     QMap<QByteArray, QByteArray> _headers;
     QString _expectedEtagForResume;
-    qint64 _expectedContentLength;
-    qint64 _contentLength;
-    qint64 _resumeStart;
+    std::optional<uint64_t> _expectedContentLength;
+    std::optional<uint64_t> _contentLength;
+    uint64_t _resumeStart;
 
 public:
     // DOES NOT take ownership of the device.
@@ -39,11 +39,11 @@ class OPENCLOUD_SYNC_EXPORT GETFileJob : public AbstractNetworkJob
 
     void newReplyHook(QNetworkReply *reply) override;
 
-    qint64 resumeStart() { return _resumeStart; }
+    uint64_t resumeStart() const;
 
-    qint64 contentLength() const { return _contentLength; }
-    qint64 expectedContentLength() const { return _expectedContentLength; }
-    void setExpectedContentLength(qint64 size) { _expectedContentLength = size; }
+    uint64_t contentLength() const;
+    uint64_t expectedContentLength() const;
+    void setExpectedContentLength(uint64_t size);
 
     void setChoked(bool c);
     void setBandwidthLimited(bool b);
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
@@ -21,6 +21,7 @@
 #include "common/utility.h"
 #include "discoveryphase.h"
 #include "filesystem.h"
+#include "libsync/common/filesystembase.h"
 #include "propagatedownload.h"
 #include "propagateremotedelete.h"
 #include "propagateremotemkdir.h"
@@ -42,6 +43,7 @@
 #include <qmath.h>
 
 using namespace std::chrono_literals;
+using namespace OCC::FileSystem::SizeLiterals;
 
 namespace OCC {
 
@@ -355,10 +357,9 @@ PropagateItemJob *OwncloudPropagator::createJob(const SyncFileItemPtr &item)
     Q_UNREACHABLE();
 }
 
-qint64 OwncloudPropagator::smallFileSize()
+uint64_t OwncloudPropagator::smallFileSize()
 {
-    const qint64 smallFileSize = 100 * 1024; //default to 1 MB. Not dynamic right now.
-    return smallFileSize;
+    return 1_MB; // default to 1 MB. Not dynamic right now.
 }
 
 /**
diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h
@@ -16,12 +16,6 @@
 
 #include <QHash>
 #include <QObject>
-#include <QMap>
-#include <QElapsedTimer>
-#include <QTimer>
-#include <QPointer>
-#include <QIODevice>
-#include <QMutex>
 
 #include "accountfwd.h"
 #include "bandwidthmanager.h"
@@ -431,7 +425,7 @@ class OPENCLOUD_SYNC_EXPORT OwncloudPropagator : public QObject
      *
      * This allows skipping of uploads that have a very high likelihood of failure.
      */
-    QHash<QString, qint64> _folderQuota;
+    QHash<QString, uint64_t> _folderQuota;
 
     /* the maximum number of jobs using bandwidth (uploads or downloads, in parallel) */
     int maximumActiveTransferJob();
@@ -443,7 +437,7 @@ class OPENCLOUD_SYNC_EXPORT OwncloudPropagator : public QObject
      * chunk-upload duration set.
      */
     qint64 _chunkSize;
-    qint64 smallFileSize();
+    uint64_t smallFileSize();
 
     /* The maximum number of active jobs in parallel  */
     int hardMaximumActiveJob();
diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
@@ -387,7 +387,7 @@ void PropagateDownloadFile::startFullDownload()
 qint64 PropagateDownloadFile::committedDiskSpace() const
 {
     if (state() == Running) {
-        return qBound(0LL, _item->_size - _resumeStart - _downloadProgress, _item->_size);
+        return qBound<uint64_t>(0, _item->_size - _resumeStart - _downloadProgress, _item->_size);
     }
     return 0;
 }
@@ -481,7 +481,7 @@ void PropagateDownloadFile::slotGetFinished()
      */
     const QByteArray sizeHeader("Content-Length");
     bool hasSizeHeader = true;
-    qint64 bodySize = job->reply()->rawHeader(sizeHeader).toLongLong(&hasSizeHeader);
+    uint64_t bodySize = job->reply()->rawHeader(sizeHeader).toULongLong(&hasSizeHeader);
 
     // Qt removes the content-length header for transparently decompressed HTTP1 replies
     // but not for HTTP2 or SPDY replies. For these it remains and contains the size
diff --git a/src/libsync/propagatedownload.h b/src/libsync/propagatedownload.h
@@ -17,7 +17,6 @@
 #include "networkjobs.h"
 #include "owncloudpropagator.h"
 
-#include <QBuffer>
 #include <QFile>
 
 namespace OCC {
@@ -119,8 +118,8 @@ private Q_SLOTS:
 private:
     void deleteExistingFolder();
 
-    qint64 _resumeStart;
-    qint64 _downloadProgress;
+    uint64_t _resumeStart;
+    uint64_t _downloadProgress;
     QPointer<GETFileJob> _job;
     QFile _tmpFile;
     bool _deleteExisting;
diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
@@ -133,7 +133,7 @@ void PropagateUploadFileCommon::start()
     }
 
     // Check if we believe that the upload will fail due to remote quota limits
-    const qint64 quotaGuess = propagator()->_folderQuota.value(QFileInfo(_item->localName()).path(), std::numeric_limits<qint64>::max());
+    const uint64_t quotaGuess = propagator()->_folderQuota.value(QFileInfo(_item->localName()).path(), std::numeric_limits<uint64_t>::max());
     if (_item->_size > quotaGuess) {
         // Necessary for blacklisting logic
         _item->_httpErrorCode = 507;
@@ -449,7 +449,7 @@ void PropagateUploadFileCommon::commonErrorHandling(AbstractNetworkJob *job)
         const auto path = QFileInfo(_item->localName()).path();
         auto quotaIt = propagator()->_folderQuota.find(path);
         if (quotaIt != propagator()->_folderQuota.end()) {
-            quotaIt.value() = qMin(quotaIt.value(), _item->_size - 1);
+            quotaIt.value() = qMin<uint64_t>(quotaIt.value(), _item->_size - 1);
         } else {
             propagator()->_folderQuota[path] = _item->_size - 1;
         }
diff --git a/src/libsync/propagateuploadtus.cpp b/src/libsync/propagateuploadtus.cpp
diff --git a/src/libsync/syncfileitem.cpp b/src/libsync/syncfileitem.cpp
diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h
diff --git a/src/libsync/vfs/hydrationjob.cpp b/src/libsync/vfs/hydrationjob.cpp

Original file line number	Diff line number	Diff line change
`@@ -1170,6 +1170,13 @@ static bool deleteBatch(SqlQuery &query, const QStringList &entries, const QStri`
`1170`	`1170`	`return true;`
`1171`	`1171`	`}`
`1172`	`1172`
	`1173`	`+bool SyncJournalDb::UploadInfo::validate(uint64_t size, qint64 modtime, const QByteArray &checksum) const`
	`1174`	`+{`
	`1175`	`+ Q_ASSERT(!checksum.isEmpty());`
	`1176`	`+ Q_ASSERT(!_valid \|\| !_contentChecksum.isEmpty());`
	`1177`	`+ return _valid && _size == size && _modtime == modtime && _contentChecksum == checksum;`
	`1178`	`+}`
	`1179`	`+`
`1173`	`1180`	`SyncJournalDb::DownloadInfo SyncJournalDb::getDownloadInfo(const QString &file)`
`1174`	`1181`	`{`
`1175`	`1182`	`QMutexLocker locker(&_mutex);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class OCC::SyncJournalFileRecordData : public QSharedData`
`40`	`40`	`ItemType _type = ItemTypeUnsupported;`
`41`	`41`	`QString _etag;`
`42`	`42`	`QByteArray _fileId;`
`43`		`- qint64 _fileSize = 0;`
	`43`	`+ uint64_t _fileSize = 0;`
`44`	`44`	`RemotePermissions _remotePerm;`
`45`	`45`	`bool _serverHasIgnoredFiles = false;`
`46`	`46`	`bool _hasDirtyPlaceholder = false;`
`@@ -195,7 +195,7 @@ time_t SyncJournalFileRecord::modtime() const`
`195`	`195`	`return d->_modtime.value_or(0);`
`196`	`196`	`}`
`197`	`197`
`198`		`-int64_t SyncJournalFileRecord::size() const`
	`198`	`+uint64_t SyncJournalFileRecord::size() const`
`199`	`199`	`{`
`200`	`200`	`return d->_fileSize;`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ class OCC::LocalInfoData : public QSharedData`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`	`56`	`_inode = sb.st_ino;`
	`57`	`+ Q_ASSERT(sb.st_size >= 0);`
`57`	`58`	`_size = sb.st_size;`
`58`	`59`	`_modtime = sb.st_mtime;`
`59`	`60`	`#ifdef Q_OS_MAC`
`@@ -65,7 +66,7 @@ class OCC::LocalInfoData : public QSharedData`
`65`	`66`	`QString _name;`
`66`	`67`	`ItemType _type = ItemTypeUnsupported;`
`67`	`68`	`time_t _modtime = 0;`
`68`		`- int64_t _size = 0;`
	`69`	`+ uint64_t _size = 0;`
`69`	`70`	`uint64_t _inode = 0;`
`70`	`71`	`bool _isHidden = false;`
`71`	`72`	`};`
`@@ -129,7 +130,7 @@ time_t LocalInfo::modtime() const`
`129`	`130`	`return d->_modtime;`
`130`	`131`	`}`
`131`	`132`
`132`		`-int64_t LocalInfo::size() const`
	`133`	`+uint64_t LocalInfo::size() const`
`133`	`134`	`{`
`134`	`135`	`return d->_size;`
`135`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@ class OCC::RemoteInfoData : public QSharedData`
`31`	`31`	`_size = 0;`
`32`	`32`	`} else {`
`33`	`33`	`if (auto it = Utility::optionalFind(map, "getcontentlength"_L1)) {`
`34`		`- // See #4573, sometimes negative size values are returned`
`35`		`- _size = std::max<int64_t>(0, it->value().toLongLong());`
	`34`	`+ _size = it->value().toULongLong();`
`36`	`35`	`} else {`
`37`	`36`	`errors.append(u"size"_s);`
`38`	`37`	`}`
`@@ -74,7 +73,7 @@ class OCC::RemoteInfoData : public QSharedData`
`74`	`73`	`QByteArray _checksumHeader;`
`75`	`74`	`RemotePermissions _remotePerm;`
`76`	`75`	`time_t _modtime = 0;`
`77`		`- int64_t _size = 0;`
	`76`	`+ uint64_t _size = 0;`
`78`	`77`	`bool _isDirectory = false;`
`79`	`78`
`80`	`79`	`QString _error;`
`@@ -134,7 +133,7 @@ time_t RemoteInfo::modtime() const`
`134`	`133`	`return d->_modtime;`
`135`	`134`	`}`
`136`	`135`
`137`		`-int64_t RemoteInfo::size() const`
	`136`	`+uint64_t RemoteInfo::size() const`
`138`	`137`	`{`
`139`	`138`	`return d->_size;`
`140`	`139`	`}`