public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[homekit] Improve output of console's `homekit show` command (#13569) 

* [homekit] Improve output of console's `homekit show` command

 * include the full JSON from all the characteristics, so you can confirm
   everything is configured correctly.
 * only use simple class names; the fully qualified package is just a
   distraction.
 * show linked services if they exist
 * include the class name of services, not just the GUID

Signed-off-by: Cody Cutrer <cody@cutrer.us>
This commit is contained in:
Cody Cutrer 2022-10-19 12:17:55 -06:00 committed by GitHub
parent 91383250d4
commit 68b52ee15b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitCommandExtension.java
View File

@ -26,6 +26,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.hapjava.services.Service;
/**
* Console commands for interacting with the HomeKit integration
*
@ -119,6 +121,24 @@ public class HomekitCommandExtension extends AbstractConsoleCommandExtension {
});
}
private void printService(Console console, Service service, int indent) {
console.println(" ".repeat(indent) + "Service Type: " + service.getClass().getSimpleName() + " ("
+ service.getType() + ")");
console.println(" ".repeat(indent + 2) + "Characteristics:");
service.getCharacteristics().forEach((c) -> {
try {
console.println(
" ".repeat(indent + 4) + c.getClass().getSimpleName() + ": " + c.toJson(0).get().toString());
} catch (InterruptedException | ExecutionException e) {
}
});
if (service.getLinkedServices().isEmpty()) {
return;
}
console.println(" ".repeat(indent + 2) + "Linked Services:");
service.getLinkedServices().forEach((s) -> printService(console, s, indent + 2));
}
private void printAccessory(String id, Console console) {
homekit.getAccessories().forEach(v -> {
try {
@ -126,11 +146,7 @@ public class HomekitCommandExtension extends AbstractConsoleCommandExtension {
&& (v.getName().get().toUpperCase().contains(id.toUpperCase())))) {
console.println(v.getId() + " " + v.getName().get());
console.println("Services:");
v.getServices().forEach(s -> {
console.println(" Service Type: " + s.getType());
console.println(" Characteristics: ");
s.getCharacteristics().forEach(c -> console.println(" : " + c.getClass()));
});
v.getServices().forEach(s -> printService(console, s, 2));
console.println("");
}
} catch (InterruptedException | ExecutionException e) {