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

Fix postEvent (#20026)

Browse Source 
Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen
2026-01-11 22:21:05 +01:00
committed by GitHub
parent c6c4eb0f82
commit c4a8d20b67
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/handler/HeosDynamicStateDescriptionProvider.java
+20 -13
View File
@@ -16,18 +16,22 @@ import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.heos.internal.json.payload.BrowseResult;
import org.openhab.binding.heos.internal.json.payload.Media;
import org.openhab.binding.heos.internal.json.payload.YesNoEnum;
import org.openhab.core.events.EventPublisher;
import org.openhab.core.thing.ChannelUID;
import org.openhab.core.thing.binding.BaseDynamicStateDescriptionProvider;
import org.openhab.core.thing.i18n.ChannelTypeI18nLocalizationService;
import org.openhab.core.thing.link.ItemChannelLinkRegistry;
import org.openhab.core.thing.type.DynamicStateDescriptionProvider;
import org.openhab.core.types.StateOption;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
/**
* Dynamically create the users list of favorites and playlists.
@@ -38,6 +42,15 @@ import org.osgi.service.component.annotations.Component;
@NonNullByDefault
public class HeosDynamicStateDescriptionProvider extends BaseDynamicStateDescriptionProvider {
@Activate
public HeosDynamicStateDescriptionProvider(final @Reference EventPublisher eventPublisher,
final @Reference ItemChannelLinkRegistry itemChannelLinkRegistry,
final @Reference ChannelTypeI18nLocalizationService channelTypeI18nLocalizationService) {
this.eventPublisher = eventPublisher;
this.itemChannelLinkRegistry = itemChannelLinkRegistry;
this.channelTypeI18nLocalizationService = channelTypeI18nLocalizationService;
}
String getValueByLabel(ChannelUID channelUID, String input) {
List<StateOption> options = channelOptionsMap.get(channelUID);
if (options == null) {
@@ -57,27 +70,21 @@ public class HeosDynamicStateDescriptionProvider extends BaseDynamicStateDescrip
setBrowseResultList(channelUID, playLists, d -> d.containerId);
}
private void setBrowseResultList(ChannelUID channelUID, List<BrowseResult> playlists,
private void setBrowseResultList(ChannelUID channelUID, List<BrowseResult> browseResults,
Function<BrowseResult, @Nullable String> function) {
setStateOptions(channelUID,
playlists.stream().filter(browseResult -> browseResult.playable == YesNoEnum.YES)
.map(browseResult -> getStateOption(function, browseResult)).filter(Optional::isPresent)
.map(Optional::get).collect(Collectors.toList()));
browseResults.stream().filter(browseResult -> browseResult.playable == YesNoEnum.YES)
.flatMap(browseResult -> getStateOption(function, browseResult).stream()).toList());
}
private Optional<StateOption> getStateOption(Function<BrowseResult, @Nullable String> function,
BrowseResult browseResult) {
String identifier = function.apply(browseResult);
if (identifier != null) {
return Optional.of(new StateOption(identifier, browseResult.name));
} else {
return Optional.empty();
}
return Optional.ofNullable(function.apply(browseResult))
.map(value -> new StateOption(value, browseResult.name));
}
public void setQueue(ChannelUID channelUID, List<Media> queue) {
setStateOptions(channelUID,
queue.stream().map(m -> new StateOption(String.valueOf(m.queueId), m.combinedSongArtist()))
.collect(Collectors.toList()));
queue.stream().map(m -> new StateOption(String.valueOf(m.queueId), m.combinedSongArtist())).toList());
}
}