Home-IoT/craftbeerpi4-pione
1
0
Fork 0
mirror of https://github.com/PiBrewing/craftbeerpi4.git synced 2024-11-09 17:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

config added

Browse source
This commit is contained in:
Manuel83 2018-11-01 21:27:37 +01:00
parent 83696fb556
commit 80caa4ee9c
19 changed files with 206 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

250
.idea/workspace.xml
View file

@ -2,35 +2,15 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment=""> <list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/config/config.yaml" /> <change type="DELETED" beforePath="$PROJECT_DIR$/core/helper/__init__.py" afterPath="" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/api/extension.py" /> <change type="DELETED" beforePath="$PROJECT_DIR$/core/helper/jsondump.py" afterPath="" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/extension/dummy/config.yaml" /> <change type="DELETED" beforePath="$PROJECT_DIR$/core/helper/utils.py" afterPath="" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/helper/utils.py" /> <change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_21-20" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_17-21" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_17-23" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_17-24" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_17-27" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_17-32" afterPath="" />
<change type="MOVED" beforePath="$PROJECT_DIR$/core/cbpi.py" afterPath="$PROJECT_DIR$/core/craftbeerpi.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/craftbeerpi.db" afterPath="$PROJECT_DIR$/craftbeerpi.db" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/api/actor.py" afterPath="$PROJECT_DIR$/core/api/actor.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/api/actor.py" afterPath="$PROJECT_DIR$/core/api/actor.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/api/sensor.py" afterPath="$PROJECT_DIR$/core/api/sensor.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/api/extension.py" afterPath="$PROJECT_DIR$/core/api/extension.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/controller/actor_controller.py" afterPath="$PROJECT_DIR$/core/controller/actor_controller.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/controller/crud_controller.py" afterPath="$PROJECT_DIR$/core/controller/crud_controller.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/controller/sensor_controller.py" afterPath="$PROJECT_DIR$/core/controller/sensor_controller.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/controller/system_controller.py" afterPath="$PROJECT_DIR$/core/controller/system_controller.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/database/model.py" afterPath="$PROJECT_DIR$/core/database/model.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/database/orm_framework.py" afterPath="$PROJECT_DIR$/core/database/orm_framework.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/extension/dummy/__init__.py" afterPath="$PROJECT_DIR$/core/extension/dummy/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/http_endpoints/http_api.py" afterPath="$PROJECT_DIR$/core/http_endpoints/http_api.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/http_endpoints/http_api.py" afterPath="$PROJECT_DIR$/core/http_endpoints/http_api.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/http_endpoints/http_login.py" afterPath="$PROJECT_DIR$/core/http_endpoints/http_login.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/http_endpoints/http_login.py" afterPath="$PROJECT_DIR$/core/http_endpoints/http_login.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/mqtt/mqtt.py" afterPath="$PROJECT_DIR$/core/mqtt/mqtt.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/plugin.py" afterPath="$PROJECT_DIR$/core/plugin.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/websocket.py" afterPath="$PROJECT_DIR$/core/websocket.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/logs/first_logfile2.log" afterPath="$PROJECT_DIR$/logs/first_logfile2.log" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/logs/first_logfile2.log" afterPath="$PROJECT_DIR$/logs/first_logfile2.log" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/run.py" afterPath="$PROJECT_DIR$/run.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/test_app.py" afterPath="$PROJECT_DIR$/tests/test_app.py" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
@ -40,7 +20,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="CoverageDataManager"> <component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1541103448346" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1541104020023" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component> </component>
<component name="DatabaseView"> <component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" /> <option name="SHOW_INTERMEDIATE" value="true" />
@ -90,31 +70,33 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="config.yaml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/config.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="12" lean-forward="false" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="utils.py" pinned="false" current-in-tab="false"> <file leaf-file-name="utils.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core/helper/utils.py"> <entry file="file://$PROJECT_DIR$/core/utils/utils.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105"> <state relative-caret-position="225">
<caret line="7" column="15" lean-forward="true" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" /> <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding /> <folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="true"> <file leaf-file-name="__init__.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/core/utils/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core/extension/dummy/__init__.py"> <entry file="file://$PROJECT_DIR$/core/extension/dummy/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="70">
<caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" /> <caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#42#0" expanded="true" /> <element signature="e#0#42#0" expanded="true" />
</folding> </folding>
@ -122,6 +104,16 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="http_api.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core/http_endpoints/http_api.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="actor.py" pinned="false" current-in-tab="false"> <file leaf-file-name="actor.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core/api/actor.py"> <entry file="file://$PROJECT_DIR$/core/api/actor.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -137,8 +129,8 @@
<file leaf-file-name="extension.py" pinned="false" current-in-tab="false"> <file leaf-file-name="extension.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core/api/extension.py"> <entry file="file://$PROJECT_DIR$/core/api/extension.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="210">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="14" column="32" lean-forward="true" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<folding> <folding>
<element signature="e#0#14#0" expanded="true" /> <element signature="e#0#14#0" expanded="true" />
</folding> </folding>
@ -150,7 +142,7 @@
<entry file="file://$PROJECT_DIR$/core/api/sensor.py"> <entry file="file://$PROJECT_DIR$/core/api/sensor.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="195">
<caret line="13" column="12" lean-forward="true" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> <caret line="13" column="12" lean-forward="false" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -166,18 +158,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="actor_controller.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core/controller/actor_controller.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="33" column="27" lean-forward="false" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
<folding>
<element signature="e#0#23#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="craftbeerpi.py" pinned="false" current-in-tab="false"> <file leaf-file-name="craftbeerpi.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core/craftbeerpi.py"> <entry file="file://$PROJECT_DIR$/core/craftbeerpi.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -256,20 +236,21 @@
<option value="$PROJECT_DIR$/core/controller/crud_controller.py" /> <option value="$PROJECT_DIR$/core/controller/crud_controller.py" />
<option value="$PROJECT_DIR$/core/controller/actor_controller.py" /> <option value="$PROJECT_DIR$/core/controller/actor_controller.py" />
<option value="$PROJECT_DIR$/core/controller/system_controller.py" /> <option value="$PROJECT_DIR$/core/controller/system_controller.py" />
<option value="$PROJECT_DIR$/core/http_endpoints/http_api.py" />
<option value="$PROJECT_DIR$/core/mqtt/mqtt.py" /> <option value="$PROJECT_DIR$/core/mqtt/mqtt.py" />
<option value="$PROJECT_DIR$/core/plugin.py" /> <option value="$PROJECT_DIR$/core/plugin.py" />
<option value="$PROJECT_DIR$/core/websocket.py" /> <option value="$PROJECT_DIR$/core/websocket.py" />
<option value="$PROJECT_DIR$/core/database/orm_framework.py" /> <option value="$PROJECT_DIR$/core/database/orm_framework.py" />
<option value="$PROJECT_DIR$/core/helper/utils.py" />
<option value="$PROJECT_DIR$/core/http_endpoints/http_login.py" /> <option value="$PROJECT_DIR$/core/http_endpoints/http_login.py" />
<option value="$PROJECT_DIR$/config/config.yaml" /> <option value="$PROJECT_DIR$/config/config.yaml" />
<option value="$PROJECT_DIR$/core/extension/dummy/config.yaml" /> <option value="$PROJECT_DIR$/core/extension/dummy/config.yaml" />
<option value="$PROJECT_DIR$/core/extension/dummy/__init__.py" /> <option value="$PROJECT_DIR$/core/extension/dummy/__init__.py" />
<option value="$PROJECT_DIR$/core/api/extension.py" />
<option value="$PROJECT_DIR$/core/api/actor.py" /> <option value="$PROJECT_DIR$/core/api/actor.py" />
<option value="$PROJECT_DIR$/core/api/cbpiactor.py" /> <option value="$PROJECT_DIR$/core/api/cbpiactor.py" />
<option value="$PROJECT_DIR$/core/api/sensor.py" /> <option value="$PROJECT_DIR$/core/api/sensor.py" />
<option value="$PROJECT_DIR$/core/helper/jsondump.py" />
<option value="$PROJECT_DIR$/core/helper/utils.py" />
<option value="$PROJECT_DIR$/core/http_endpoints/http_api.py" />
<option value="$PROJECT_DIR$/core/api/extension.py" />
</list> </list>
</option> </option>
</component> </component>
@ -378,29 +359,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="extension" /> <option name="myItemId" value="utils" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="craftbeerpi4" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="craftbeerpi4" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="extension" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="dummy" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
@ -422,6 +381,32 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="craftbeerpi4" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="craftbeerpi4" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="api" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="extension.py" />
<option name="myItemType" value="com.jetbrains.python.projectView.PyFileNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="CBPiExtension" />
<option name="myItemType" value="com.jetbrains.python.projectView.PyElementNode" />
</PATH_ELEMENT>
</PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="craftbeerpi4" /> <option name="myItemId" value="craftbeerpi4" />
@ -647,7 +632,6 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="55" y="40" width="1767" height="968" extended-state="0" /> <frame x="55" y="40" width="1767" height="968" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
@ -655,7 +639,7 @@
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24957556" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24957556" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21335597" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21335597" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24957556" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24957556" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@ -797,34 +781,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/core/helper/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/helper/jsondump.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/http_endpoints/http_api.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="23" lean-forward="false" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
<folding>
<element signature="e#0#14#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/mqtt/mqtt.py"> <entry file="file://$PROJECT_DIR$/core/mqtt/mqtt.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540"> <state relative-caret-position="540">
@ -900,14 +856,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/core/helper/utils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="15" lean-forward="true" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/http_endpoints/http_login.py"> <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_login.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375"> <state relative-caret-position="375">
@ -946,33 +894,67 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/core/api/extension.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#14#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/api/sensor.py"> <entry file="file://$PROJECT_DIR$/core/api/sensor.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="195">
<caret line="13" column="12" lean-forward="true" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> <caret line="13" column="12" lean-forward="false" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/core/extension/dummy/__init__.py"> <entry file="file://$PROJECT_DIR$/core/extension/dummy/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="70">
<caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" /> <caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#42#0" expanded="true" /> <element signature="e#0#42#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/core/http_endpoints/http_api.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/api/extension.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="32" lean-forward="true" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<folding>
<element signature="e#0#14#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/helper/jsondump.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/utils/utils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/utils/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

