mirror of
https://github.com/acatoire/bipbipzizik.git
synced 2026-03-10 08:01:18 +00:00
WIP
Add player name as parameter
This commit is contained in:
@@ -12,7 +12,7 @@ class BipBip:
|
||||
The generic bipbip class
|
||||
"""
|
||||
|
||||
def __init__(self, parameters: dict, multi_read_timeout: int or float = 3):
|
||||
def __init__(self, parameters: dict, player_name: str, multi_read_timeout: int or float = 3):
|
||||
"""
|
||||
:param parameters: Parameter dict, each BipBip can implement its own parameters
|
||||
Generic parameters are:
|
||||
@@ -27,6 +27,7 @@ class BipBip:
|
||||
"""
|
||||
self.player = None
|
||||
self.parameters = parameters
|
||||
self.player_name = player_name
|
||||
self.multi_read_timeout = multi_read_timeout
|
||||
self._execution_log = []
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ class BipBipSoCo(BipBip):
|
||||
The SoCo bipbip class
|
||||
"""
|
||||
|
||||
def __init__(self, parameters: dict, multi_read_timeout: int or float = 3):
|
||||
def __init__(self, parameters: dict, player_name: str, multi_read_timeout: int or float = 3):
|
||||
"""
|
||||
:param parameters: Parameter dict, each BipBip can implement its own parameters
|
||||
Generic parameters are:
|
||||
@@ -83,12 +83,11 @@ class BipBipSoCo(BipBip):
|
||||
user: allowed user for the card
|
||||
:param multi_read_timeout: (optional) Value to consider a multi read, default 3s
|
||||
"""
|
||||
super().__init__(parameters, multi_read_timeout)
|
||||
super().__init__(parameters, player_name, multi_read_timeout)
|
||||
|
||||
self.soco_mode = SoCoMode(self.mode)
|
||||
|
||||
# TODO: create a sonos singleton
|
||||
player_name = "TV"
|
||||
self.player = soco.discovery.by_name(player_name)
|
||||
|
||||
if self.player:
|
||||
|
||||
@@ -36,7 +36,7 @@ class TestBipBip(TestCase):
|
||||
data='play',
|
||||
)
|
||||
|
||||
bip_bip = BipBipSoCo(param_dict)
|
||||
bip_bip = BipBipSoCo(param_dict, 'TV')
|
||||
|
||||
if not REAL:
|
||||
bip_bip.player.play = MagicMock()
|
||||
|
||||
@@ -53,25 +53,25 @@ class DatabaseReadTest(unittest.TestCase):
|
||||
@return
|
||||
"""
|
||||
|
||||
card_expected = {"app_name": "For test purpose",
|
||||
"app_owner": "axel",
|
||||
"app_id": "template",
|
||||
"sonos_server_ip": "HHH.UUU.GGG.OOO",
|
||||
"sonos_server_port": "2017",
|
||||
"room_name": "Ginette",
|
||||
"multi_read_mode": "none",
|
||||
"card_timeout": "42"}
|
||||
config_expected = {"app_name": "For test purpose",
|
||||
"app_owner": "axel",
|
||||
"app_id": "template",
|
||||
"sonos_server_ip": "HHH.UUU.GGG.OOO",
|
||||
"sonos_server_port": "2017",
|
||||
"room_name": "Ginette",
|
||||
"multi_read_mode": "none",
|
||||
"card_timeout": "42"}
|
||||
|
||||
config = self.database.get_config("template")
|
||||
|
||||
self.assertEqual(config.cfg_app_name, card_expected.get("app_name"))
|
||||
self.assertEqual(config.cfg_app_owner, card_expected.get("app_owner"))
|
||||
self.assertEqual(config.cfg_application_id, card_expected.get("app_id"))
|
||||
self.assertEqual(config.cfg_sonos_server_ip, card_expected.get("sonos_server_ip"))
|
||||
self.assertEqual(config.cfg_sonos_server_port, card_expected.get("sonos_server_port"))
|
||||
self.assertEqual(config.cfg_room_name, card_expected.get("room_name"))
|
||||
self.assertEqual(config.cfg_multi_read_mode, card_expected.get("multi_read_mode"))
|
||||
self.assertEqual(config.cfg_card_timeout, int(card_expected.get("card_timeout")))
|
||||
self.assertEqual(config.cfg_app_name, config_expected.get("app_name"))
|
||||
self.assertEqual(config.cfg_app_owner, config_expected.get("app_owner"))
|
||||
self.assertEqual(config.cfg_application_id, config_expected.get("app_id"))
|
||||
self.assertEqual(config.cfg_sonos_server_ip, config_expected.get("sonos_server_ip"))
|
||||
self.assertEqual(config.cfg_sonos_server_port, config_expected.get("sonos_server_port"))
|
||||
self.assertEqual(config.cfg_room_name, config_expected.get("room_name"))
|
||||
self.assertEqual(config.cfg_multi_read_mode, config_expected.get("multi_read_mode"))
|
||||
self.assertEqual(config.cfg_card_timeout, int(config_expected.get("card_timeout")))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
Reference in New Issue
Block a user