feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Gerrit: Some more cleanup in the parser

Browse Source 
Remove const QStrings for keys. Use string literals instead.

Change-Id: I03c055b4fb53c5cceb5b67c7c9cd8df708130d05
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-02-23 22:17:50 +02:00
committed by Orgad Shaneh
parent 1418d6ab1c
commit bae0f1406e
1 changed files with 26 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/plugins/git/gerrit/gerritmodel.cpp
View File

@@ -538,6 +538,11 @@ static GerritUser parseGerritUser(const QJsonObject &object)
return user; return user;
} }
static int numberValue(const QJsonObject &object)
{
return object.value("number").toString().toInt();
}
/* Parse gerrit query Json output. /* Parse gerrit query Json output.
* See http://gerrit.googlecode.com/svn/documentation/2.1.5/cmd-query.html * See http://gerrit.googlecode.com/svn/documentation/2.1.5/cmd-query.html
* Note: The url will be present only if "canonicalWebUrl" is configured * Note: The url will be present only if "canonicalWebUrl" is configured
@@ -558,71 +563,53 @@ static GerritUser parseGerritUser(const QJsonObject &object)
static GerritChangePtr parseSshOutput(const QJsonObject &object) static GerritChangePtr parseSshOutput(const QJsonObject &object)
{ {
const QString dependsOnKey = "dependsOn";
const QString neededByKey = "neededBy";
const QString branchKey = "branch";
const QString numberKey = "number";
const QString ownerKey = "owner";
const QString statusKey = "status";
const QString projectKey = "project";
const QString titleKey = "subject";
const QString urlKey = "url";
const QString patchSetKey = "currentPatchSet";
const QString refKey = "ref";
const QString approvalsKey = "approvals";
const QString approvalsValueKey = "value";
const QString approvalsByKey = "by";
const QString lastUpdatedKey = "lastUpdated";
const QString approvalsTypeKey = "type";
const QString approvalsDescriptionKey = "description";
GerritChangePtr change(new GerritChange); GerritChangePtr change(new GerritChange);
// Read current patch set. // Read current patch set.
const QJsonObject patchSet = object.value(patchSetKey).toObject(); const QJsonObject patchSet = object.value("currentPatchSet").toObject();
change->currentPatchSet.patchSetNumber = qMax(1, patchSet.value(numberKey).toString().toInt()); change->currentPatchSet.patchSetNumber = qMax(1, numberValue(patchSet));
change->currentPatchSet.ref = patchSet.value(refKey).toString(); change->currentPatchSet.ref = patchSet.value("ref").toString();
const QJsonArray approvalsJ = patchSet.value(approvalsKey).toArray(); const QJsonArray approvalsJ = patchSet.value("approvals").toArray();
const int ac = approvalsJ.size(); const int ac = approvalsJ.size();
for (int a = 0; a < ac; ++a) { for (int a = 0; a < ac; ++a) {
const QJsonObject ao = approvalsJ.at(a).toObject(); const QJsonObject ao = approvalsJ.at(a).toObject();
GerritApproval approval; GerritApproval approval;
approval.reviewer = parseGerritUser(ao.value(approvalsByKey).toObject()); approval.reviewer = parseGerritUser(ao.value("by").toObject());
approval.approval = ao.value(approvalsValueKey).toString().toInt(); approval.approval = ao.value("value").toString().toInt();
approval.type = ao.value(approvalsTypeKey).toString(); approval.type = ao.value("type").toString();
approval.description = ao.value(approvalsDescriptionKey).toString(); approval.description = ao.value("description").toString();
change->currentPatchSet.approvals.push_back(approval); change->currentPatchSet.approvals.push_back(approval);
} }
std::stable_sort(change->currentPatchSet.approvals.begin(), std::stable_sort(change->currentPatchSet.approvals.begin(),
change->currentPatchSet.approvals.end(), change->currentPatchSet.approvals.end(),
gerritApprovalLessThan); gerritApprovalLessThan);
// Remaining // Remaining
change->number = object.value(numberKey).toString().toInt(); change->number = numberValue(object);
change->url = object.value(urlKey).toString(); change->url = object.value("url").toString();
change->title = object.value(titleKey).toString(); change->title = object.value("subject").toString();
change->owner = parseGerritUser(object.value(ownerKey).toObject()); change->owner = parseGerritUser(object.value("owner").toObject());
change->project = object.value(projectKey).toString(); change->project = object.value("project").toString();
change->branch = object.value(branchKey).toString(); change->branch = object.value("branch").toString();
change->status = object.value(statusKey).toString(); change->status = object.value("status").toString();
if (const int timeT = qRound(object.value(lastUpdatedKey).toDouble())) if (const int timeT = object.value("lastUpdated").toInt())
change->lastUpdated = QDateTime::fromTime_t(timeT); change->lastUpdated = QDateTime::fromTime_t(uint(timeT));
// Read out dependencies // Read out dependencies
const QJsonValue dependsOnValue = object.value(dependsOnKey); const QJsonValue dependsOnValue = object.value("dependsOn");
if (dependsOnValue.isArray()) { if (dependsOnValue.isArray()) {
const QJsonArray dependsOnArray = dependsOnValue.toArray(); const QJsonArray dependsOnArray = dependsOnValue.toArray();
if (!dependsOnArray.isEmpty()) { if (!dependsOnArray.isEmpty()) {
const QJsonValue first = dependsOnArray.at(0); const QJsonValue first = dependsOnArray.at(0);
if (first.isObject()) if (first.isObject())
change->dependsOnNumber = first.toObject()[numberKey].toString().toInt(); change->dependsOnNumber = numberValue(first.toObject());
} }
} }
// Read out needed by // Read out needed by
const QJsonValue neededByValue = object.value(neededByKey); const QJsonValue neededByValue = object.value("neededBy");
if (neededByValue.isArray()) { if (neededByValue.isArray()) {
const QJsonArray neededByArray = neededByValue.toArray(); const QJsonArray neededByArray = neededByValue.toArray();
if (!neededByArray.isEmpty()) { if (!neededByArray.isEmpty()) {
const QJsonValue first = neededByArray.at(0); const QJsonValue first = neededByArray.at(0);
if (first.isObject()) if (first.isObject())
change->neededByNumber = first.toObject()[numberKey].toString().toInt(); change->neededByNumber = numberValue(first.toObject());
} }
} }
return change; return change;