diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ set(QT_MIN_VERSION 5.2.0) set(KF5_MIN_VERSION 5.48.0) -set(KGAPI_MIN_VERSION 5.5.0) +set(KGAPI_MIN_VERSION 5.11.41) set(KACCOUNTS_MIN_VERSION 17.04.0) set(QTKEYCHAIN_MIN_VERSION 0.6.0) diff --git a/src/kio_gdrive.cpp b/src/kio_gdrive.cpp --- a/src/kio_gdrive.cpp +++ b/src/kio_gdrive.cpp @@ -146,6 +146,12 @@ } if (!gdriveUrl.isRoot()) { AboutFetchJob aboutFetch(getAccount(accountId)); + aboutFetch.setFields({ + About::Fields::Kind, + About::Fields::QuotaBytesTotal, + About::Fields::QuotaBytesUsedAggregate, + About::Fields::CanCreateTeamDrives, + }); if (runJob(aboutFetch, url, accountId)) { const AboutPtr about = aboutFetch.aboutData(); if (about) { @@ -379,7 +385,7 @@ const QString accountId = gdriveUrl.account(); FileFetchJob fetchJob(query, getAccount(accountId)); - fetchJob.setFields(FileFetchJob::Id | FileFetchJob::Title | FileFetchJob::Labels); + fetchJob.setFields({File::Fields::Id, File::Fields::Title, File::Fields::Labels}); if (!runJob(fetchJob, url, accountId)) { return QString(); } @@ -404,6 +410,7 @@ auto it = m_rootIds.constFind(accountId); if (it == m_rootIds.cend()) { AboutFetchJob aboutFetch(getAccount(accountId)); + aboutFetch.setFields({About::Fields::Kind, About::Fields::RootFolderId}); QUrl url; if (!runJob(aboutFetch, url, accountId)) { return QString(); @@ -455,10 +462,13 @@ query.addQuery(FileSearchQuery::Trashed, FileSearchQuery::Equals, false); query.addQuery(FileSearchQuery::Parents, FileSearchQuery::In, folderId); FileFetchJob fileFetchJob(query, getAccount(accountId)); - fileFetchJob.setFields((FileFetchJob::BasicFields & ~FileFetchJob::Permissions) - | FileFetchJob::Labels - | FileFetchJob::ExportLinks - | FileFetchJob::LastViewedByMeDate); + const auto extraFields = + KGAPI2::Drive::FileFetchJob::FieldShorthands::BasicFields + + QStringList({ KGAPI2::Drive::File::Fields::Labels, + KGAPI2::Drive::File::Fields::ExportLinks, + KGAPI2::Drive::File::Fields::LastViewedByMeDate, + }); + fileFetchJob.setFields(KGAPI2::Drive::FileFetchJob::FieldShorthands::BasicFields + extraFields); runJob(fileFetchJob, url, accountId); ObjectsList objects = fileFetchJob.items(); @@ -607,10 +617,7 @@ } FileFetchJob fileFetchJob(fileId, getAccount(accountId)); - fileFetchJob.setFields(FileFetchJob::Id - | FileFetchJob::MimeType - | FileFetchJob::ExportLinks - | FileFetchJob::DownloadUrl); + fileFetchJob.setFields({File::Fields::Id, File::Fields::MimeType, File::Fields::ExportLinks, File::Fields::DownloadUrl}); runJob(fileFetchJob, url, accountId); const ObjectsList objects = fileFetchJob.items(); @@ -866,8 +873,7 @@ return; } FileFetchJob sourceFileFetchJob(sourceFileId, getAccount(sourceAccountId)); - sourceFileFetchJob.setFields(FileFetchJob::Id | FileFetchJob::ModifiedDate | - FileFetchJob::LastViewedByMeDate | FileFetchJob::Description); + sourceFileFetchJob.setFields({File::Fields::Id, File::Fields::ModifiedDate, File::Fields::LastViewedByMeDate, File::Fields::Description}); runJob(sourceFileFetchJob, src, sourceAccountId); const ObjectsList objects = sourceFileFetchJob.items(); @@ -1086,7 +1092,7 @@ const QString accountId = GDriveUrl(url).account(); FileFetchJob fileFetchJob(fileId, getAccount(accountId)); - fileFetchJob.setFields(FileFetchJob::Id | FileFetchJob::MimeType); + fileFetchJob.setFields({File::Fields::Id, File::Fields::MimeType}); runJob(fileFetchJob, url, accountId); const ObjectsList objects = fileFetchJob.items();