Skip to content

Commit a5ae705

Browse files
committed
250507.2
1 parent 91ca544 commit a5ae705

File tree

4 files changed

+37
-22
lines changed

4 files changed

+37
-22
lines changed
Binary file not shown.

easycoder/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
from .ec_timestamp import *
1010
from .ec_value import *
1111

12-
__version__ = "250507.1"
12+
__version__ = "250507.2"

rbrconf.ecs

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -466,15 +466,15 @@ GetConfigData:
466466
put `Can't read the config file for ` cat SystemName cat `(` cat MAC cat `/` cat Password cat `)` into StatusMessage
467467
go to Error
468468
end
469-
log Value
469+
! log Value
470470
! If the server has data, copy it into the local config
471471
if Value is `""` put empty into Value
472472
if Value is empty put `{}` into Value
473473
if Value is not `{}`
474474
begin
475475
log `Add config data from the server`
476476
put json Value into Value
477-
log prettify Value
477+
! log prettify Value
478478
put the keys of Value into Keys
479479
put 0 into K
480480
while K is less than the count of Keys
@@ -891,28 +891,43 @@ PopulateSystemInfo:
891891
put property `host-password` of SystemConfig into Password
892892
if SystemHostSSID is not HostSSID
893893
begin
894-
put `Unknown host SSID ` cat SystemHostSSID into StatusMessage
894+
put `Different host SSID: ` cat SystemHostSSID into StatusMessage
895895
gosub to Working
896-
put SystemHostSSID into HostSSID
897-
put Password into HostPassword
898-
put system `nmcli dev wifi connect ` cat HostSSID cat ` password ` cat HostPassword into SystemCallResult
899-
split SystemCallResult on ` `
900-
if the elements of SystemCallResult is greater than 2
896+
create MessageBox on Window
897+
style question
898+
title `Move system`
899+
message `Shall I move the system to the current host (` cat HostSSID cat `)?`
900+
show MessageBox giving Value
901+
if Value is `Yes`
901902
begin
902-
index SystemCallResult to 2
903-
if SystemCallResult is `successfully`
904-
begin
905-
set property HostSSID of Hosts to HostPassword
906-
set property `hosts` of Config to Hosts
907-
gosub to PostConfigData
908-
put HostSSID into CurrentSSID
909-
put `Connected to ` cat HostSSID into StatusMessage
910-
gosub to Working
911-
end
912-
else
903+
put HostSSID into SystemHostSSID
904+
set property `host-ssid` of SystemConfig to HostSSID
905+
set property `host-password` of SystemConfig to HostPassword
906+
gosub to UpdateSystems
907+
end
908+
else
909+
begin
910+
put SystemHostSSID into HostSSID
911+
put Password into HostPassword
912+
put system `nmcli dev wifi connect ` cat HostSSID cat ` password ` cat HostPassword into SystemCallResult
913+
split SystemCallResult on ` `
914+
if the elements of SystemCallResult is greater than 2
913915
begin
914-
put `Failed to connect to ` cat HostSSID into StatusMessage
915-
go to Error
916+
index SystemCallResult to 2
917+
if SystemCallResult is `successfully`
918+
begin
919+
set property HostSSID of Hosts to HostPassword
920+
set property `hosts` of Config to Hosts
921+
gosub to PostConfigData
922+
put HostSSID into CurrentSSID
923+
put `Connected to ` cat HostSSID into StatusMessage
924+
gosub to Working
925+
end
926+
else
927+
begin
928+
put `Failed to connect to ` cat HostSSID into StatusMessage
929+
go to Error
930+
end
916931
end
917932
end
918933
end

0 commit comments

Comments
 (0)