Qt JSON types support #6
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This adds support for Qt’s JSON types as proposed in the comment of PR cutelyst#5. The difficulty in using Qt’s JSON data types was that they can be casted to QVariantList/QVariantHash if they are inside a QVariant and e.g. `QVariant::canConvert<QVariantList>` returns true for a QJsonArray, but the next step by Cutelee is to cast them into QAssociativeIterable or QSequentialIterable. That only works for template based containers. So, my solution is to “intercept“ this types before the QVariant cast is tried and convert them directly into QVariantList or QVariantHash. If the JSON type is direct part of the context, this happens in `Cutelee::Variable::resolve()`, if the JSON type is stored in a context variable’s property or further down the road, the lookup will be done in `Cutelee::MetaType::lookup()`. Unit tests are currently written to test “normal“ usage as variable and to be used in a `{% for %}` loop tag. Maybe we should add some more tests to see if they play nicely with filters and the rest, even though I think that this implementations should make this possible without further changes.
|
Cool thanks, I think it would be best to remove the calls to make it a QVariantList/Hash, this would avoid creating a container each time a propriety is requested, you can use QJsonValue::toVariant() to return the result. |
Make the switch a bit simpler and convert directly to QVariant.
|
I now simplified the switch in Variable::resolve() and use QJsonValue::toVariant() there. For MetaType::lookup() it is imho currently not possible, as I rely on the exact type and would have to convert in the specialized lookup functions anyway. |
dantti
reviewed
May 20, 2020
templates/lib/metatype.cpp
Outdated
| @@ -106,12 +110,89 @@ static QVariant doQobjectLookUp(const QObject *const object, | |||
| return object->property(property.toUtf8().constData()); | |||
| } | |||
|
|
|||
| static QVariant doVariantListLookUp(const QVariantList &list, | |||
There was a problem hiding this comment.
What I meant was here (and on the hash lookup), change the type to a QJsonArray and return the QJsonValue::toVariant() of it
|
great thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds support for Qt’s JSON types (QJsonDocument, QJsonObject, QJsonArray, QJsonValue) as proposed in the comment of PR #5.
The difficulty in using Qt’s JSON data types was that they can be casted to QVariantList/QVariantHash if they are inside a QVariant and e.g.
QVariant::canConvert<QVariantList>returnstruefor a QJsonArray, but the next step by Cutelee is to cast them into QAssociativeIterable or QSequentialIterable. That only works for template based containers and ends with a segfault for the JSON types.So, my solution is to “intercept“ this types before the QVariant cast is tried and convert them directly into QVariantList or QVariantHash. If the JSON type is direct part of the context, this happens in
Cutelee::Variable::resolve(), if the JSON type is stored in a context variable’s property or further down the road, the lookup will be done inCutelee::MetaType::lookup().Unit tests are currently written to test “normal“ usage as variable and to be used in a
{% for %}loop tag. Maybe we should add some more tests to see if they play nicely with filters and the rest, even though I think that this implementations should make this possible without further changes.