Add missing getters/setters for most of the properties in AS::Component #117
Conversation
| /** | ||
| * \returns the internally stored AsBundle | ||
| */ | ||
| _AsBundle *asBundle() const; |
There was a problem hiding this comment.
Are these really necessary? I would argue that this is only needed in case the Qt/C++ interface is incomplete and someone therefore wants to use the C library directly. In that case, we should rather fix the Qt binding to include the missing stuff, and not give library users the means to hack around it and not report the issue.
There was a problem hiding this comment.
I use these internally, i.e. in as_component_add_icon() or as_component_add_screenshot() and so on, because those methods takes AsIcon or AsScreenshot only.
There was a problem hiding this comment.
Then we should make the symbols internal and hide them from the public API... The tricky bit is that they're class members...
(I will take a look on whether it's possible to even have them as internal members, probably the only way to do that is to make them private and use friend classes for access. - in any case, just leave this as it is for now :-) )
|
Looks good on a first quick look at it, except for the obvious CI failure (which hints at an actual bug ^^). Thank you for working on this, this is great help! |
qt/component.h
Outdated
| bool insertCustomValue(const QString& key, const QString& value); | ||
|
|
||
| /** | ||
| * TODO contentRating, launchable and languages |
There was a problem hiding this comment.
Adding launchable to the Qt interface is actually a must-be-present feature for the next release, as that's a key new feature and using desktopId is deprecated in favor of it.
There was a problem hiding this comment.
Ok, I will add them later on. I'm now working on AS::Metadata class needed for parsing.
There was a problem hiding this comment.
OK, awesome! I was going to do this when I'm done with the parser refactoring, but it looks like that will still tle.
There was a problem hiding this comment.
I've implemented above mentioned missing getters/setters including new classes needed for that.
There was a problem hiding this comment.
Nice! Now, fixing the CI failure would be useful, otherwise a lot of code won't work ^^
There was a problem hiding this comment.
Fixed, sorry, I haven't seen the error before. I saw CI failure at the beginning but there was a different problem (something with downloading or so) and I ignored it since then.
qt/component.cpp
Outdated
|
|
||
| QStringList AppStream::Component::searchTokens() const | ||
| { | ||
| valueWrap(as_component_get_search_tokens(m_cpt)); |
There was a problem hiding this comment.
The CI complains about a missing return statement here...
And I was also surprised that this thing is public API, but looking at AsComponent it indeed is...
There was a problem hiding this comment.
Fixed that one too, I wonder why I don't get a compilation error here while CI obviously reports that.
There was a problem hiding this comment.
Configure AppStream with -DMAINTAINER=ON, that will enable (almost) all compile-time maintainer checks.
There was a problem hiding this comment.
Probably useful to do that locally, as the CI still isn't happy :P
There was a problem hiding this comment.
CI is now happy, want me to squeeze all these commit into one or later on once you are happy about that?
|
Looks good to me! Can you maybe fold in the two return-fix commits, and prefix the changes with "qt"? I am not really happy about exposing the raw GObjects in the Qt bindings in a public interface, but we can find a solution for that after merge, if there is one. |
qt/contentrating.cpp
Outdated
|
|
||
| AppStream::ContentRating::RatingValue AppStream::ContentRating::stringToRatingValue(const QString& ratingValue) | ||
| { | ||
| if (ratingValue == QLatin1String("none")) { |
There was a problem hiding this comment.
Fixed to use hash even here.
| AsContentRating* m_contentRating; | ||
| }; | ||
|
|
||
| typedef QHash<ContentRating::RatingValue, QString> RatingMap; |
There was a problem hiding this comment.
A vector should be enough?
There was a problem hiding this comment.
Not sure if this would make any difference, QHash is used accross appstream same way so I used it here as well.
There was a problem hiding this comment.
What's the overhead of a QHash? Would using a vector be much better? If not, keeping the QHash is fine, I guess.
| #include "appstream.h" | ||
| #include "launchable.h" | ||
|
|
||
| #include <QDebug> |
There was a problem hiding this comment.
include possibly not needed?
There was a problem hiding this comment.
Taking back, it's needed.
Also implement missing classes like AS::Launchable, AS:Translation or AS:ContentRating.
|
Okay, merged - it's one massive commit now, maybe breaking this down would have been nicer, but well, too late... Thank you for your patch! |
Note: only two of them should be missing (launchables and languages), because
we don't have wrappers for them yet