BIN
core/api/__pycache__/actor.cpython-36.pyc Normal file
View file

Binary file not shown.

BIN
core/api/__pycache__/extension.cpython-36.pyc Normal file
View file

Binary file not shown.

2
core/api/actor.py
View file

@ -2,7 +2,7 @@
import logging import logging
from core.api.extension import CBPiExtension from core.api.extension import CBPiExtension
from core.helper.utils import load_config as load from core.utils.utils import load_config as load
logger = logging.getLogger(__file__) logger = logging.getLogger(__file__)
class CBPiActor(CBPiExtension): class CBPiActor(CBPiExtension):

5
core/api/extension.py
View file

@ -1,6 +1,9 @@
import logging import logging
import os
from core.helper.utils import load_config as load import sys
from core.utils.utils import load_config as load
logger = logging.getLogger(__file__) logger = logging.getLogger(__file__)
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)

BIN
core/extension/dummy/__pycache__/__init__.cpython-36.pyc
View file

Binary file not shown.

BIN
core/helper/__pycache__/jsondump.cpython-36.pyc
View file

Binary file not shown.

BIN
core/helper/__pycache__/utils.cpython-36.pyc
View file

Binary file not shown.

8
core/helper/utils.py
View file

@ -1,8 +0,0 @@
import yaml
def load_config(fname):
with open(fname, 'rt') as f:
data = yaml.load(f)
# TODO: add config validation
return data

