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

Send source for console commands to items (#5079)

Browse Source 
Signed-off-by: Cody Cutrer <cody@cutrer.us>
This commit is contained in:
Cody Cutrer
2025-10-24 00:21:41 +02:00
committed by GitHub
parent 26a59793b3
commit 7efff5b374
6 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/OSGiConsole.java
+6
View File
@@ -76,6 +76,12 @@ public class OSGiConsole implements Console {
}
}
@Override
public @Nullable String getUser() {
Object result = session.get("USER");
return result != null ? result.toString() : null;
}
public Session getSession() {
return session;
}
bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java
+9
View File
@@ -53,4 +53,13 @@ public interface Console {
default String readLine(String prompt, final @Nullable Character mask) throws IOException {
throw new UnsupportedOperationException("readLine not supported");
}
/**
* Returns the user name associated with the console, or null if no user is associated.
*
* @return the user name, or null if no user is associated
*/
default @Nullable String getUser() {
return null;
}
}
bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java
-1
View File
@@ -22,7 +22,6 @@ import org.openhab.core.io.console.Console;
*/
@NonNullByDefault
public abstract class AbstractConsoleCommandExtension implements ConsoleCommandExtension {
private final String cmd;
private final String desc;
bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java
-1
View File
@@ -44,7 +44,6 @@ import org.osgi.service.component.annotations.Reference;
@Component(service = ConsoleCommandExtension.class)
@NonNullByDefault
public class ItemConsoleCommandExtension extends AbstractConsoleCommandExtension {
private static final String SUBCMD_LIST = "list";
private static final String SUBCMD_CLEAR = "clear";
private static final String SUBCMD_REMOVE = "remove";
bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java
+4 -1
View File
@@ -17,6 +17,7 @@ import java.util.Objects;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.events.AbstractEvent;
import org.openhab.core.events.EventPublisher;
import org.openhab.core.io.console.Console;
import org.openhab.core.io.console.ConsoleCommandCompleter;
@@ -44,6 +45,7 @@ import org.osgi.service.component.annotations.Reference;
@Component(service = ConsoleCommandExtension.class)
@NonNullByDefault
public class SendConsoleCommandExtension extends AbstractConsoleCommandExtension {
private static final String CONSOLE_SOURCE = "org.openhab.core.io.console";
private final ItemRegistry itemRegistry;
private final EventPublisher eventPublisher;
@@ -71,7 +73,8 @@ public class SendConsoleCommandExtension extends AbstractConsoleCommandExtension
String commandName = args[1];
Command command = TypeParser.parseCommand(item.getAcceptedCommandTypes(), commandName);
if (command != null) {
eventPublisher.post(ItemEventFactory.createCommandEvent(itemName, command));
eventPublisher.post(ItemEventFactory.createCommandEvent(itemName, command,
AbstractEvent.buildSource(CONSOLE_SOURCE, console.getUser())));
console.println("Command has been sent successfully.");
} else {
console.println(
bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java
+4 -1
View File
@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.events.AbstractEvent;
import org.openhab.core.events.EventPublisher;
import org.openhab.core.io.console.Console;
import org.openhab.core.io.console.ConsoleCommandCompleter;
@@ -43,6 +44,7 @@ import org.osgi.service.component.annotations.Reference;
@Component(service = ConsoleCommandExtension.class)
@NonNullByDefault
public class UpdateConsoleCommandExtension extends AbstractConsoleCommandExtension {
private static final String CONSOLE_SOURCE = "org.openhab.core.io.console";
private final ItemRegistry itemRegistry;
private final EventPublisher eventPublisher;
@@ -70,7 +72,8 @@ public class UpdateConsoleCommandExtension extends AbstractConsoleCommandExtensi
String stateName = args[1];
State state = TypeParser.parseState(item.getAcceptedDataTypes(), stateName);
if (state != null) {
eventPublisher.post(ItemEventFactory.createStateEvent(item.getName(), state));
eventPublisher.post(ItemEventFactory.createStateEvent(item.getName(), state,
AbstractEvent.buildSource(CONSOLE_SOURCE, console.getUser())));
console.println("Update has been sent successfully.");
} else {
console.println("Error: State '" + stateName + "' is not valid for item '" + itemName + "'");