Fix mood handling #260
Fix mood handling #260
Conversation
pytradfri/gateway.py
Outdated
|
|
||
| Returns a Command. | ||
| """ | ||
| mood_parent = self._get_mood_parent() | ||
| #mood_parent = self._get_mood_parent() | ||
| #TODO check groupid |
There was a problem hiding this comment.
block comment should start with '# '
pytradfri/gateway.py
Outdated
|
|
||
| Returns a Command. | ||
| """ | ||
| mood_parent = self._get_mood_parent() | ||
| #mood_parent = self._get_mood_parent() |
There was a problem hiding this comment.
block comment should start with '# '
| @@ -73,12 +73,6 @@ | |||
| else: | |||
| print("No groups found!") | |||
| group = None | |||
| moods = api(gateway.get_moods()) | |||
There was a problem hiding this comment.
I'd like to keep this in main. Can we add try/catch instead?
There was a problem hiding this comment.
Do you expect a flattened list of moods or a dict like:
{
"Group1": [ ...]
}
The former would not be very useful without the information for which group the mood is available (since there are no "global" moods)
There was a problem hiding this comment.
I wonder if that's why moods are no longer working, they might have been global when we wrote the code. The purpose of pytradfri is to reflect what data is provided by the gateway without any manipulation. Is the group included in the raw data passed by the gateway?
There was a problem hiding this comment.
Unfortunately it is not ( see tests/moods.py ). Also the raw data of a group only has its current active mood_id.
So we have to use group.moods() to fetch the available moods for the given group
There was a problem hiding this comment.
We should only return what the gateway returns, no logic nor manipulation of the data. That has to be done by the consumer in its implementation of pytradfri. That leaves us at option #1 I guess?
There was a problem hiding this comment.
Done. Also added the parent_id (group id) to the mood's repr
| def mood(): | ||
| return Mood(MOOD, 131080) | ||
|
|
||
| def test_mood_properties(mood): |
| from pytradfri.const import ROOT_MOODS | ||
| from pytradfri.mood import Mood | ||
|
|
||
| @pytest.fixture |
| @@ -48,3 +53,7 @@ def test_setters(): | |||
| ATTR_LIGHT_COLOR_SATURATION: 200, | |||
| ATTR_LIGHT_DIMMER: 100, | |||
| } | |||
|
|
|||
| def test_moods(group): | |||
|
|
||
| @pytest.fixture |
tests/moods.py
Outdated
| '9003': 196625, | ||
| '9057': 2, | ||
| '9068': 1, | ||
| '15013': [{'5850':1,'5851':254,'9003':65547}] |
There was a problem hiding this comment.
missing whitespace after ','
missing whitespace after ':'
| def gateway(): | ||
| return Gateway() | ||
|
|
||
| @pytest.fixture |
| @@ -0,0 +1,9 @@ | |||
| # Retrieved from Gateway running on 1.9.27 | |||
| MOOD = { | |||
| '9001': 'FOCUS', | |||
| @@ -13,4 +13,4 @@ def path(self): | |||
| return [ROOT_MOODS, self._parent, self.id] | |||
|
|
|||
| def __repr__(self): | |||
| return '<Mood {}>'.format(self.name) | |||
| return '<Mood {} {}>'.format(self._parent, self.name) | |||
|
Thank you guys! Do you need this on pypi continue working with your implementations? |
Fixes problems with moods as described in the following issues;
#220
#106