Skip to content

Commit

Permalink
Python code is blacked
Browse files Browse the repository at this point in the history
  • Loading branch information
theyosh authored and github-actions[bot] committed Jan 5, 2024
1 parent 2ef4bb3 commit ed873a3
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 9 deletions.
30 changes: 22 additions & 8 deletions hardware/relay/voltcraft_sem6000_relay.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,53 @@

import re


class terrariumRelayVoltcraftSEM6000(terrariumRelay):
HARDWARE = "voltcraft_sem6000"
NAME = "Voltcraft SEM6000"

DEFAULT_PIN = '0000'
DEFAULT_PIN = "0000"

POWER_STATE_REGEX = r"Power:\s*(?P<state>On|Off)"

def _load_hardware(self):
terrariumUtils.get_script_data(f'python 3rdparty/python3-voltcraft-sem6000/sem6000-cli-demo.py {self.address} 0000 synchronize_date_and_time')
terrariumUtils.get_script_data(
f"python 3rdparty/python3-voltcraft-sem6000/sem6000-cli-demo.py {self.address} 0000 synchronize_date_and_time"
)
return self.address

def _set_hardware_value(self, state):
if state == self.ON:
terrariumUtils.get_script_data(f'python 3rdparty/python3-voltcraft-sem6000/sem6000-cli-demo.py {self.address} 0000 power_on')
terrariumUtils.get_script_data(
f"python 3rdparty/python3-voltcraft-sem6000/sem6000-cli-demo.py {self.address} 0000 power_on"
)
else:
terrariumUtils.get_script_data(f'python 3rdparty/python3-voltcraft-sem6000/sem6000-cli-demo.py {self.address} 0000 power_off')
terrariumUtils.get_script_data(
f"python 3rdparty/python3-voltcraft-sem6000/sem6000-cli-demo.py {self.address} 0000 power_off"
)

# Always return True here, as this should indicate the toggle changed succeeded
return True

def _get_hardware_value(self):
data = terrariumUtils.get_script_data(f'python 3rdparty/python3-voltcraft-sem6000/sem6000-cli-demo.py {self.address} 0000 request_measurement')
data = terrariumUtils.get_script_data(
f"python 3rdparty/python3-voltcraft-sem6000/sem6000-cli-demo.py {self.address} 0000 request_measurement"
)
if data:
state = re.search(terrariumRelayVoltcraftSEM6000.POWER_STATE_REGEX, data.decode('utf-8'))
state = re.search(terrariumRelayVoltcraftSEM6000.POWER_STATE_REGEX, data.decode("utf-8"))
if state:
state = state.group('state')
state = state.group("state")

return self.ON if terrariumUtils.is_true(state) else self.OFF

@staticmethod
def _scan_relays(callback=None, **kwargs):
devices = terrariumUtils.get_script_data(f'python 3rdparty/python3-voltcraft-sem6000/sem6000-cli-demo.py discover').decode('utf-8').strip().split("\n")
devices = (
terrariumUtils.get_script_data(f"python 3rdparty/python3-voltcraft-sem6000/sem6000-cli-demo.py discover")
.decode("utf-8")
.strip()
.split("\n")
)
for device in devices:
device = device.split("\t")
yield terrariumRelay(
Expand Down
4 changes: 3 additions & 1 deletion terrariumUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,9 @@ def get_script_data(script):
logger.debug("Running script: %s." % (script))
# Add python virtual env to PATH to make sure that venv is being used for python
data = subprocess.check_output(
f"{script} 2>/dev/null", shell=True, env={**os.environ, "PATH": f"{sys.prefix}/bin:" + os.environ["PATH"]}
f"{script} 2>/dev/null",
shell=True,
env={**os.environ, "PATH": f"{sys.prefix}/bin:" + os.environ["PATH"]},
)
logger.debug("Output was: %s." % (data))
except Exception as ex:
Expand Down

0 comments on commit ed873a3

Please sign in to comment.