demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-addons synced 2026-07-29 12:34:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

[shelly] Fix script upload - don't delete Non-OH scripts (#19231)

Browse Source 
Signed-off-by: Markus Michels <markus7017@gmail.com>
This commit is contained in:
Markus Michels
2025-08-26 21:18:40 +02:00
committed by GitHub
parent c85037e10c
commit 0e37ae1ed2
1 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api2/Shelly2ApiRpc.java
+37 -11
View File
@@ -112,6 +112,11 @@ public class Shelly2ApiRpc extends Shelly2ApiClient implements ShellyApiInterfac
private Shelly2RpcSocket rpcSocket = new Shelly2RpcSocket();
private @Nullable Shelly2AuthChallenge authInfo;
// Plus devices support up to 3 scripts, Pro devices up to 10
// We need to find a free script id when uploading our script
// We want to limit script ids being checked, so define a max id
private static final int MAX_SCRIPT_ID = 15;
/**
* Regular constructor - called by Thing handler
*
@@ -432,9 +437,9 @@ public class Shelly2ApiRpc extends Shelly2ApiClient implements ShellyApiInterfac
if (!install) {
if (ourId != -1) {
startScript(ourId, false);
enableScript(script, false);
enableScript(script, ourId, false);
deleteScript(ourId);
logger.debug("{}: Script {} was disabledd, id={}", thingName, script, ourId);
logger.debug("{}: Script {} was disabled, id={}", thingName, script, ourId);
}
return;
}
@@ -491,13 +496,24 @@ public class Shelly2ApiRpc extends Shelly2ApiClient implements ShellyApiInterfac
if (upload) {
logger.debug("{}: Script will be installed...", thingName);
// Create new script, get id
ShellyScriptResponse rsp = apiRequest(
new Shelly2RpcRequest().withMethod(SHELLYRPC_METHOD_SCRIPT_CREATE).withName(script),
ShellyScriptResponse.class);
ourId = rsp.id;
logger.debug("{}: Script has been created, id={}", thingName, ourId);
upload = true;
if (ourId == -1) {
// find free script id
ourId = 0;
for (ourId = 1; ourId <= MAX_SCRIPT_ID && testScriptId(scriptList, ourId); ourId++) {
}
}
if (ourId <= MAX_SCRIPT_ID) {
// Create new script, get id
ShellyScriptResponse rsp = apiRequest(new Shelly2RpcRequest()
.withMethod(SHELLYRPC_METHOD_SCRIPT_CREATE).withId(ourId).withName(script),
ShellyScriptResponse.class);
ourId = rsp.id;
logger.debug("{}: Script has been created, id={}", thingName, ourId);
upload = true;
} else {
logger.debug("{}: Too many scripts installed on this device", thingName);
upload = false;
}
}
if (upload) {
@@ -518,7 +534,7 @@ public class Shelly2ApiRpc extends Shelly2ApiClient implements ShellyApiInterfac
} while (processed < length);
running = false;
}
if (enableScript(script, true) && upload) {
if (enableScript(script, ourId, true) && upload) {
logger.info("{}: Script {} was {} installed successful", thingName, thingName, script);
}
@@ -537,6 +553,15 @@ public class Shelly2ApiRpc extends Shelly2ApiClient implements ShellyApiInterfac
}
}
private boolean testScriptId(ShellyScriptListResponse scriptList, int id) {
for (ShellyScriptListEntry s : scriptList.scripts) {
if (s.id == id) {
return true;
}
}
return false;
}
private boolean startScript(int ourId, boolean start) {
if (ourId != -1) {
try {
@@ -550,9 +575,10 @@ public class Shelly2ApiRpc extends Shelly2ApiClient implements ShellyApiInterfac
return false;
}
private boolean enableScript(String script, boolean enable) {
private boolean enableScript(String script, int scriptId, boolean enable) {
try {
Shelly2RpcRequestParams params = new Shelly2RpcRequestParams().withConfig();
params.id = scriptId;
params.config.name = script;
params.config.enable = enable;
apiRequest(SHELLYRPC_METHOD_SCRIPT_SETCONFIG, params, String.class);