self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

Recreating item list

Browse Source
This commit is contained in:
Laurent Cozic
2017-02-06 20:20:30 +00:00
parent a4116a4bf8
commit ab3bb28036
27 changed files with 445 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
QtClient/JoplinQtClient/synchronizer.cpp
View File

@ -122,38 +122,40 @@ void Synchronizer::switchState(Synchronizer::SynchronizationState state) {
uploadsRemaining_ = changes.size();
foreach (Change change, changes) {
jop::Table itemType = (jop::Table)change.value("item_type").toInt();
QString itemId = change.value("item_id").toString();
Change::Type type = (Change::Type)change.value("type").toInt();
qWarning() << "TODO: fix change iteration";
if (itemType == jop::FoldersTable) {
// foreach (Change change, changes) {
// jop::Table itemType = (jop::Table)change.value("item_type").toInt();
// QString itemId = change.value("item_id").toString();
// Change::Type type = (Change::Type)change.value("type").toInt();
if (type == Change::Create) {
// if (itemType == jop::FoldersTable) {
Folder folder;
folder.load(itemId);
QUrlQuery data = valuesToUrlQuery(folder.values());
api_.put("folders/" + folder.id().toString(), QUrlQuery(), data, "upload:putFolder:" + folder.id().toString());
// if (type == Change::Create) {
} else if (type == Change::Update) {
// Folder folder;
// folder.load(itemId);
// QUrlQuery data = valuesToUrlQuery(folder.values());
// api_.put("folders/" + folder.id().toString(), QUrlQuery(), data, "upload:putFolder:" + folder.id().toString());
Folder folder;
folder.load(itemId);
QStringList mergedFields = change.mergedFields();
QUrlQuery data;
foreach (QString field, mergedFields) {
data.addQueryItem(field, folder.value(field).toString());
}
api_.patch("folders/" + folder.id().toString(), QUrlQuery(), data, "upload:patchFolder:" + folder.id().toString());
// } else if (type == Change::Update) {
} else if (type == Change::Delete) {
// Folder folder;
// folder.load(itemId);
// QStringList mergedFields = change.mergedFields();
// QUrlQuery data;
// foreach (QString field, mergedFields) {
// data.addQueryItem(field, folder.value(field).toString());
// }
// api_.patch("folders/" + folder.id().toString(), QUrlQuery(), data, "upload:patchFolder:" + folder.id().toString());
api_.del("folders/" + itemId, QUrlQuery(), QUrlQuery(), "upload:deleteFolder:" + itemId);
// } else if (type == Change::Delete) {
}
}
}
// api_.del("folders/" + itemId, QUrlQuery(), QUrlQuery(), "upload:deleteFolder:" + itemId);
// }
// }
// }
checkNextState();