BIN
core/http_endpoints/__pycache__/http_api.cpython-36.pyc
View file

Binary file not shown.

2
core/http_endpoints/http_api.py
View file

@ -3,7 +3,7 @@ from aiohttp import web
from aiojobs.aiohttp import get_scheduler_from_app from aiojobs.aiohttp import get_scheduler_from_app
from core.api.decorator import request_mapping from core.api.decorator import request_mapping
from core.helper.jsondump import json_dumps from core.utils.utils import json_dumps
class HttpAPI(): class HttpAPI():

2
core/http_endpoints/http_login.py
View file

@ -4,7 +4,7 @@ from aiohttp import web
from aiohttp_auth import auth from aiohttp_auth import auth
from core.api.decorator import request_mapping from core.api.decorator import request_mapping
from core.helper.utils import load_config from core.utils.utils import load_config
class Login(): class Login():

0
core/helper/__init__.py → core/utils/__init__.py
View file

0
core/helper/__pycache__/__init__.cpython-36.pyc → core/utils/__pycache__/__init__.cpython-36.pyc
View file

BIN
core/utils/__pycache__/utils.cpython-36.pyc Normal file
View file

Binary file not shown.

10
core/helper/jsondump.py → core/utils/utils.py
View file

@ -1,9 +1,18 @@
import json import json
from json import JSONEncoder from json import JSONEncoder
import yaml
from core.database.model import DBModel, ActorModel from core.database.model import DBModel, ActorModel
def load_config(fname):
with open(fname, 'rt') as f:
data = yaml.load(f)
# TODO: add config validation
return data
class ComplexEncoder(JSONEncoder): class ComplexEncoder(JSONEncoder):
def default(self, obj): def default(self, obj):
@ -22,5 +31,6 @@ class ComplexEncoder(JSONEncoder):
pass pass
return None return None
def json_dumps(obj): def json_dumps(obj):
return json.dumps(obj, cls=ComplexEncoder) return json.dumps(obj, cls=ComplexEncoder)

