Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small entity fixes #100

Merged
merged 2 commits into from
Mar 2, 2024
Merged

Small entity fixes #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccaff99
Use GetFromConfigurations
infeeeee Mar 2, 2024
05f4dff
Fix UpTime entity
infeeeee Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IoTuring/Entity/Deployments/FileSwitch/FileSwitch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class FileSwitch(Entity):
def Initialize(self):

try:
self.config_path = self.GetConfigurations()[CONFIG_KEY_PATH]
self.config_path = self.GetFromConfigurations(CONFIG_KEY_PATH)
except Exception as e:
raise Exception("Configuration error: " + str(e))

Expand Down
8 changes: 4 additions & 4 deletions IoTuring/Entity/Deployments/Notify/Notify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ class Notify(Entity):
def Initialize(self):

# Check if both config is defined or both is empty:
if not bool(self.GetConfigurations()[CONFIG_KEY_TITLE]) == bool(self.GetConfigurations()[CONFIG_KEY_MESSAGE]):
if not bool(self.GetFromConfigurations(CONFIG_KEY_TITLE)) == bool(self.GetFromConfigurations(CONFIG_KEY_MESSAGE)):
raise Exception(
"Configuration error: Both title and message should be defined, or both should be empty!")

try:
self.config_title = self.GetConfigurations()[CONFIG_KEY_TITLE]
self.config_message = self.GetConfigurations()[CONFIG_KEY_MESSAGE]
self.config_title = self.GetFromConfigurations(CONFIG_KEY_TITLE)
self.config_message = self.GetFromConfigurations(CONFIG_KEY_MESSAGE)
self.data_mode = MODE_DATA_VIA_CONFIG
except Exception as e:
self.data_mode = MODE_DATA_VIA_PAYLOAD
Expand All @@ -67,7 +67,7 @@ def Initialize(self):
self.Log(self.LOG_INFO, "Using data from payload")

# Set and check icon path:
self.config_icon_path = self.GetConfigurations()[CONFIG_KEY_ICON_PATH]
self.config_icon_path = self.GetFromConfigurations(CONFIG_KEY_ICON_PATH)

if not os.path.exists(self.config_icon_path):
self.Log(
Expand Down
40 changes: 20 additions & 20 deletions IoTuring/Entity/Deployments/Terminal/Terminal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ class Terminal(Entity):

def Initialize(self):

self.config_entity_type = self.GetConfigurations()[
CONFIG_KEY_ENTITY_TYPE]
self.config_entity_type = self.GetFromConfigurations(
CONFIG_KEY_ENTITY_TYPE)

# sanitize entity type:
self.entity_type = str(
Expand All @@ -86,16 +86,16 @@ def Initialize(self):
# payload_command
if self.entity_type == ENTITY_TYPE_KEYS["PAYLOAD_COMMAND"]:
self.config_command_regex = \
self.GetConfigurations()[CONFIG_KEY_COMMAND_REGEX]
self.GetFromConfigurations(CONFIG_KEY_COMMAND_REGEX)
# Check if it's a correct regex:
if not re.search(r"^\^.*\$$", self.config_command_regex):
raise Exception(
f"Configuration error: Invalid regex: {self.config_command_regex}")

# Get max length:
if self.GetConfigurations()[CONFIG_KEY_LENGTH]:
if self.GetFromConfigurations(CONFIG_KEY_LENGTH):
self.config_length = int(
self.GetConfigurations()[CONFIG_KEY_LENGTH])
self.GetFromConfigurations(CONFIG_KEY_LENGTH))
else:
# Fall back to infinite:
self.config_length = float("inf")
Expand All @@ -104,52 +104,52 @@ def Initialize(self):

# button
elif self.entity_type == ENTITY_TYPE_KEYS["BUTTON"]:
self.config_command = self.GetConfigurations()[
CONFIG_KEY_COMMAND_ON]
self.config_command = self.GetFromConfigurations(
CONFIG_KEY_COMMAND_ON)
self.has_command = True

# switch
elif self.entity_type == ENTITY_TYPE_KEYS["SWITCH"]:
self.config_command_on = \
self.GetConfigurations()[CONFIG_KEY_COMMAND_ON]
self.GetFromConfigurations(CONFIG_KEY_COMMAND_ON)
self.config_command_off = \
self.GetConfigurations()[CONFIG_KEY_COMMAND_OFF]
self.GetFromConfigurations(CONFIG_KEY_COMMAND_OFF)
self.has_command = True

if self.GetConfigurations()[CONFIG_KEY_COMMAND_STATE]:
if self.GetFromConfigurations(CONFIG_KEY_COMMAND_STATE):
self.config_command_state = \
self.GetConfigurations()[CONFIG_KEY_COMMAND_STATE]
self.GetFromConfigurations(CONFIG_KEY_COMMAND_STATE)
self.has_binary_state = True

# sensor
elif self.entity_type == ENTITY_TYPE_KEYS["SENSOR"]:
self.config_command_state = \
self.GetConfigurations()[CONFIG_KEY_COMMAND_STATE]
self.GetFromConfigurations(CONFIG_KEY_COMMAND_STATE)
self.has_state = True

self.config_unit = self.GetConfigurations()[CONFIG_KEY_UNIT]
self.config_unit = self.GetFromConfigurations(CONFIG_KEY_UNIT)
if self.config_unit:
self.custom_payload["unit_of_measurement"] = self.config_unit

if self.GetConfigurations()[CONFIG_KEY_DECIMALS]:
if self.GetFromConfigurations(CONFIG_KEY_DECIMALS):
self.value_formatter_options = \
ValueFormatterOptions(value_type=ValueFormatterOptions.TYPE_NONE,
decimals=int(self.GetConfigurations()[CONFIG_KEY_DECIMALS]))
decimals=int(self.GetFromConfigurations(CONFIG_KEY_DECIMALS)))

