Home-IoT/craftbeerpi4-pione
1
0
Fork 0
mirror of https://github.com/PiBrewing/craftbeerpi4.git synced 2024-12-22 21:44:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

transfer guiversion to gui

Browse source
This commit is contained in:
avollkopf 2023-01-27 12:26:55 +01:00
parent 366d6cbe91
commit 56ec309dab
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cbpi/__init__.py
View file

@ -1,3 +1,3 @@
__version__ = "4.1.0.rc6" __version__ = "4.1.0.rc7"
__codename__ = "Groundhog Day" __codename__ = "Groundhog Day"

4
cbpi/controller/plugin_controller.py
View file

@ -190,14 +190,14 @@ class PluginController():
return result return result
async def load_plugin_list(self): async def load_plugin_list(self, filter="cbpi"):
result = [] result = []
try: try:
discovered_plugins = { discovered_plugins = {
name: importlib.import_module(name) name: importlib.import_module(name)
for finder, name, ispkg for finder, name, ispkg
in pkgutil.iter_modules() in pkgutil.iter_modules()
if name.startswith('cbpi') and len(name) > 4 if name.startswith(filter) and len(name) > 4
} }
for key, module in discovered_plugins.items(): for key, module in discovered_plugins.items():
from importlib.metadata import version from importlib.metadata import version

7
cbpi/http_endpoints/http_system.py
View file

@ -28,6 +28,12 @@ class SystemHttpEndpoints:
"200": "200":
description: successful operation description: successful operation
""" """
plugin_list = await self.cbpi.plugin.load_plugin_list("cbpi4gui")
try:
version= plugin_list[0].get("Version", "not detected")
except:
version="not detected"
return web.json_response(data=dict( return web.json_response(data=dict(
actor=self.cbpi.actor.get_state(), actor=self.cbpi.actor.get_state(),
fermenter=self.cbpi.fermenter.get_state(), fermenter=self.cbpi.fermenter.get_state(),
@ -37,6 +43,7 @@ class SystemHttpEndpoints:
fermentersteps=self.cbpi.fermenter.get_fermenter_steps(), fermentersteps=self.cbpi.fermenter.get_fermenter_steps(),
config=self.cbpi.config.get_state(), config=self.cbpi.config.get_state(),
version=__version__, version=__version__,
guiversion=version,
codename=__codename__) codename=__codename__)
, dumps=json_dumps) , dumps=json_dumps)