27
logs/first_logfile2.log
View file

@ -1,15 +1,12 @@
2018-11-01 21:25:19,670,1,WOOHO 2018-11-01 21:26:19,915,1,WOOHO
2018-11-01 21:25:20,673,1,WOOHO 2018-11-01 21:26:20,922,1,WOOHO
2018-11-01 21:25:21,677,1,WOOHO 2018-11-01 21:26:21,928,1,WOOHO
2018-11-01 21:25:22,682,1,WOOHO 2018-11-01 21:26:22,933,1,WOOHO
2018-11-01 21:25:23,686,1,WOOHO 2018-11-01 21:26:23,938,1,WOOHO
2018-11-01 21:25:24,690,1,WOOHO 2018-11-01 21:26:24,944,1,WOOHO
2018-11-01 21:25:25,693,1,WOOHO 2018-11-01 21:26:25,946,1,WOOHO
2018-11-01 21:25:26,698,1,WOOHO 2018-11-01 21:26:26,950,1,WOOHO
2018-11-01 21:25:27,702,1,WOOHO 2018-11-01 21:26:27,954,1,WOOHO
2018-11-01 21:25:28,707,1,WOOHO 2018-11-01 21:26:28,958,1,WOOHO
2018-11-01 21:25:29,710,1,WOOHO 2018-11-01 21:26:29,962,1,WOOHO
2018-11-01 21:25:30,713,1,WOOHO 2018-11-01 21:26:30,966,1,WOOHO
2018-11-01 21:25:31,715,1,WOOHO
2018-11-01 21:25:32,719,1,WOOHO
2018-11-01 21:25:33,723,1,WOOHO

60
logs/first_logfile2.log.2018-11-01_21-20
View file

@ -1,60 +0,0 @@
2018-11-01 21:20:19,492,1,WOOHO
2018-11-01 21:20:20,498,1,WOOHO
2018-11-01 21:20:21,501,1,WOOHO
2018-11-01 21:20:22,505,1,WOOHO
2018-11-01 21:20:23,507,1,WOOHO
2018-11-01 21:20:24,511,1,WOOHO
2018-11-01 21:20:25,512,1,WOOHO
2018-11-01 21:20:26,514,1,WOOHO
2018-11-01 21:20:27,516,1,WOOHO
2018-11-01 21:20:28,521,1,WOOHO
2018-11-01 21:20:29,526,1,WOOHO
2018-11-01 21:20:30,530,1,WOOHO
2018-11-01 21:20:31,533,1,WOOHO
2018-11-01 21:20:32,534,1,WOOHO
2018-11-01 21:20:33,539,1,WOOHO
2018-11-01 21:20:34,542,1,WOOHO
2018-11-01 21:20:35,547,1,WOOHO
2018-11-01 21:20:36,548,1,WOOHO
2018-11-01 21:20:37,553,1,WOOHO
2018-11-01 21:20:38,556,1,WOOHO
2018-11-01 21:20:39,563,1,WOOHO
2018-11-01 21:20:40,568,1,WOOHO
2018-11-01 21:20:41,572,1,WOOHO
2018-11-01 21:20:42,574,1,WOOHO
2018-11-01 21:20:43,576,1,WOOHO
2018-11-01 21:20:44,581,1,WOOHO
2018-11-01 21:20:45,585,1,WOOHO
2018-11-01 21:20:46,588,1,WOOHO
2018-11-01 21:20:47,593,1,WOOHO
2018-11-01 21:20:48,599,1,WOOHO
2018-11-01 21:20:49,602,1,WOOHO
2018-11-01 21:20:50,603,1,WOOHO
2018-11-01 21:20:51,604,1,WOOHO
2018-11-01 21:20:52,608,1,WOOHO
2018-11-01 21:20:53,612,1,WOOHO
2018-11-01 21:20:54,616,1,WOOHO
2018-11-01 21:20:55,621,1,WOOHO
2018-11-01 21:20:56,625,1,WOOHO
2018-11-01 21:20:57,626,1,WOOHO
2018-11-01 21:20:58,631,1,WOOHO
2018-11-01 21:20:59,635,1,WOOHO
2018-11-01 21:21:00,637,1,WOOHO
2018-11-01 21:21:01,639,1,WOOHO
2018-11-01 21:21:02,643,1,WOOHO
2018-11-01 21:21:03,648,1,WOOHO
2018-11-01 21:21:04,653,1,WOOHO
2018-11-01 21:21:05,657,1,WOOHO
2018-11-01 21:21:06,662,1,WOOHO
2018-11-01 21:21:07,666,1,WOOHO
2018-11-01 21:21:08,671,1,WOOHO
2018-11-01 21:21:09,676,1,WOOHO
2018-11-01 21:21:10,682,1,WOOHO
2018-11-01 21:21:11,684,1,WOOHO
2018-11-01 21:21:12,685,1,WOOHO
2018-11-01 21:21:13,690,1,WOOHO
2018-11-01 21:21:14,695,1,WOOHO
2018-11-01 21:21:15,700,1,WOOHO
2018-11-01 21:21:16,702,1,WOOHO
2018-11-01 21:21:17,707,1,WOOHO
2018-11-01 21:21:18,712,1,WOOHO