# binary sensor
elif self.entity_type == ENTITY_TYPE_KEYS["BINARY_SENSOR"]:
self.config_command_state = \
self.GetConfigurations()[CONFIG_KEY_COMMAND_STATE]
self.GetFromConfigurations(CONFIG_KEY_COMMAND_STATE)
self.has_binary_state = True

# cover
elif self.entity_type == ENTITY_TYPE_KEYS["COVER"]:
self.config_cover_commands = {
"OPEN": self.GetConfigurations()[CONFIG_KEY_COMMAND_OPEN],
"CLOSE": self.GetConfigurations()[CONFIG_KEY_COMMAND_CLOSE]
"OPEN": self.GetFromConfigurations(CONFIG_KEY_COMMAND_OPEN),
"CLOSE": self.GetFromConfigurations(CONFIG_KEY_COMMAND_CLOSE)
}

stop_command = self.GetConfigurations()[CONFIG_KEY_COMMAND_STOP]
stop_command = self.GetFromConfigurations(CONFIG_KEY_COMMAND_STOP)

if stop_command:
self.config_cover_commands["STOP"] = stop_command
Expand All @@ -159,7 +159,7 @@ def Initialize(self):
self.has_command = True

self.config_command_state = \
self.GetConfigurations()[CONFIG_KEY_COMMAND_STATE]
self.GetFromConfigurations(CONFIG_KEY_COMMAND_STATE)

if self.config_command_state:
self.has_state = True
Expand Down
2 changes: 1 addition & 1 deletion IoTuring/Entity/Deployments/Uptime/Uptime.py → IoTuring/Entity/Deployments/UpTime/UpTime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
KEY = 'uptime'


class Uptime(Entity):
class UpTime(Entity):
NAME = "UpTime"

def Initialize(self):
Expand Down
2 changes: 1 addition & 1 deletion IoTuring/Entity/Entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def LogSource(self):
def SetTagFromConfiguration(self):
""" Set tag from configuration or set it blank if not present there """
if self.GetConfigurations() is not None and KEY_ENTITY_TAG in self.GetConfigurations():
self.tag = self.GetConfigurations()[KEY_ENTITY_TAG]
self.tag = self.GetFromConfigurations(KEY_ENTITY_TAG)
else:
self.tag = ""

Expand Down
Loading