One core concept of CraftBeerPi 4.x is the EventBus. +
One core concept of CraftBeerPi 4.x is the CBPiEventBus. It should be avoided to call method on a controller directly. Events should be fired and listener methods should be used. This makes sure that all components are loosely coupled. New plugins can listen on events and extend or change the functionality easily.
Here an example how to fire an event
diff --git a/docs_src/source/standards.rst b/docs_src/source/standards.rst index 2d0b474..a23c932 100644 --- a/docs_src/source/standards.rst +++ b/docs_src/source/standards.rst @@ -9,10 +9,10 @@ As a main framework CraftBeerPi is based on `aiohttp` * aioHTTP https://aiohttp.readthedocs.io/en/stable/ -EventBus +CBPiEventBus -------- -One core concept of CraftBeerPi 4.x is the EventBus. +One core concept of CraftBeerPi 4.x is the CBPiEventBus. It should be avoided to call method on a controller directly. Events should be fired and listener methods should be used. This makes sure that all components are loosely coupled. New plugins can listen on events and extend or change the functionality easily. diff --git a/main2.py b/main2.py index d64f18f..2330f3f 100644 --- a/main2.py +++ b/main2.py @@ -1,90 +1,7 @@ -import asyncio -import re - -from core.eventbus3 import EventBus -async def waiter(event): - print('waiting for it ...') - await asyncio.sleep(4) - print('... got it!') - event.set() +with open('./config/plugin_list.txt') as f: + required = f.read().splitlines() -async def main(loop): - # Create an Event object. - event = asyncio.Event() - - # Spawn a Task to wait until 'event' is set. - #waiter_task = asyncio.create_task(waiter(event)) - - waiter_task = loop.create_task(waiter(event)) - print("WAIT FOR EVENT") - await event.wait() - - - - # Wait until the waiter task is finished. - await waiter_task - -#loop = asyncio.get_event_loop() -#loop.run_until_complete(main(loop)) -#loop.close() - - -bus = EventBus(None) - -def test(**kwargs): - print("") - print("------------> HALLO WILD CARD") - print("") - print(hex(id(test))) - print("BUS",bus) - - -def test2(**kwargs): - print("------------> HALLO NAME") - - - -class Name(): - - def test(self, **kwargs): - print("---->OK") - bus.unregister(self.test) - print("#################### ID2", hex(id(n.test))) - - -n = Name() -print("the ID", hex(id(n.test))) -id1 = bus.register("test/#", n.test) -print("the ID2", hex(id(n.test))) - -if n.test == n.test: - print("SAME") -id1 = bus.register("test/#", test) -id2 = bus.register("test/name", test2) - -print(id1, id2) - - -from gtts import gTTS - - - -print(hex(id(test2))) - -print(bus.get_callbacks("test/name")) - -bus.fire("test/name") - -bus.fire("test/name") - -bus.unregister(test2) - -bus.fire("test/name") - - -m0 = re.match("kettle_logic_(\d+)", "kettle_1logic_22") -print(m0) -#print(m0.group(1)) + print(required) diff --git a/run.py b/run.py index 4ea12ed..adb7e03 100644 --- a/run.py +++ b/run.py @@ -4,5 +4,4 @@ from core.craftbeerpi import CraftBeerPi cbpi = CraftBeerPi() -cbpi.setup() cbpi.start() \ No newline at end of file diff --git a/sensor_None.log b/sensor_None.log deleted file mode 100644 index e69de29..0000000 diff --git a/tests/test_app.py b/tests/test_app.py index 73a34c8..f346f93 100644 --- a/tests/test_app.py +++ b/tests/test_app.py @@ -1,3 +1,4 @@ +import aiohttp from aiohttp.test_utils import AioHTTPTestCase, unittest_run_loop from core.craftbeerpi import CraftBeerPi @@ -11,14 +12,20 @@ class MyAppTestCase(AioHTTPTestCase): async def get_application(self): self.cbpi = CraftBeerPi() self.cbpi.setup() + + await self.cbpi.init_serivces() return self.cbpi.app @unittest_run_loop async def test_example(self): - resp = await self.client.request("GET", "/actor/1/on") + resp = await self.client.post(path="/login", data={"username": "cbpi", "password": "123"}) + print("resp.status",resp.status) + assert resp.status == 200 + resp = await self.client.request("GET", "/actor/1/on") + print("resp.status", resp.status) assert resp.status == 204 i = await self.cbpi.actor.get_one(1) assert i.instance.state is True