Differential D15055 Diff 40360 src/common/davcollectionsfetchjob.cpp

Changeset View

Standalone View

View Options

src/common/davcollectionsfetchjob.cpp

Context not available.
20 20​
21#include "davmanager.h" 21​#include "davmanager.h"
22#include "davprincipalhomesetsfetchjob.h" 22​#include "davprincipalhomesetsfetchjob.h"
23​#include "davcollectionfetchjob.h"
23#include "davprotocolbase.h" 24​#include "davprotocolbase.h"
24#include "utils.h" 25​#include "utils.h"
25#include "daverror.h" 26​#include "daverror.h"
Context not available.
76 if (davJob->latestResponseCode()) { 77​ if (davJob->latestResponseCode()) {
77 // If we have a HTTP response code then this may mean that 78​ // If we have a HTTP response code then this may mean that
78 // the URL was not a principal URL. Retry as if it were a calendar URL. 79​ // the URL was not a principal URL. Retry as if it were a calendar URL.
79 qCDebug(KDAV2_LOG) << "Principal fetch failed, retrying: " << job->errorText(); 80​ qDebug() << "Principal fetch failed, retrying: " << job->errorText();
cmollekopfUnsubmitted
Not Done

Please keep the qCDebug everywhere.

cmollekopf: Please keep the qCDebug everywhere.
80 doCollectionsFetch(mUrl.url()); 81​ doCollectionsFetch(mUrl.url());
81 } else { 82​ } else {
82 // Just give up here. 83​ // Just give up here.
Context not available.
89 } 90​ }
90 91​
91 const QStringList homeSets = davJob->homeSets(); 92​ const QStringList homeSets = davJob->homeSets();
92 qCDebug(KDAV2_LOG) << "Found " << homeSets.size() << " homesets"; 93​ qDebug() << "Found " << homeSets.size() << " homesets";
93 qCDebug(KDAV2_LOG) << homeSets; 94​ qDebug() << homeSets;
94 95​
95 if (homeSets.isEmpty()) { 96​ if (homeSets.isEmpty()) {
96 // Same as above, retry as if it were a calendar URL. 97​ // Same as above, retry as if it were a calendar URL.
Context not available.
142 _jobUrl.setUserInfo(QString()); 143​ _jobUrl.setUserInfo(QString());
143 const QString jobUrl = _jobUrl.toDisplayString(); 144​ const QString jobUrl = _jobUrl.toDisplayString();
144 145​
146​ qDebug().noquote() << davJob->response().toString();
147​
145 // Validate that we got a valid PROPFIND response 148​ // Validate that we got a valid PROPFIND response
146 QDomElement rootElement = davJob->response().documentElement(); 149​ QDomElement rootElement = davJob->response().documentElement();
147 if (rootElement.localName().compare(QStringLiteral("multistatus"), Qt::CaseInsensitive) != 0) { 150​ if (rootElement.localName().compare(QStringLiteral("multistatus"), Qt::CaseInsensitive) != 0) {
Context not available.
245 continue; 248​ continue;
246 } 249​ }
247 250​
251​ bool protocolSupportsCTags = DavManager::self()->davProtocol(mUrl.protocol())->supportsPrincipals();
252​ if (protocolSupportsCTags && collection.CTag() == "") {
253​ qDebug() << "No CTag found for"
254​ << collection.url().url().toDisplayString()
255​ << "from the home set, trying from the direct URL";
256​ refreshIndividualCollection(collection);
257​
258​ responseElement = Utils::nextSiblingElementNS(
259​ responseElement, QStringLiteral("DAV:"), QStringLiteral("response"));
260​ continue;
261​ }
262​
248 mCollections << collection; 263​ mCollections << collection;
249 Q_EMIT collectionDiscovered(mUrl.protocol(), url.toDisplayString(), jobUrl); 264​ Q_EMIT collectionDiscovered(mUrl.protocol(), url.toDisplayString(), jobUrl);
250 265​
Context not available.
257 subjobFinished(); 272​ subjobFinished();
258} 273​}
259 274​
275​// This is a workaroud for Google who doesn't support providing the CTag
276​// directly from the home set. We refresh the collections individually from
277​// their own URLs, but only if we haven't found a CTag with the home set
278​// request.
279​void DavCollectionsFetchJob::refreshIndividualCollection(const DavCollection &collection)
280​{
281​ ++mSubJobCount;
282​ auto individualFetchJob = new DavCollectionFetchJob(collection, this);
283​ connect(individualFetchJob, &DavCollectionFetchJob::result, this, &DavCollectionsFetchJob::individualCollectionRefreshed);
284​ individualFetchJob->start();
285​}
286​
287​void DavCollectionsFetchJob::individualCollectionRefreshed(KJob *job)
288​{
289​ const auto *davJob = qobject_cast<DavCollectionFetchJob *>(job);
290​
291​ if (davJob->error()) {
292​ if (davJob->latestResponseCode()) {
293​ // If we have a HTTP response code then this may mean that
294​ // the URL was not a principal URL. Retry as if it were a calendar URL.
295​ qDebug() << "Individual fetch failed, retrying: " << job->errorText();
296​ doCollectionsFetch(mUrl.url());
297​ } else {
298​ setDavError(davJob->davError());
299​ setErrorTextFromDavError();
300​ emitResult();
301​ }
302​ return;
303​ }
304​
305​ qDebug() << "Collection"
306​ << davJob->collection().url().url().toDisplayString() << "refreshed";
307​
308​ if (davJob->collection().CTag() == "") {
309​ qWarning() << "Collection with an empty CTag";
310​ }
311​
312​ mCollections << davJob->collection();
313​ subjobFinished();
314​}
315​
260void DavCollectionsFetchJob::subjobFinished() 316​void DavCollectionsFetchJob::subjobFinished()
261{ 317​{
262 if (--mSubJobCount == 0) { 318​ if (--mSubJobCount == 0) {
Context not available.