diff --git a/resources/google-new/taskhandler.cpp b/resources/google-new/taskhandler.cpp index 9af53adf2..aa2199fb2 100644 --- a/resources/google-new/taskhandler.cpp +++ b/resources/google-new/taskhandler.cpp @@ -1,347 +1,354 @@ /* Copyright (C) 2011-2013 Daniel Vrátil 2020 Igor Poboiko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include "taskhandler.h" #include "googleresource.h" #include "googlesettings.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "googletasks_debug.h" #define TASK_PROPERTY "_KGAPI2::TaskPtr" using namespace KGAPI2; using namespace Akonadi; QString TaskHandler::mimetype() { return KCalendarCore::Todo::todoMimeType(); } bool TaskHandler::canPerformTask(const Item &item) { return m_resource->canPerformTask(item, mimetype()); } void TaskHandler::setupCollection(Collection& collection, const TaskListPtr& taskList) { collection.setContentMimeTypes({ mimetype() }); collection.setName(taskList->uid()); collection.setParentCollection(m_resource->rootCollection()); collection.setRemoteId(taskList->uid()); collection.setRights(Collection::CanChangeCollection |Collection::CanCreateItem |Collection::CanChangeItem |Collection::CanDeleteItem); EntityDisplayAttribute *attr = collection.attribute(Collection::AddIfMissing); attr->setDisplayName(taskList->title()); attr->setIconName(QStringLiteral("view-pim-tasks")); } void TaskHandler::retrieveCollections() { Q_EMIT m_resource->status(AgentBase::Running, i18nc("@info:status", "Retrieving task lists")); qCDebug(GOOGLE_TASKS_LOG) << "Retrieving tasks..."; auto job = new TaskListFetchJob(m_settings->accountPtr(), this); connect(job, &KGAPI2::Job::finished, this, &TaskHandler::slotCollectionsRetrieved); } void TaskHandler::slotCollectionsRetrieved(KGAPI2::Job* job) { if (!m_resource->handleError(job)) { return; } qCDebug(GOOGLE_TASKS_LOG) << "Task lists retrieved"; const ObjectsList taskLists = qobject_cast(job)->items(); const QStringList activeTaskLists = m_settings->taskLists(); Collection::List collections; for (const ObjectPtr &object : taskLists) { const TaskListPtr &taskList = object.dynamicCast(); qCDebug(GOOGLE_TASKS_LOG) << "Retrieved task list:" << taskList->uid(); if (!activeTaskLists.contains(taskList->uid())) { qCDebug(GOOGLE_TASKS_LOG) << "Skipping, not subscribed"; continue; } Collection collection; setupCollection(collection, taskList); collections << collection; } m_resource->collectionsRetrievedFromHandler(collections); } void TaskHandler::retrieveItems(const Collection &collection) { Q_EMIT m_resource->status(AgentBase::Running, i18nc("@info:status", "Retrieving tasks for list '%1'", collection.displayName())); qCDebug(GOOGLE_TASKS_LOG) << "Retrieving tasks for list" << collection.remoteId(); // https://bugs.kde.org/show_bug.cgi?id=308122: we can only request changes in // max. last 25 days, otherwise we get an error. int lastSyncDelta = -1; if (!collection.remoteRevision().isEmpty()) { lastSyncDelta = QDateTime::currentDateTimeUtc().toSecsSinceEpoch() - collection.remoteRevision().toULongLong(); } auto job = new TaskFetchJob(collection.remoteId(), m_settings->accountPtr(), this); if (lastSyncDelta > -1 && lastSyncDelta < 25 * 25 * 3600) { job->setFetchOnlyUpdated(collection.remoteRevision().toULongLong()); } job->setProperty(COLLECTION_PROPERTY, QVariant::fromValue(collection)); connect(job, &KGAPI2::Job::finished, this, &TaskHandler::slotItemsRetrieved); } void TaskHandler::slotItemsRetrieved(KGAPI2::Job *job) { if (!m_resource->handleError(job)) { return; } Item::List changedItems, removedItems; const ObjectsList& objects = qobject_cast(job)->items(); Collection collection = job->property(COLLECTION_PROPERTY).value(); bool isIncremental = (qobject_cast(job)->fetchOnlyUpdated() > 0); qCDebug(GOOGLE_TASKS_LOG) << "Retrieved" << objects.count() << "tasks for list" << collection.remoteId(); for (const auto &object : objects) { const TaskPtr task = object.dynamicCast(); Item item; item.setMimeType(KCalendarCore::Todo::todoMimeType()); item.setParentCollection(collection); item.setRemoteId(task->uid()); item.setRemoteRevision(task->etag()); item.setPayload(task.dynamicCast()); if (task->deleted()) { qCDebug(GOOGLE_TASKS_LOG) << " - removed" << task->uid(); removedItems << item; } else { qCDebug(GOOGLE_TASKS_LOG) << " - changed" << task->uid(); changedItems << item; } } if (isIncremental) { m_resource->itemsRetrievedIncremental(changedItems, removedItems); } else { m_resource->itemsRetrieved(changedItems); } const QDateTime local(QDateTime::currentDateTime()); const QDateTime UTC(local.toUTC()); collection.setRemoteRevision(QString::number(UTC.toSecsSinceEpoch())); new CollectionModifyJob(collection, this); m_resource->emitReadyStatus(); } void TaskHandler::itemAdded(const Item &item, const Collection &collection) { Q_EMIT m_resource->status(AgentBase::Running, i18nc("@info:status", "Adding event to calendar '%1'", collection.displayName())); KCalendarCore::Todo::Ptr todo = item.payload(); TaskPtr task(new Task(*todo)); const QString parentRemoteId = task->relatedTo(KCalendarCore::Incidence::RelTypeParent); qCDebug(GOOGLE_TASKS_LOG) << "Task added to list" << collection.remoteId() << "with parent" << parentRemoteId; auto job = new TaskCreateJob(task, item.parentCollection().remoteId(), m_settings->accountPtr(), this); job->setParentItem(parentRemoteId); connect(job, &KGAPI2::Job::finished, this, [this, item](KGAPI2::Job *job){ if (!m_resource->handleError(job)) { return; } Item newItem = item; const TaskPtr task = qobject_cast(job)->items().first().dynamicCast(); qCDebug(GOOGLE_TASKS_LOG) << "Task added"; newItem.setRemoteId(task->uid()); newItem.setRemoteRevision(task->etag()); newItem.setGid(task->uid()); m_resource->changeCommitted(newItem); newItem.setPayload(task.dynamicCast()); new ItemModifyJob(newItem, this); m_resource->emitReadyStatus(); }); } void TaskHandler::itemChanged(const Item &item, const QSet< QByteArray > &partIdentifiers) { Q_UNUSED(partIdentifiers); Q_EMIT m_resource->status(AgentBase::Running, i18nc("@info:status", "Changing task in list '%1'", item.parentCollection().displayName())); qCDebug(GOOGLE_TASKS_LOG) << "Changing task" << item.remoteId(); KCalendarCore::Todo::Ptr todo = item.payload(); const QString parentUid = todo->relatedTo(KCalendarCore::Incidence::RelTypeParent); - TaskPtr task(new Task(*todo)); // First we move it to a new parent, if there is auto job = new TaskMoveJob(item.remoteId(), item.parentCollection().remoteId(), parentUid, m_settings->accountPtr(), this); - connect(job, &TaskMoveJob::finished, this, [this, task, item](KGAPI2::Job* job){ + connect(job, &TaskMoveJob::finished, this, [this, todo, item](KGAPI2::Job* job){ if (!m_resource->handleError(job)) { return; } + TaskPtr task(new Task(*todo)); auto newJob = new TaskModifyJob(task, item.parentCollection().remoteId(), job->account(), this); newJob->setProperty(ITEM_PROPERTY, QVariant::fromValue(item)); connect(newJob, &KGAPI2::Job::finished, m_resource, &GoogleResource::slotGenericJobFinished); }); } void TaskHandler::itemsRemoved(const Item::List &items) { Q_EMIT m_resource->status(AgentBase::Running, i18ncp("@info:status", "Removing %1 tasks", "Removing %1 task", items.count())); qCDebug(GOOGLE_TASKS_LOG) << "Removing" << items.count() << "tasks"; /* Google always automatically removes tasks with all their subtasks. In KOrganizer * by default we only remove the item we are given. For this reason we have to first * fetch all tasks, find all sub-tasks for the task being removed and detach them * from the task. Only then the task can be safely removed. */ // TODO: what if items belong to different collections? auto job = new ItemFetchJob(items.first().parentCollection()); job->fetchScope().fetchFullPayload(true); connect(job, &ItemFetchJob::finished, this, [this, items](KJob *job){ if (job->error()) { m_resource->cancelTask(i18n("Failed to delete task: %1", job->errorString())); return; } const Item::List fetchedItems = qobject_cast(job)->items(); Item::List detachItems; + TasksList detachTasks; for (const Item &fetchedItem : fetchedItems) { auto todo = fetchedItem.payload(); - const QString parentId = todo->relatedTo(KCalendarCore::Incidence::RelTypeParent); + TaskPtr task(new Task(*todo)); + const QString parentId = task->relatedTo(KCalendarCore::Incidence::RelTypeParent); if (parentId.isEmpty()) { continue; } for (const Item &item : items) { if (item.remoteId() == parentId) { Item newItem(fetchedItem); qCDebug(GOOGLE_TASKS_LOG) << "Detaching child" << newItem.remoteId() << "from" << parentId; todo->setRelatedTo(QString(), KCalendarCore::Incidence::RelTypeParent); newItem.setPayload(todo); detachItems << newItem; + detachTasks << task; } } } /* If there are no items do detach, then delete the task right now */ if (detachItems.isEmpty()) { - slotDoRemoveTasks(items); + doRemoveTasks(items); return; } - qCDebug(GOOGLE_TASKS_LOG) << "Modifying" << detachItems.count() << "children..."; - /* Send modify request to detach all the sub-tasks from the task that is about to be - * removed. */ - auto modifyJob = new ItemModifyJob(detachItems); - connect(modifyJob, &ItemModifyJob::finished, this, [this, items](KJob *job){ + + qCDebug(GOOGLE_TASKS_LOG) << "Reparenting" << detachItems.count() << "children..."; + auto moveJob = new TaskMoveJob(detachTasks, items.first().parentCollection().remoteId(), + QString(), m_settings->accountPtr(), this); + connect(moveJob, &TaskMoveJob::finished, this, [this, items, detachItems](KGAPI2::Job *job){ if (job->error()) { - m_resource->cancelTask(i18n("Failed to delete tasks:", job->errorString())); + m_resource->cancelTask(i18n("Failed to reparent subtasks: %1", job->errorString())); + return; } - slotDoRemoveTasks(items); + // Update items inside Akonadi DB too + new ItemModifyJob(detachItems); + // Perform actual removal + doRemoveTasks(items); }); }); } -void TaskHandler::slotDoRemoveTasks(const Item::List &items) +void TaskHandler::doRemoveTasks(const Item::List &items) { // Make sure account is still valid if (!m_resource->canPerformTask()) { return; } QStringList taskIds; taskIds.reserve(items.count()); std::transform(items.cbegin(), items.cend(), std::back_inserter(taskIds), [](const Item &item){ return item.remoteId(); }); /* Now finally we can safely remove the task we wanted to */ // TODO: what if tasks are deleted from different collections? auto job = new TaskDeleteJob(taskIds, items.first().parentCollection().remoteId(), m_settings->accountPtr(), this); job->setProperty(ITEMS_PROPERTY, QVariant::fromValue(items)); connect(job, &TaskDeleteJob::finished, m_resource, &GoogleResource::slotGenericJobFinished); } void TaskHandler::itemsMoved(const Item::List &/*item*/, const Collection &/*collectionSource*/, const Collection &/*collectionDestination*/) { m_resource->cancelTask(i18n("Moving tasks between task lists is not supported")); } void TaskHandler::collectionAdded(const Collection &collection, const Collection &/*parent*/) { Q_EMIT m_resource->status(AgentBase::Running, i18nc("@info:status", "Creating new task list '%1'", collection.displayName())); qCDebug(GOOGLE_TASKS_LOG) << "Adding task list" << collection.displayName(); TaskListPtr taskList(new TaskList()); taskList->setTitle(collection.displayName()); auto job = new TaskListCreateJob(taskList, m_settings->accountPtr(), this); connect(job, &KGAPI2::Job::finished, this, [this, collection](KGAPI2::Job* job){ if (!m_resource->handleError(job)) { return; } TaskListPtr taskList = qobject_cast(job)->items().first().dynamicCast(); qCDebug(GOOGLE_TASKS_LOG) << "Task list created:" << taskList->uid(); // Enable newly added task list in settings m_settings->addTaskList(taskList->uid()); // Populate remoteId & other stuff Collection newCollection(collection); setupCollection(newCollection, taskList); m_resource->changeCommitted(newCollection); m_resource->emitReadyStatus(); }); } void TaskHandler::collectionChanged(const Collection &collection) { Q_EMIT m_resource->status(AgentBase::Running, i18nc("@info:status", "Changing task list '%1'", collection.displayName())); qCDebug(GOOGLE_TASKS_LOG) << "Changing task list" << collection.remoteId(); TaskListPtr taskList(new TaskList()); taskList->setUid(collection.remoteId()); taskList->setTitle(collection.displayName()); auto job = new TaskListModifyJob(taskList, m_settings->accountPtr(), this); job->setProperty(COLLECTION_PROPERTY, QVariant::fromValue(collection)); connect(job, &KGAPI2::Job::finished, m_resource, &GoogleResource::slotGenericJobFinished); } void TaskHandler::collectionRemoved(const Collection &collection) { Q_EMIT m_resource->status(AgentBase::Running, i18nc("@info:status", "Removing task list '%1'", collection.displayName())); qCDebug(GOOGLE_TASKS_LOG) << "Removing task list" << collection.remoteId(); auto job = new TaskListDeleteJob(collection.remoteId(), m_settings->accountPtr(), this); job->setProperty(COLLECTION_PROPERTY, QVariant::fromValue(collection)); connect(job, &KGAPI2::Job::finished, m_resource, &GoogleResource::slotGenericJobFinished); } diff --git a/resources/google-new/taskhandler.h b/resources/google-new/taskhandler.h index fcd34ab81..9a89b6926 100644 --- a/resources/google-new/taskhandler.h +++ b/resources/google-new/taskhandler.h @@ -1,53 +1,53 @@ /* Copyright (C) 2011-2013 Daniel Vrátil 2020 Igor Pobiko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef TASKHANDLER_H #define TASKHANDLER_H #include "generichandler.h" #include class TaskHandler : public GenericHandler { public: using GenericHandler::GenericHandler; QString mimetype() override; bool canPerformTask(const Akonadi::Item &item) override; void retrieveCollections() override; void retrieveItems(const Akonadi::Collection &collection) override; void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) override; void itemChanged(const Akonadi::Item &item, const QSet< QByteArray > &partIdentifiers) override; void itemsRemoved(const Akonadi::Item::List &items) override; void itemsMoved(const Akonadi::Item::List &items, const Akonadi::Collection &collectionSource, const Akonadi::Collection &collectionDestination) override; void collectionAdded(const Akonadi::Collection &collection, const Akonadi::Collection &parent) override; void collectionChanged(const Akonadi::Collection &collection) override; void collectionRemoved(const Akonadi::Collection &collection) override; private Q_SLOTS: void slotCollectionsRetrieved(KGAPI2::Job* job); void slotItemsRetrieved(KGAPI2::Job* job); - void slotDoRemoveTasks(const Akonadi::Item::List &items); private: void setupCollection(Akonadi::Collection &colleciton, const KGAPI2::TaskListPtr &taskList); + void doRemoveTasks(const Akonadi::Item::List &items); }; #endif // TASKHANDLER_H