60
logs/first_logfile2.log.2018-11-01_21-25 Normal file
View file

@ -0,0 +1,60 @@
2018-11-01 21:25:19,670,1,WOOHO
2018-11-01 21:25:20,673,1,WOOHO
2018-11-01 21:25:21,677,1,WOOHO
2018-11-01 21:25:22,682,1,WOOHO
2018-11-01 21:25:23,686,1,WOOHO
2018-11-01 21:25:24,690,1,WOOHO
2018-11-01 21:25:25,693,1,WOOHO
2018-11-01 21:25:26,698,1,WOOHO
2018-11-01 21:25:27,702,1,WOOHO
2018-11-01 21:25:28,707,1,WOOHO
2018-11-01 21:25:29,710,1,WOOHO
2018-11-01 21:25:30,713,1,WOOHO
2018-11-01 21:25:31,715,1,WOOHO
2018-11-01 21:25:32,719,1,WOOHO
2018-11-01 21:25:33,723,1,WOOHO
2018-11-01 21:25:34,725,1,WOOHO
2018-11-01 21:25:35,729,1,WOOHO
2018-11-01 21:25:36,733,1,WOOHO
2018-11-01 21:25:37,737,1,WOOHO
2018-11-01 21:25:38,742,1,WOOHO
2018-11-01 21:25:39,750,1,WOOHO
2018-11-01 21:25:40,756,1,WOOHO
2018-11-01 21:25:41,759,1,WOOHO
2018-11-01 21:25:42,764,1,WOOHO
2018-11-01 21:25:43,767,1,WOOHO
2018-11-01 21:25:44,773,1,WOOHO
2018-11-01 21:25:45,775,1,WOOHO
2018-11-01 21:25:46,780,1,WOOHO
2018-11-01 21:25:47,786,1,WOOHO
2018-11-01 21:25:48,788,1,WOOHO
2018-11-01 21:25:49,792,1,WOOHO
2018-11-01 21:25:50,796,1,WOOHO
2018-11-01 21:25:51,802,1,WOOHO
2018-11-01 21:25:52,805,1,WOOHO
2018-11-01 21:25:53,809,1,WOOHO
2018-11-01 21:25:54,811,1,WOOHO
2018-11-01 21:25:55,816,1,WOOHO
2018-11-01 21:25:56,818,1,WOOHO
2018-11-01 21:25:57,823,1,WOOHO
2018-11-01 21:25:58,827,1,WOOHO
2018-11-01 21:25:59,831,1,WOOHO
2018-11-01 21:26:00,835,1,WOOHO
2018-11-01 21:26:01,840,1,WOOHO
2018-11-01 21:26:02,843,1,WOOHO
2018-11-01 21:26:03,846,1,WOOHO
2018-11-01 21:26:04,852,1,WOOHO
2018-11-01 21:26:05,856,1,WOOHO
2018-11-01 21:26:06,860,1,WOOHO
2018-11-01 21:26:07,865,1,WOOHO
2018-11-01 21:26:08,870,1,WOOHO
2018-11-01 21:26:09,878,1,WOOHO
2018-11-01 21:26:10,883,1,WOOHO
2018-11-01 21:26:11,885,1,WOOHO
2018-11-01 21:26:12,889,1,WOOHO
2018-11-01 21:26:13,891,1,WOOHO
2018-11-01 21:26:14,892,1,WOOHO
2018-11-01 21:26:15,898,1,WOOHO
2018-11-01 21:26:16,903,1,WOOHO
2018-11-01 21:26:17,908,1,WOOHO
2018-11-01 21:26:18,911,1,WOOHO