From 1094dcb6ba460ca110fefd097a01c1373e633981 Mon Sep 17 00:00:00 2001 From: pzim <52496172+pzim-devdata@users.noreply.github.com> Date: Sat, 25 Nov 2023 19:33:18 +0100 Subject: [PATCH] Update get_devices_url.py --- get_devices_url.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/get_devices_url.py b/get_devices_url.py index e774133..7b9dd8a 100644 --- a/get_devices_url.py +++ b/get_devices_url.py @@ -16,6 +16,7 @@ from pyoverkiz.enums import OverkizCommand from pyoverkiz.models import Command from pyoverkiz.models import Scenario +import base64 async def main() -> None: @@ -33,6 +34,7 @@ async def main() -> None: list_of_tahoma_states = os.path.dirname(os.path.abspath(__file__))+'/temp/states.txt' server_choosen = os.path.dirname(os.path.abspath(__file__))+'/temp/server_choosen.txt' + test_file = os.path.dirname(os.path.abspath(__file__))+'/test/test.txt' try : f = open(server_choosen, 'r') @@ -60,13 +62,21 @@ async def main() -> None: args = parser.parse_args() try : - f = open(passwd_file, 'r') + f = open(test_file, 'r') + test = f.read() + f.close() + except FileNotFoundError: + test = "Hipk,@nP3%c@U2ZpC" + + try : + f = open(passwd_file, 'rb') content = f.read() f.close() - if len(content.splitlines()[0]) > 0 : - USERNAME = content.splitlines()[0] - if len(content.splitlines()[1]) > 0 : - PASSWORD = content.splitlines()[1] + content_str = base64.b64decode(content).decode('utf-8') + if len(content_str.split(':')[0]) > 0 : + USERNAME = content_str.split(':')[0] + if len(content_str.split(':')[1]) > 0 : + PASSWORD = content_str.split(':')[1].replace(test, "") except: pass for arg in sys.argv: @@ -106,6 +116,9 @@ async def main() -> None: elif "StatelessOnOff" in device.widget : f7.write(device.label+","+device.id+","+device.widget+"\n") print( "Device "+device.label+" controled by tahoma. Added to : "+list_of_tahoma_plugs) + elif "StatefulOnOff" in device.widget : + f7.write(device.label+","+device.id+","+device.widget+"\n") + print( "Device "+device.label+" controled by tahoma. Added to : "+list_of_tahoma_plugs) elif "PositionableScreen" in device.widget or "PositionableHorizontalAwning" in device.widget: f8.write(device.label+","+device.id+","+device.widget+"\n") print( "Device "+device.label+" controled by tahoma. Added to : "+list_of_tahoma_sunscreens)