add favorites and playlists, add groupWithMember
This commit is contained in:
Marko Oldenburg
parent
f2f83507a2
commit
8ae4f661be
@ -34,7 +34,7 @@ use JSON qw(decode_json);
|
|||||||
use Encode qw(encode_utf8);
|
use Encode qw(encode_utf8);
|
||||||
|
|
||||||
|
|
||||||
my $version = "0.1.47";
|
my $version = "0.1.51";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -59,7 +59,7 @@ sub HEOSGroup_Initialize($) {
|
|||||||
|
|
||||||
my ($hash) = @_;
|
my ($hash) = @_;
|
||||||
|
|
||||||
$hash->{Match} = '.*{"command":."group.*|.*{"command":."event/group.*';
|
$hash->{Match} = '.*{"command":."group.*';
|
||||||
|
|
||||||
# Provider
|
# Provider
|
||||||
$hash->{SetFn} = "HEOSGroup_Set";
|
$hash->{SetFn} = "HEOSGroup_Set";
|
||||||
@ -136,13 +136,13 @@ sub HEOSGroup_Define($$) {
|
|||||||
$attr{$name}{devStateIcon} = "on:10px-kreis-gruen off:10px-kreis-rot" if( !defined( $attr{$name}{devStateIcon} ) );
|
$attr{$name}{devStateIcon} = "on:10px-kreis-gruen off:10px-kreis-rot" if( !defined( $attr{$name}{devStateIcon} ) );
|
||||||
|
|
||||||
|
|
||||||
#if( $init_done ) {
|
if( $init_done ) {
|
||||||
# InternalTimer( gettimeofday()+int(rand(2)), "HEOSGroup_GetGroupInfo", $hash, 0 );
|
InternalTimer( gettimeofday()+int(rand(2)), "HEOSGroup_GetGroupInfo", $hash, 0 );
|
||||||
# InternalTimer( gettimeofday()+int(rand(4)), "HEOSGroup_GetGroupVolume", $hash, 0 );
|
InternalTimer( gettimeofday()+int(rand(4)), "HEOSGroup_GetGroupVolume", $hash, 0 );
|
||||||
#} else {
|
} else {
|
||||||
# InternalTimer( gettimeofday()+15+int(rand(2)), "HEOSGroup_GetGroupInfo", $hash, 0 );
|
InternalTimer( gettimeofday()+15+int(rand(2)), "HEOSGroup_GetGroupInfo", $hash, 0 );
|
||||||
# InternalTimer( gettimeofday()+15+int(rand(10)), "HEOSGroup_GetGroupVolume", $hash, 0 );
|
InternalTimer( gettimeofday()+15+int(rand(10)), "HEOSGroup_GetGroupVolume", $hash, 0 );
|
||||||
#}
|
}
|
||||||
|
|
||||||
readingsBeginUpdate($hash);
|
readingsBeginUpdate($hash);
|
||||||
readingsBulkUpdate($hash, 'state','Initialized');
|
readingsBulkUpdate($hash, 'state','Initialized');
|
||||||
@ -287,12 +287,8 @@ sub HEOSGroup_Parse($$) {
|
|||||||
|
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
#IOWrite($hash,'getPlayerInfo',"gid=$hash->{GID}");
|
|
||||||
#IOWrite($hash,'getPlayState',"gid=$hash->{GID}"); Erst mal schauen ob es ohne das geht, wenn nicht wieder aktivieren
|
|
||||||
#IOWrite($hash,'getNowPlayingMedia',"gid=$hash->{GID}");
|
|
||||||
|
|
||||||
Log3 $name, 4, "HEOSGroup ($name) - find logical device: $hash->{NAME}";
|
Log3 $name, 4, "HEOSGroup ($name) - find logical device: $hash->{NAME}";
|
||||||
Log3 $name, 5, "HEOSGroup ($name) - gid direkt im root von decode_json gefunden";
|
Log3 $name, 4, "HEOSGroup ($name) - find GID in root from decode_json";
|
||||||
|
|
||||||
return $hash->{NAME};
|
return $hash->{NAME};
|
||||||
|
|
||||||
@ -421,73 +417,18 @@ sub HEOSGroup_PreProcessingReadings($$) {
|
|||||||
|
|
||||||
Log3 $name, 4, "HEOSGroup ($name) - preprocessing readings";
|
Log3 $name, 4, "HEOSGroup ($name) - preprocessing readings";
|
||||||
|
|
||||||
if ( $decode_json->{heos}{command} =~ /play_state/ or $decode_json->{heos}{command} =~ /player_state_changed/ ) {
|
if ( $decode_json->{heos}{command} =~ /volume_changed/ or $decode_json->{heos}{command} =~ /set_volume/ or $decode_json->{heos}{command} =~ /get_volume/ ) {
|
||||||
|
|
||||||
my @value = split('&', $decode_json->{heos}{message});
|
|
||||||
$buffer{'playStatus'} = substr($value[1],6);
|
|
||||||
|
|
||||||
} elsif ( $decode_json->{heos}{command} =~ /volume_changed/ or $decode_json->{heos}{command} =~ /set_volume/ or $decode_json->{heos}{command} =~ /get_volume/ ) {
|
|
||||||
|
|
||||||
my @value = split('&', $decode_json->{heos}{message});
|
my @value = split('&', $decode_json->{heos}{message});
|
||||||
$buffer{'volume'} = substr($value[1],6);
|
$buffer{'volume'} = substr($value[1],6);
|
||||||
$buffer{'mute'} = substr($value[2],5) if( $decode_json->{heos}{command} =~ /volume_changed/ );
|
$buffer{'mute'} = substr($value[2],5) if( $decode_json->{heos}{command} =~ /volume_changed/ );
|
||||||
|
|
||||||
if (defined($buffer{'mute'}) && AttrVal($name, 'mute2play', 0) == 1) {
|
|
||||||
|
|
||||||
IOWrite($hash,'setPlayState',"pid=$hash->{PID}&state=play") if $buffer{'mute'} eq "off";
|
|
||||||
IOWrite($hash,'setPlayState',"pid=$hash->{PID}&state=stop") if $buffer{'mute'} eq "on";
|
|
||||||
}
|
|
||||||
|
|
||||||
} elsif ( $decode_json->{heos}{command} =~ /play_mode/ ) {
|
|
||||||
|
|
||||||
my @value = split('&', $decode_json->{heos}{message});
|
|
||||||
if(substr($value[1],7) eq 'on_all') {
|
|
||||||
|
|
||||||
$buffer{'repeat'} = 'all';
|
|
||||||
|
|
||||||
} elsif (substr($value[1],7) eq 'on_one') {
|
|
||||||
|
|
||||||
$buffer{'repeat'} = 'one';
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
$buffer{'repeat'} = substr($value[1],7);
|
|
||||||
}
|
|
||||||
|
|
||||||
$buffer{'shuffle'} = substr($value[2],8);
|
|
||||||
|
|
||||||
} elsif ( $decode_json->{heos}{command} =~ /volume_up/ or $decode_json->{heos}{command} =~ /volume_down/ ) {
|
} elsif ( $decode_json->{heos}{command} =~ /volume_up/ or $decode_json->{heos}{command} =~ /volume_down/ ) {
|
||||||
|
|
||||||
my @value = split('&', $decode_json->{heos}{message});
|
my @value = split('&', $decode_json->{heos}{message});
|
||||||
$buffer{'volumeUp'} = substr($value[1],5) if( $decode_json->{heos}{command} =~ /volume_up/ );
|
$buffer{'volumeUp'} = substr($value[1],5) if( $decode_json->{heos}{command} =~ /volume_up/ );
|
||||||
$buffer{'volumeDown'} = substr($value[1],5) if( $decode_json->{heos}{command} =~ /volume_down/ );
|
$buffer{'volumeDown'} = substr($value[1],5) if( $decode_json->{heos}{command} =~ /volume_down/ );
|
||||||
|
|
||||||
} elsif ( $decode_json->{heos}{command} =~ /repeat_mode_changed/ ) {
|
|
||||||
|
|
||||||
my @value = split('&', $decode_json->{heos}{message});
|
|
||||||
|
|
||||||
if(substr($value[1],7) eq 'on_all') {
|
|
||||||
|
|
||||||
$buffer{'repeat'} = 'all';
|
|
||||||
|
|
||||||
} elsif (substr($value[1],7) eq 'on_one') {
|
|
||||||
|
|
||||||
$buffer{'repeat'} = 'one';
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
$buffer{'repeat'} = substr($value[1],7);
|
|
||||||
}
|
|
||||||
|
|
||||||
} elsif ( $decode_json->{heos}{command} =~ /shuffle_mode_changed/ ) {
|
|
||||||
|
|
||||||
my @value = split('&', $decode_json->{heos}{message});
|
|
||||||
$buffer{'shuffle'} = substr($value[1],8);
|
|
||||||
|
|
||||||
} elsif ( $decode_json->{heos}{command} =~ /player_now_playing_changed/ ) {
|
|
||||||
|
|
||||||
IOWrite($hash,'getNowPlayingMedia',"gid=$hash->{GID}");
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
Log3 $name, 3, "HEOSGroup ($name) - no match found";
|
Log3 $name, 3, "HEOSGroup ($name) - no match found";
|
||||||
|
|||||||
483
21_HEOSMaster.pm
483
21_HEOSMaster.pm
@ -5,6 +5,10 @@
|
|||||||
# (c) 2017 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
# (c) 2017 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||||
# All rights reserved
|
# All rights reserved
|
||||||
#
|
#
|
||||||
|
# Special thanks goes to comitters:
|
||||||
|
# - Olaf Schnicke
|
||||||
|
#
|
||||||
|
#
|
||||||
# This script is free software; you can redistribute it and/or modify
|
# This script is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
@ -46,7 +50,7 @@ use Encode qw(encode_utf8);
|
|||||||
use Net::Telnet;
|
use Net::Telnet;
|
||||||
|
|
||||||
|
|
||||||
my $version = "0.1.47";
|
my $version = "0.1.55";
|
||||||
|
|
||||||
|
|
||||||
my %heosCmds = (
|
my %heosCmds = (
|
||||||
@ -55,16 +59,27 @@ my %heosCmds = (
|
|||||||
'signAccountIn' => 'system/sign_in?',
|
'signAccountIn' => 'system/sign_in?',
|
||||||
'signAccountOut' => 'system/sign_out',
|
'signAccountOut' => 'system/sign_out',
|
||||||
'reboot' => 'system/reboot',
|
'reboot' => 'system/reboot',
|
||||||
|
'getMusicSources' => 'browse/get_music_sources',
|
||||||
|
'browseSource' => 'browse/browse?',
|
||||||
'getPlayers' => 'player/get_players',
|
'getPlayers' => 'player/get_players',
|
||||||
'getGroups' => 'player/get_groups',
|
'getGroups' => 'group/get_groups',
|
||||||
'getPlayerInfo' => 'player/get_player_info?',
|
'getPlayerInfo' => 'player/get_player_info?',
|
||||||
|
'getGroupInfo' => 'group/get_group_info?',
|
||||||
'getPlayState' => 'player/get_play_state?',
|
'getPlayState' => 'player/get_play_state?',
|
||||||
'getPlayMode' => 'player/get_play_mode?',
|
'getPlayMode' => 'player/get_play_mode?',
|
||||||
|
'clearQueue' => 'player/clear_queue?',
|
||||||
|
'saveQueue' => 'player/save_queue?',
|
||||||
'getVolume' => 'player/get_volume?',
|
'getVolume' => 'player/get_volume?',
|
||||||
'getGroupVolume' => 'group/get_volume?',
|
'getGroupVolume' => 'group/get_volume?',
|
||||||
'setPlayState' => 'player/set_play_state?',
|
'setPlayState' => 'player/set_play_state?',
|
||||||
'setPlayMode' => 'player/set_play_mode?',
|
'setPlayMode' => 'player/set_play_mode?',
|
||||||
'setMute' => 'player/set_mute?',
|
'setMute' => 'player/set_mute?',
|
||||||
|
'playNext' => 'player/play_next?',
|
||||||
|
'playPrev' => 'player/play_prev?',
|
||||||
|
'playPresetStation' => 'browse/play_preset?',
|
||||||
|
'playInput' => 'browse/play_input?',
|
||||||
|
'playStream' => 'browse/play_stream?',
|
||||||
|
'playPlaylist' => 'browse/add_to_queue?',
|
||||||
'setVolume' => 'player/set_volume?',
|
'setVolume' => 'player/set_volume?',
|
||||||
'setGroupVolume' => 'group/set_volume?',
|
'setGroupVolume' => 'group/set_volume?',
|
||||||
'volumeUp' => 'player/volume_up?',
|
'volumeUp' => 'player/volume_up?',
|
||||||
@ -72,7 +87,8 @@ my %heosCmds = (
|
|||||||
'GroupVolumeUp' => 'group/volume_up?',
|
'GroupVolumeUp' => 'group/volume_up?',
|
||||||
'GroupVolumeDown' => 'group/volume_down?',
|
'GroupVolumeDown' => 'group/volume_down?',
|
||||||
'getNowPlayingMedia' => 'player/get_now_playing_media?',
|
'getNowPlayingMedia' => 'player/get_now_playing_media?',
|
||||||
'eventChangeVolume' => 'event/player_volume_changed'
|
'eventChangeVolume' => 'event/player_volume_changed',
|
||||||
|
'createGroup' => 'group/set_group?'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
@ -91,7 +107,6 @@ sub HEOSMaster_Attr(@);
|
|||||||
sub HEOSMaster_firstRun($);
|
sub HEOSMaster_firstRun($);
|
||||||
sub HEOSMaster_ResponseProcessing($$);
|
sub HEOSMaster_ResponseProcessing($$);
|
||||||
sub HEOSMaster_WriteReadings($$);
|
sub HEOSMaster_WriteReadings($$);
|
||||||
sub HEOSMaster_PreResponseProsessing($$);
|
|
||||||
sub HEOSMaster_GetPlayers($);
|
sub HEOSMaster_GetPlayers($);
|
||||||
sub HEOSMaster_EnableChangeEvents($);
|
sub HEOSMaster_EnableChangeEvents($);
|
||||||
sub HEOSMaster_PreProcessingReadings($$);
|
sub HEOSMaster_PreProcessingReadings($$);
|
||||||
@ -99,6 +114,16 @@ sub HEOSMaster_ReOpen($);
|
|||||||
sub HEOSMaster_ReadPassword($);
|
sub HEOSMaster_ReadPassword($);
|
||||||
sub HEOSMaster_StorePassword($$);
|
sub HEOSMaster_StorePassword($$);
|
||||||
sub HEOSMaster_GetGroups($);
|
sub HEOSMaster_GetGroups($);
|
||||||
|
sub HEOSMaster_ProcessRead($$);
|
||||||
|
sub HEOSMaster_ParseMsg($$);
|
||||||
|
sub HEOSMaster_CheckAccount($);
|
||||||
|
sub HEOSMaster_Get($$@);
|
||||||
|
sub HEOSMaster_GetFavorites($);
|
||||||
|
sub HEOSMaster_GetHistory($);
|
||||||
|
sub HEOSMaster_GetInputs($);
|
||||||
|
sub HEOSMaster_GetMusicSources($);
|
||||||
|
sub HEOSMaster_GetPlaylists($);
|
||||||
|
sub HEOSMaster_GetServers($);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -111,14 +136,14 @@ sub HEOSMaster_Initialize($) {
|
|||||||
$hash->{ReadFn} = "HEOSMaster_Read";
|
$hash->{ReadFn} = "HEOSMaster_Read";
|
||||||
$hash->{WriteFn} = "HEOSMaster_Write";
|
$hash->{WriteFn} = "HEOSMaster_Write";
|
||||||
$hash->{Clients} = ":HEOSPlayer:";
|
$hash->{Clients} = ":HEOSPlayer:";
|
||||||
$hash->{MatchList} = { "1:HEOSPlayer" => '.*{"command":."player.*|.*{"command":."event\/player.*|.*{"command":."event\/repeat_mode_changed.*|.*{"command":."event\/shuffle_mode_changed.*',
|
$hash->{MatchList} = { "1:HEOSPlayer" => '.*{"command":."player.*|.*{"command":."event\/player.*|.*{"command":."event\/repeat_mode_changed.*|.*{"command":."event\/shuffle_mode_changed.*|.*{"command":."event\/favorites_changed.*',
|
||||||
"2:HEOSGroup" => '.*{"command":."group.*|.*{"command":."event\/group.*'
|
"2:HEOSGroup" => '.*{"command":."group.*'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
# Consumer
|
# Consumer
|
||||||
$hash->{SetFn} = "HEOSMaster_Set";
|
$hash->{SetFn} = "HEOSMaster_Set";
|
||||||
#$hash->{GetFn} = "HEOSMaster_Get";
|
$hash->{GetFn} = "HEOSMaster_Get";
|
||||||
$hash->{DefFn} = "HEOSMaster_Define";
|
$hash->{DefFn} = "HEOSMaster_Define";
|
||||||
$hash->{UndefFn} = "HEOSMaster_Undef";
|
$hash->{UndefFn} = "HEOSMaster_Undef";
|
||||||
$hash->{AttrFn} = "HEOSMaster_Attr";
|
$hash->{AttrFn} = "HEOSMaster_Attr";
|
||||||
@ -225,6 +250,22 @@ sub HEOSMaster_Attr(@) {
|
|||||||
return undef;
|
return undef;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub HEOSMaster_Get($$@) {
|
||||||
|
my ($hash, $name, @aa) = @_;
|
||||||
|
my ($cmd, @args) = @aa;
|
||||||
|
|
||||||
|
my $pid = $hash->{PID};
|
||||||
|
|
||||||
|
if( $cmd eq 'showAccount' ) {
|
||||||
|
|
||||||
|
return AttrVal($name,'heosUsername',0) . ":" .HEOSMaster_ReadPassword($hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
my $list = 'showAccount:noArg';
|
||||||
|
|
||||||
|
return "Unknown argument $cmd, choose one of $list";
|
||||||
|
}
|
||||||
|
|
||||||
sub HEOSMaster_Set($@) {
|
sub HEOSMaster_Set($@) {
|
||||||
|
|
||||||
my ($hash, $name, $cmd, @args) = @_;
|
my ($hash, $name, $cmd, @args) = @_;
|
||||||
@ -303,11 +344,13 @@ sub HEOSMaster_Set($@) {
|
|||||||
|
|
||||||
sub HEOSMaster_Open($) {
|
sub HEOSMaster_Open($) {
|
||||||
|
|
||||||
my $hash = shift;
|
my $hash = shift;
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
my $host = $hash->{HOST};
|
my $host = $hash->{HOST};
|
||||||
my $port = 1255;
|
my $port = 1255;
|
||||||
my $timeout = 0.1;
|
my $timeout = 0.1;
|
||||||
|
my $user = AttrVal($name,'heosUsername',0);
|
||||||
|
my $password = HEOSMaster_ReadPassword($hash);
|
||||||
|
|
||||||
|
|
||||||
Log3 $name, 4, "HEOSMaster ($name) - Baue Socket Verbindung auf";
|
Log3 $name, 4, "HEOSMaster ($name) - Baue Socket Verbindung auf";
|
||||||
@ -327,8 +370,22 @@ sub HEOSMaster_Open($) {
|
|||||||
|
|
||||||
Log3 $name, 4, "HEOSMaster ($name) - Socket Connected";
|
Log3 $name, 4, "HEOSMaster ($name) - Socket Connected";
|
||||||
|
|
||||||
InternalTimer( gettimeofday()+1, 'HEOSMaster_GetPlayers', $hash, 1 );
|
|
||||||
InternalTimer( gettimeofday()+3, 'HEOSMaster_GetGroups', $hash, 1 );
|
#hinzugefügt laut Protokoll 2.1.1 Initsequenz
|
||||||
|
HEOSMaster_Write($hash,'enableChangeEvents','off');
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - set enableChangeEvents off";
|
||||||
|
|
||||||
|
#hinzugefügt laut Protokoll 2.1.1 Initsequenz
|
||||||
|
if( defined($user) and defined($password) ) {
|
||||||
|
|
||||||
|
HEOSMaster_Write($hash,'signAccountIn',"un=$user&pw=$password");
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - sign in";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
HEOSMaster_GetPlayers($hash);
|
||||||
|
InternalTimer( gettimeofday()+1, 'HEOSMaster_EnableChangeEvents', $hash, 0 );
|
||||||
|
InternalTimer( gettimeofday()+2, 'HEOSMaster_GetMusicSources', $hash, 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
sub HEOSMaster_Close($) {
|
sub HEOSMaster_Close($) {
|
||||||
@ -387,6 +444,7 @@ sub HEOSMaster_Read($) {
|
|||||||
my $len;
|
my $len;
|
||||||
my $buf;
|
my $buf;
|
||||||
|
|
||||||
|
|
||||||
Log3 $name, 4, "HEOSMaster ($name) - ReadFn gestartet";
|
Log3 $name, 4, "HEOSMaster ($name) - ReadFn gestartet";
|
||||||
|
|
||||||
$len = sysread($hash->{CD},$buf,1024); # die genaue Puffergröße wird noch ermittelt
|
$len = sysread($hash->{CD},$buf,1024); # die genaue Puffergröße wird noch ermittelt
|
||||||
@ -401,50 +459,69 @@ sub HEOSMaster_Read($) {
|
|||||||
Log3 $name, 3, "HEOSMaster ($name) - Keine Daten empfangen";
|
Log3 $name, 3, "HEOSMaster ($name) - Keine Daten empfangen";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Log3 $name, 5, "HEOSMaster ($name) - received buffer data, start preprocessing: $buf";
|
|
||||||
HEOSMaster_PreResponseProsessing($hash,$buf);
|
Log3 $name, 5, "HEOSMaster ($name) - received buffer data, start HEOSMaster_ProcessRead: $buf";
|
||||||
|
HEOSMaster_ProcessRead($hash,$buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
sub HEOSMaster_PreResponseProsessing($$) {
|
sub HEOSMaster_ProcessRead($$) {
|
||||||
|
|
||||||
my ($hash,$response) = @_;
|
my ($hash, $data) = @_;
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
my $buffer = '';
|
||||||
|
|
||||||
|
|
||||||
Log3 $name, 4, "HEOSMaster ($name) - pre processing response data";
|
Log3 $name, 4, "HEOSMaster ($name) - process read";
|
||||||
|
|
||||||
|
#include previous partial message
|
||||||
|
if(defined($hash->{PARTIAL}) && $hash->{PARTIAL}) {
|
||||||
|
|
||||||
my $len = length($response);
|
Log3 $name, 5, "HEOSMaster ($name) - PARTIAL: " . $hash->{PARTIAL};
|
||||||
my @letterArray = split("",$response);
|
$buffer = $hash->{PARTIAL};
|
||||||
|
|
||||||
my $letter = "";
|
|
||||||
my $count = 0;
|
|
||||||
my $marker = 0;
|
|
||||||
my $json;
|
|
||||||
|
|
||||||
for(my $i = 0; $i < $len; $i++) {
|
|
||||||
|
|
||||||
$marker = 1 if($count > 0);
|
|
||||||
$letter = $letterArray[0];
|
|
||||||
$json .= $letter;
|
|
||||||
|
|
||||||
$count++ if($letter eq '{');
|
} else {
|
||||||
$count-- if($letter eq '}');
|
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - No PARTIAL buffer";
|
||||||
|
}
|
||||||
|
|
||||||
|
Log3 $name, 5, "HEOSMaster ($name) - Incoming data: " . $data;
|
||||||
|
|
||||||
|
$buffer = $buffer . $data;
|
||||||
|
Log3 $name, 5, "HEOSMaster ($name) - Current processing buffer (PARTIAL + incoming data): " . $buffer;
|
||||||
|
|
||||||
|
my ($json,$tail) = HEOSMaster_ParseMsg($hash, $buffer);
|
||||||
|
|
||||||
if( $count == 0 and $marker == 1) {
|
|
||||||
|
#processes all complete messages
|
||||||
|
while($json) {
|
||||||
|
|
||||||
|
$hash->{LAST_RECV} = time();
|
||||||
|
|
||||||
|
Log3 $name, 5, "HEOSMaster ($name) - Decoding JSON message. Length: " . length($json) . " Content: " . $json;
|
||||||
|
|
||||||
|
my $obj = JSON->new->utf8(0)->decode($json);
|
||||||
|
if(defined($obj->{heos})) {
|
||||||
|
|
||||||
HEOSMaster_ResponseProcessing($hash,$json);
|
HEOSMaster_ResponseProcessing($hash,$json);
|
||||||
$json = "";
|
Log3 $name, 4, "HEOSMaster ($name) - starte HEOSMaster_ResponseProcessing";
|
||||||
$marker = 0;
|
|
||||||
|
} elsif(defined($obj->{error})) {
|
||||||
|
|
||||||
|
Log3 $name, 3, "HEOSMaster ($name) - Received error message: " . $json;
|
||||||
}
|
}
|
||||||
|
|
||||||
shift(@letterArray);
|
($json,$tail) = HEOSMaster_ParseMsg($hash, $tail);
|
||||||
}
|
}
|
||||||
|
|
||||||
#my $rest = join(' ',@letterArray); # currupted data, rest array
|
$hash->{PARTIAL} = $tail;
|
||||||
#Log3 $name, 3, "HEOSMaster ($name) - found corrupt data in buffer: $rest" if( defined($rest) and ($rest) );
|
|
||||||
|
|
||||||
|
Log3 $name, 5, "HEOSMaster ($name) - Tail: " . $tail;
|
||||||
|
Log3 $name, 5, "HEOSMaster ($name) - PARTIAL: " . $hash->{PARTIAL};
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub HEOSMaster_ResponseProcessing($$) {
|
sub HEOSMaster_ResponseProcessing($$) {
|
||||||
@ -474,36 +551,179 @@ sub HEOSMaster_ResponseProcessing($$) {
|
|||||||
Log3 $name, 4, "HEOSMaster ($name) - call Sub HEOSMaster_WriteReadings";
|
Log3 $name, 4, "HEOSMaster ($name) - call Sub HEOSMaster_WriteReadings";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( $decode_json->{heos}{command} =~ /^browse\/get_music_sources/ and ref($decode_json->{payload}) eq "ARRAY" and scalar(@{$decode_json->{payload}}) > 0) {
|
||||||
|
|
||||||
|
#liest nur die Radioquellen der Rest wird extra eingelesen
|
||||||
|
$hash->{helper}{sources} = [];
|
||||||
|
my $i = 4;
|
||||||
|
|
||||||
|
foreach my $payload ( @{$decode_json->{payload}} ) {
|
||||||
|
|
||||||
|
if( $payload->{sid} eq "1024" ) {
|
||||||
|
|
||||||
|
$i += 2;
|
||||||
|
InternalTimer( gettimeofday()+$i, 'HEOSMaster_GetServers', $hash, 0 );
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - GetServers in $i seconds";
|
||||||
|
|
||||||
|
} elsif( $payload->{sid} eq "1025" ) {
|
||||||
|
|
||||||
|
$i += 2;
|
||||||
|
InternalTimer( gettimeofday()+$i, 'HEOSMaster_GetPlaylists', $hash, 0 );
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - GetPlaylists in $i seconds";
|
||||||
|
|
||||||
|
} elsif( $payload->{sid} eq "1026" ) {
|
||||||
|
|
||||||
|
$i += 2;
|
||||||
|
InternalTimer( gettimeofday()+$i, 'HEOSMaster_GetHistory', $hash, 0 );
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - GetHistory in $i seconds";
|
||||||
|
|
||||||
|
} elsif( $payload->{sid} eq "1027" ) {
|
||||||
|
|
||||||
|
$i += 2;
|
||||||
|
InternalTimer( gettimeofday()+$i, 'HEOSMaster_GetInputs', $hash, 0 );
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - GetInputs in $i seconds";
|
||||||
|
|
||||||
|
} elsif( $payload->{sid} eq "1028" ) {
|
||||||
|
|
||||||
|
$i += 2;
|
||||||
|
InternalTimer( gettimeofday()+$i, 'HEOSMaster_GetFavorites', $hash, 0 );
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - GetFavorites in $i seconds";
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
#Radios
|
||||||
|
push( @{$hash->{helper}{sources}},$payload);
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - GetRadioSource {$payload->{name} with sid $payload->{sid}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Log3 $name, 3, "HEOSMaster ($name) - call Sourcebrowser";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if( $decode_json->{heos}{command} =~ /^browse\/browse/ and ref($decode_json->{payload}) eq "ARRAY" and scalar(@{$decode_json->{payload}}) > 0) {
|
||||||
|
|
||||||
|
my %message = map split("=",$_), split('&', $decode_json->{heos}{message});
|
||||||
|
|
||||||
|
if( exists $message{sid} ) {
|
||||||
|
if( $message{sid} eq '1028' ) {
|
||||||
|
|
||||||
|
#Favoriten einlesen
|
||||||
|
$hash->{helper}{favorites} = $decode_json->{payload};
|
||||||
|
my @keys = (keys %defs);
|
||||||
|
my @pids = map { $_->{PID} } grep { $_->{TYPE} =~ /HEOSPlayer/i } @defs{@keys};
|
||||||
|
|
||||||
|
#Nachricht an die Player das die Favoriten sich geändert haben
|
||||||
|
foreach my $pid (@pids) {
|
||||||
|
|
||||||
|
$json = '{"heos": {"command": "event/favorites_changed", "message": "pid='.$pid.'"}}';
|
||||||
|
Dispatch($hash,$json,undef);
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - call Dispatcher for Favorites Changed";
|
||||||
|
}
|
||||||
|
|
||||||
|
} elsif( $message{sid} eq '1026' ) {
|
||||||
|
|
||||||
|
#History einlesen
|
||||||
|
$hash->{helper}{history} = $decode_json->{payload};
|
||||||
|
|
||||||
|
} elsif( $message{sid} eq '1025' ) {
|
||||||
|
|
||||||
|
#Playlisten einlesen
|
||||||
|
$hash->{helper}{playlists} = $decode_json->{payload};
|
||||||
|
|
||||||
|
} elsif( $message{sid} eq '1027' ) {
|
||||||
|
|
||||||
|
#Inputs einlesen
|
||||||
|
push( @{$hash->{helper}{sources}}, map { $_->{name} .= " AUX"; $_ } (@{$decode_json->{payload}}) );
|
||||||
|
|
||||||
|
} elsif( $message{sid} eq '1024' ) {
|
||||||
|
|
||||||
|
#Lokal einlesen
|
||||||
|
push( @{$hash->{helper}{sources}}, map { $_->{name} .= " USB" if ( $_->{sid} < 0 ); $_ } (@{$decode_json->{payload}}) );
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
#aktuellen Input/Media einlesen
|
||||||
|
$hash->{helper}{media} = $decode_json->{payload};
|
||||||
|
}
|
||||||
|
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - call Browser with sid $message{sid} and $message{returned} items from $message{count} items";
|
||||||
|
|
||||||
|
if( $message{returned} < $message{count} ) {
|
||||||
|
|
||||||
|
HEOSMaster_Write($hash,'browseSource',"sid=.$message{sid}&range=.$message{returned}");
|
||||||
|
Log3 $name, 3, "HEOSMaster ($name) - call Browser search next Range for $message{sid} => $message{returned}";
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#Quellen neu einlesen
|
||||||
|
if( $decode_json->{heos}{command} =~ /^event\/sources_changed/ ) {
|
||||||
|
|
||||||
|
#InternalTimer( gettimeofday()+5, 'HEOSMaster_GetMusicSources', $hash, 0 );
|
||||||
|
HEOSMaster_Write($hash,'getMusicSources',undef);
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - source changed";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
#Player neu einlesen
|
||||||
|
if( $decode_json->{heos}{command} =~ /^event\/players_changed/ ) {
|
||||||
|
|
||||||
|
#InternalTimer( gettimeofday()+5, 'HEOSMaster_GetPlayers', $hash, 0 );
|
||||||
|
HEOSMaster_Write($hash,'getPlayers',undef);
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - player changed";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
#User neu einlesen
|
||||||
|
if( $decode_json->{heos}{command} =~ /^event\/user_changed/ ) {
|
||||||
|
#InternalTimer( gettimeofday()+5, 'HEOSMaster_CheckAccount', $hash, 0 );
|
||||||
|
HEOSMaster_Write($hash,'checkAccount',undef);
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - user changed";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if( $decode_json->{heos}{command} =~ /^player/ or $decode_json->{heos}{command} =~ /^event\/player/ or $decode_json->{heos}{command} =~ /^group/ or $decode_json->{heos}{command} =~ /^event\/group/ or $decode_json->{heos}{command} =~ /^event\/repeat_mode_changed/ or $decode_json->{heos}{command} =~ /^event\/shuffle_mode_changed/ ) {
|
if( $decode_json->{heos}{command} =~ /^player/ or $decode_json->{heos}{command} =~ /^event\/player/ or $decode_json->{heos}{command} =~ /^group/ or $decode_json->{heos}{command} =~ /^event\/group/ or $decode_json->{heos}{command} =~ /^event\/repeat_mode_changed/ or $decode_json->{heos}{command} =~ /^event\/shuffle_mode_changed/ ) {
|
||||||
if( $decode_json->{heos}{command} =~ /^player/ and ref($decode_json->{payload}) eq "ARRAY" and scalar(@{$decode_json->{payload}}) > 0) {
|
|
||||||
|
if( ref($decode_json->{payload}) eq "ARRAY" ) {
|
||||||
|
|
||||||
foreach my $payload (@{$decode_json->{payload}}) {
|
return Log3 $name, 4, "HEOSMaster ($name) - empty ARRAY received"
|
||||||
|
unless(scalar(@{$decode_json->{payload}}) > 0);
|
||||||
$json = '{"pid": "';
|
|
||||||
$json .= "$payload->{pid}";
|
if( $decode_json->{heos}{command} =~ /^player/ ) {
|
||||||
$json .= '","heos": {"command": "player/get_players"}}';
|
|
||||||
|
|
||||||
Dispatch($hash,$json,undef);
|
|
||||||
Log3 $name, 4, "HEOSMaster ($name) - call Dispatcher";
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
|
|
||||||
} elsif( $decode_json->{heos}{command} =~ /^group/ and ref($decode_json->{payload}) eq "ARRAY" and scalar(@{$decode_json->{payload}}) > 0) {
|
|
||||||
|
|
||||||
foreach my $payload (@{$decode_json->{payload}}) {
|
foreach my $payload (@{$decode_json->{payload}}) {
|
||||||
|
|
||||||
$json = '{"gid": "';
|
$json = '{"pid": "';
|
||||||
$json .= "$payload->{gid}";
|
$json .= "$payload->{pid}";
|
||||||
$json .= '","heos": {"command": "group/get_groups"}}';
|
$json .= '","heos": {"command": "player/get_players"}}';
|
||||||
|
|
||||||
Dispatch($hash,$json,undef);
|
Dispatch($hash,$json,undef);
|
||||||
Log3 $name, 4, "HEOSMaster ($name) - call Dispatcher";
|
Log3 $name, 4, "HEOSMaster ($name) - call Dispatcher";
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
} elsif( $decode_json->{heos}{command} =~ /^group/ ) {
|
||||||
|
|
||||||
|
|
||||||
|
foreach my $payload (@{$decode_json->{payload}}) {
|
||||||
|
|
||||||
|
$json = '{"gid": "';
|
||||||
|
$json .= "$payload->{gid}";
|
||||||
|
$json .= '","heos": {"command": "group/get_groups"}}';
|
||||||
|
|
||||||
|
Dispatch($hash,$json,undef);
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - call Dispatcher";
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
|
||||||
|
|
||||||
} elsif( defined($decode_json->{payload}{pid}) ) {
|
} elsif( defined($decode_json->{payload}{pid}) ) {
|
||||||
|
|
||||||
Dispatch($hash,$json,undef);
|
Dispatch($hash,$json,undef);
|
||||||
@ -576,6 +796,53 @@ sub HEOSMaster_WriteReadings($$) {
|
|||||||
###################
|
###################
|
||||||
### my little Helpers
|
### my little Helpers
|
||||||
|
|
||||||
|
sub HEOSMaster_ParseMsg($$) {
|
||||||
|
|
||||||
|
my ($hash, $buffer) = @_;
|
||||||
|
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
my $open = 0;
|
||||||
|
my $close = 0;
|
||||||
|
my $msg = '';
|
||||||
|
my $tail = '';
|
||||||
|
|
||||||
|
|
||||||
|
if($buffer) {
|
||||||
|
foreach my $c (split //, $buffer) {
|
||||||
|
if($open == $close && $open > 0) {
|
||||||
|
$tail .= $c;
|
||||||
|
Log3 $name, 5, "HEOSMaster ($name) - $open == $close && $open > 0";
|
||||||
|
|
||||||
|
} elsif(($open == $close) && ($c ne '{')) {
|
||||||
|
|
||||||
|
Log3 $name, 5, "HEOSMaster ($name) - Garbage character before message: " . $c;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if($c eq '{') {
|
||||||
|
|
||||||
|
$open++;
|
||||||
|
|
||||||
|
} elsif($c eq '}') {
|
||||||
|
|
||||||
|
$close++;
|
||||||
|
}
|
||||||
|
|
||||||
|
$msg .= $c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if($open != $close) {
|
||||||
|
|
||||||
|
$tail = $msg;
|
||||||
|
$msg = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Log3 $name, 5, "HEOSMaster ($name) - return msg: $msg and tail: $tail";
|
||||||
|
return ($msg,$tail);
|
||||||
|
}
|
||||||
|
|
||||||
sub HEOSMaster_PreProcessingReadings($$) {
|
sub HEOSMaster_PreProcessingReadings($$) {
|
||||||
|
|
||||||
my ($hash,$decode_json) = @_;
|
my ($hash,$decode_json) = @_;
|
||||||
@ -636,8 +903,6 @@ sub HEOSMaster_GetPlayers($) {
|
|||||||
|
|
||||||
HEOSMaster_Write($hash,'getPlayers',undef);
|
HEOSMaster_Write($hash,'getPlayers',undef);
|
||||||
Log3 $name, 4, "HEOSMaster ($name) - getPlayers";
|
Log3 $name, 4, "HEOSMaster ($name) - getPlayers";
|
||||||
|
|
||||||
InternalTimer( gettimeofday()+2, 'HEOSMaster_EnableChangeEvents', $hash, 0 );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sub HEOSMaster_GetGroups($) {
|
sub HEOSMaster_GetGroups($) {
|
||||||
@ -664,6 +929,84 @@ sub HEOSMaster_EnableChangeEvents($) {
|
|||||||
Log3 $name, 4, "HEOSMaster ($name) - set enableChangeEvents on";
|
Log3 $name, 4, "HEOSMaster ($name) - set enableChangeEvents on";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub HEOSMaster_GetMusicSources($) {
|
||||||
|
|
||||||
|
my $hash = shift;
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
RemoveInternalTimer($hash, 'HEOSMaster_GetMusicSources');
|
||||||
|
|
||||||
|
HEOSMaster_Write($hash,'getMusicSources',undef);
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - getMusicSources";
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
sub HEOSMaster_GetFavorites($) {
|
||||||
|
|
||||||
|
my $hash = shift;
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
RemoveInternalTimer($hash, 'HEOSMaster_GetFavorites');
|
||||||
|
|
||||||
|
HEOSMaster_Write($hash,'browseSource','sid=1028');
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - getFavorites";
|
||||||
|
}
|
||||||
|
|
||||||
|
sub HEOSMaster_GetInputs($) {
|
||||||
|
|
||||||
|
my $hash = shift;
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
RemoveInternalTimer($hash, 'HEOSMaster_GetInputs');
|
||||||
|
|
||||||
|
HEOSMaster_Write($hash,'browseSource','sid=1027');
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - getInputs";
|
||||||
|
}
|
||||||
|
|
||||||
|
sub HEOSMaster_GetServers($) {
|
||||||
|
|
||||||
|
my $hash = shift;
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
RemoveInternalTimer($hash, 'HEOSMaster_GetServers');
|
||||||
|
|
||||||
|
HEOSMaster_Write($hash,'browseSource','sid=1024');
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - getServers";
|
||||||
|
}
|
||||||
|
|
||||||
|
sub HEOSMaster_GetPlaylists($) {
|
||||||
|
|
||||||
|
my $hash = shift;
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
RemoveInternalTimer($hash, 'HEOSMaster_GetPlaylists');
|
||||||
|
|
||||||
|
HEOSMaster_Write($hash,'browseSource','sid=1025');
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - getPlaylists";
|
||||||
|
}
|
||||||
|
|
||||||
|
sub HEOSMaster_GetHistory($) {
|
||||||
|
|
||||||
|
my $hash = shift;
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
RemoveInternalTimer($hash, 'HEOSMaster_GetHistory');
|
||||||
|
|
||||||
|
HEOSMaster_Write($hash,'browseSource','sid=1026');
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - getHistory";
|
||||||
|
}
|
||||||
|
|
||||||
|
sub HEOSMaster_CheckAccount($) {
|
||||||
|
|
||||||
|
my $hash = shift;
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
RemoveInternalTimer($hash, 'HEOSMaster_CheckAccount');
|
||||||
|
|
||||||
|
HEOSMaster_Write($hash,'checkAccount',undef);
|
||||||
|
Log3 $name, 4, "HEOSMaster ($name) - checkAccount";
|
||||||
|
}
|
||||||
|
|
||||||
sub HEOSMaster_StorePassword($$) {
|
sub HEOSMaster_StorePassword($$) {
|
||||||
|
|
||||||
my ($hash, $password) = @_;
|
my ($hash, $password) = @_;
|
||||||
|
|||||||
304
21_HEOSPlayer.pm
304
21_HEOSPlayer.pm
@ -5,6 +5,10 @@
|
|||||||
# (c) 2017 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
# (c) 2017 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||||
# All rights reserved
|
# All rights reserved
|
||||||
#
|
#
|
||||||
|
# Special thanks goes to comitters:
|
||||||
|
# - Olaf Schnicke
|
||||||
|
#
|
||||||
|
#
|
||||||
# This script is free software; you can redistribute it and/or modify
|
# This script is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
@ -34,7 +38,7 @@ use JSON qw(decode_json);
|
|||||||
use Encode qw(encode_utf8);
|
use Encode qw(encode_utf8);
|
||||||
|
|
||||||
|
|
||||||
my $version = "0.1.47";
|
my $version = "0.1.55";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -53,6 +57,7 @@ sub HEOSPlayer_GetPlayState($);
|
|||||||
sub HEOSPlayer_GetNowPlayingMedia($);
|
sub HEOSPlayer_GetNowPlayingMedia($);
|
||||||
sub HEOSPlayer_GetPlayMode($);
|
sub HEOSPlayer_GetPlayMode($);
|
||||||
sub HEOSPlayer_GetVolume($);
|
sub HEOSPlayer_GetVolume($);
|
||||||
|
sub HEOSPlayer_Get($$@);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -62,7 +67,7 @@ sub HEOSPlayer_Initialize($) {
|
|||||||
|
|
||||||
my ($hash) = @_;
|
my ($hash) = @_;
|
||||||
|
|
||||||
$hash->{Match} = '.*{"command":."player.*|.*{"command":."event/player.*|.*{"command":."event\/repeat_mode_changed.*|.*{"command":."event\/shuffle_mode_changed.*';
|
$hash->{Match} = '.*{"command":."player.*|.*{"command":."event/player.*|.*{"command":."event\/repeat_mode_changed.*|.*{"command":."event\/shuffle_mode_changed.*|.*{"command":."event\/favorites_changed.*';
|
||||||
|
|
||||||
# Provider
|
# Provider
|
||||||
$hash->{SetFn} = "HEOSPlayer_Set";
|
$hash->{SetFn} = "HEOSPlayer_Set";
|
||||||
@ -215,6 +220,56 @@ sub HEOSPlayer_Attr(@) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub HEOSPlayer_Get($$@) {
|
||||||
|
|
||||||
|
my ($hash, $name, @aa) = @_;
|
||||||
|
my ($cmd, @args) = @aa;
|
||||||
|
|
||||||
|
my $pid = $hash->{PID};
|
||||||
|
my $result = "";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#Leerzeichen müßen für die Rückgabe escaped werden sonst werden sie falsch angezeigt
|
||||||
|
if( $cmd eq 'playlists' ) {
|
||||||
|
|
||||||
|
#gibt die Playlisten durch Komma getrennt zurück
|
||||||
|
my @playlists = map { my %n; $n{name} = $_->{name}; $n{name} =~ s/\s+/\ /g; $n{name} } (@{ $hash->{IODev}{helper}{playlists}});
|
||||||
|
|
||||||
|
$result .= join(",",@playlists) if( scalar @playlists > 0 );
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'channels' ) {
|
||||||
|
|
||||||
|
#gibt die Favoriten durch Komma getrennt zurück
|
||||||
|
my @channels = map { my %n; $n{name} = $_->{name}; $n{name} =~ s/\s+/\ /g; $n{name} } (@{ $hash->{IODev}{helper}{favorites}});
|
||||||
|
|
||||||
|
$result .= join(",",@channels) if( scalar @channels > 0 );
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'channelscount' ) {
|
||||||
|
|
||||||
|
#gibt die Favoritenanzahl zurück
|
||||||
|
return scalar(@{$hash->{IODev}{helper}{favorites}}) if ( defined $hash->{IODev}{helper}{favorites} );
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'inputs' ) {
|
||||||
|
|
||||||
|
#gibt die Quellen durch Komma getrennt zurück
|
||||||
|
my @inputs = map { my %n; $n{name} = $_->{name}; $n{name} =~ s/\s+/\ /g; $n{name} } (@{ $hash->{IODev}{helper}{sources}});
|
||||||
|
|
||||||
|
$result .= join(",",@inputs) if( scalar @inputs > 0 );
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
my $list = 'playlists:noArg channels:noArg channelscount:noArg inputs:noArg';
|
||||||
|
|
||||||
|
return "Unknown argument $cmd, choose one of $list";
|
||||||
|
}
|
||||||
|
|
||||||
sub HEOSPlayer_Set($$@) {
|
sub HEOSPlayer_Set($$@) {
|
||||||
|
|
||||||
my ($hash, $name, @aa) = @_;
|
my ($hash, $name, @aa) = @_;
|
||||||
@ -224,7 +279,7 @@ sub HEOSPlayer_Set($$@) {
|
|||||||
my $action;
|
my $action;
|
||||||
my $heosCmd;
|
my $heosCmd;
|
||||||
my $rvalue;
|
my $rvalue;
|
||||||
my $string = "pid=$pid";
|
my $favcount = 1;
|
||||||
|
|
||||||
|
|
||||||
if( $cmd eq 'getPlayerInfo' ) {
|
if( $cmd eq 'getPlayerInfo' ) {
|
||||||
@ -324,13 +379,229 @@ sub HEOSPlayer_Set($$@) {
|
|||||||
|
|
||||||
$heosCmd = $cmd;
|
$heosCmd = $cmd;
|
||||||
$action = "step=$args[0]";
|
$action = "step=$args[0]";
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'groupWithMember' ) {
|
||||||
|
return "usage: groupWithMember" if( @args != 1 );
|
||||||
|
|
||||||
|
$pid .= ",$defs{$args[0]}->{PID}";
|
||||||
|
$heosCmd = 'createGroup';
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'next' ) {
|
||||||
|
|
||||||
|
return "usage: next" if( @args != 0 );
|
||||||
|
$heosCmd = 'playNext';
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'prev' ) {
|
||||||
|
|
||||||
|
return "usage: prev" if( @args != 0 );
|
||||||
|
$heosCmd = 'playPrev';
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'reReadSources' ) {
|
||||||
|
|
||||||
|
return "usage: reReadSources" if( @args != 0 );
|
||||||
|
$heosCmd = 'getMusicSources';
|
||||||
|
|
||||||
|
} elsif ( $cmd eq 'channel' ) {
|
||||||
|
|
||||||
|
return "usage: channel 1-$favcount" if( @args != 1 );
|
||||||
|
$favcount = scalar(@{$hash->{IODev}{helper}{favorites}}) if ( defined $hash->{IODev}{helper}{favorites} );
|
||||||
|
|
||||||
|
$heosCmd = 'playPresetStation';
|
||||||
|
$action = "preset=$args[0]";
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'channelUp' ) {
|
||||||
|
|
||||||
|
return "usage: channelUp" if( @args != 0 );
|
||||||
|
$favcount = scalar(@{$hash->{IODev}{helper}{favorites}}) if ( defined $hash->{IODev}{helper}{favorites} );
|
||||||
|
|
||||||
|
$heosCmd = 'playPresetStation';
|
||||||
|
my $fav = ReadingsVal($name,"channel", 0) + 1;
|
||||||
|
$fav = $favcount if ( $fav > $favcount);
|
||||||
|
$action = "preset=".$fav;
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'channelDown' ) {
|
||||||
|
|
||||||
|
return "usage: channelDown" if( @args != 0 );
|
||||||
|
|
||||||
|
$heosCmd = 'playPresetStation';
|
||||||
|
my $fav = ReadingsVal($name,"channel", 0) - 1;
|
||||||
|
$fav = 1 if ($fav <= 0);
|
||||||
|
$action = "preset=".$fav;
|
||||||
|
|
||||||
|
} elsif ( $cmd eq 'playlist' ) {
|
||||||
|
|
||||||
|
my @cids = map { $_->{cid} } grep { $_->{name} =~ /$args[0]/i } (@{ $hash->{IODev}{helper}{playlists} });
|
||||||
|
|
||||||
|
if ( scalar @args == 1 && scalar @cids == 1 ) {
|
||||||
|
|
||||||
|
$heosCmd = 'playPlaylist';
|
||||||
|
$action = "sid=1025&cid=$cids[0]&aid=4";
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
my @playlists = map { $_->{name} } (@{ $hash->{IODev}{helper}{playlists}});
|
||||||
|
return "usage: playlist ".join(",",@playlists);
|
||||||
|
}
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'input' ) {
|
||||||
|
|
||||||
|
my $search = $args[0];
|
||||||
|
my @sids = map { $_->{sid} } grep { $_->{name} =~ /$search/i } (@{ $hash->{IODev}{helper}{sources} });
|
||||||
|
|
||||||
|
#$search =~ s/\s+/\ /g;
|
||||||
|
$search =~ s/\xC2\xA0/ /g;
|
||||||
|
|
||||||
|
#print "Suchkriterium\n".Dumper($search);
|
||||||
|
#print hexdump(\$search);
|
||||||
|
#print "Quellen\n".Dumper($hash->{IODev}{helper}{sources});
|
||||||
|
|
||||||
|
if ( scalar @args == 1 && scalar @sids == 1 ) {
|
||||||
|
|
||||||
|
readingsSingleUpdate($hash, "input", $args[0], 1);
|
||||||
|
#sid des Input für Container merken
|
||||||
|
readingsSingleUpdate($hash, ".input", $sids[0], 1);
|
||||||
|
#alten Container löschen bei Inputwechsel
|
||||||
|
readingsSingleUpdate($hash, ".cid", 0, 1);
|
||||||
|
|
||||||
|
$heosCmd = 'browseSource';
|
||||||
|
$action = "sid=$sids[0]";
|
||||||
|
|
||||||
|
Log3 $name, 4, "HEOSPlayer ($name) - set input with sid $sids[0] and name $args[0]";
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
my @inputs = map { $_->{name} } (@{ $hash->{IODev}{helper}{sources}});
|
||||||
|
return "usage: input ".join(",",@inputs);
|
||||||
|
}
|
||||||
|
|
||||||
|
} elsif( $cmd eq 'media' ) {
|
||||||
|
|
||||||
|
if ( scalar @args == 1 ) {
|
||||||
|
|
||||||
|
#sid des Input holen
|
||||||
|
my $sid = ReadingsVal($name,".input", undef);
|
||||||
|
return "usage: set input first" unless( defined($sid) );
|
||||||
|
|
||||||
|
my $search = $args[0];
|
||||||
|
$search =~ s/\xC2\xA0/ /g;
|
||||||
|
|
||||||
|
#print "Suchkriterium\n".Dumper($search);
|
||||||
|
#print hexdump(\$search);
|
||||||
|
#print "Medien\n".Dumper($hash->{IODev}{helper}{media});
|
||||||
|
|
||||||
|
my @ids = grep { $_->{name} =~ /\Q$search\E/i } (@{ $hash->{IODev}{helper}{media} });
|
||||||
|
#print "gefundenes Medium\n".Dumper(@ids);
|
||||||
|
|
||||||
|
if ( scalar @ids == 1 ) {
|
||||||
|
if ( exists $ids[0]{cid} ) {
|
||||||
|
#hier Container verarbeiten
|
||||||
|
if ( $ids[0]{playable} eq "yes" ) {
|
||||||
|
|
||||||
|
#alles abspielen
|
||||||
|
$heosCmd = 'playPlaylist';
|
||||||
|
$action = "sid=$sid&cid=$ids[0]{cid}&aid=4";
|
||||||
|
#Container merken
|
||||||
|
readingsSingleUpdate($hash, ".cid", 0, 1);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
#mehr einlesen
|
||||||
|
readingsSingleUpdate($hash, ".cid", $ids[0]{cid}, 1);
|
||||||
|
$heosCmd = 'browseSource';
|
||||||
|
$action = "sid=$sid&cid=$ids[0]{cid}";
|
||||||
|
}
|
||||||
|
|
||||||
|
} elsif ( exists $ids[0]{mid} ) {
|
||||||
|
#hier Medien verarbeiten
|
||||||
|
if ( $ids[0]{mid} =~ /inputs\// ) {
|
||||||
|
|
||||||
|
#Input abspielen
|
||||||
|
$heosCmd = 'playInput';
|
||||||
|
$action = "input=$ids[0]{mid}";
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
#aktuellen Container holen
|
||||||
|
my $cid = ReadingsVal($name,".cid", undef);
|
||||||
|
if ( defined $cid ) {
|
||||||
|
if ( $ids[0]{type} eq "station" ) {
|
||||||
|
|
||||||
|
#Radio abspielen
|
||||||
|
$heosCmd = 'playStream';
|
||||||
|
$action = "sid=$sid&cid=$cid&mid=$ids[0]{mid}";
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
#Song abspielen
|
||||||
|
$heosCmd = 'playPlaylist';
|
||||||
|
$action = "sid=$sid&cid=$cid&mid=$ids[0]{mid}&aid=4";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
my @media = map { $_->{name} } (@{ $hash->{IODev}{helper}{media}});
|
||||||
|
return "usage: media ".join(",",@media);
|
||||||
|
}
|
||||||
|
|
||||||
|
} elsif ( $cmd eq 'clearqueue' ) {
|
||||||
|
|
||||||
|
#löscht die Warteschlange
|
||||||
|
return "usage: clearqueue" if( @args != 0 );
|
||||||
|
$heosCmd = 'clearQueue';
|
||||||
|
|
||||||
|
} elsif ( $cmd eq 'savequeue' ) {
|
||||||
|
|
||||||
|
#speichert die aktuelle Warteschlange als Favorit ab
|
||||||
|
return "usage: savequeue" if( @args != 1 );
|
||||||
|
|
||||||
|
$heosCmd = 'saveQueue name';
|
||||||
|
$action = "name=$args[0]";
|
||||||
|
|
||||||
|
#} elsif( $cmd eq 'sayText' ) {
|
||||||
|
# return "usage: sayText Text" if( @args != 1 );
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
my $list = "getPlayerInfo:noArg getPlayState:noArg getNowPlayingMedia:noArg getPlayMode:noArg play:noArg stop:noArg pause:noArg mute:on,off volume:slider,0,5,100 volumeUp:slider,0,1,10 volumeDown:slider,0,1,10 repeat:one,all,off shuffle:on,off";
|
|
||||||
|
my @playlists;
|
||||||
|
my @inputs;
|
||||||
|
my @media;
|
||||||
|
|
||||||
|
my $list = "getPlayerInfo:noArg getPlayState:noArg getNowPlayingMedia:noArg getPlayMode:noArg play:noArg stop:noArg pause:noArg mute:on,off volume:slider,0,5,100 volumeUp:slider,0,1,10 volumeDown:slider,0,1,10 repeat:one,all,off shuffle:on,off clearqueue:noArg savequeue channelUp:noArg channelDown:noArg ";
|
||||||
|
|
||||||
|
$list .= "groupWithMember:" . join( ",", devspec2array("TYPE=HEOSPlayer:FILTER=NAME!=$name") );
|
||||||
|
|
||||||
|
#Parameterlisten für FHEMWeb zusammen bauen
|
||||||
|
$list .= " channel:slider,1,1,".scalar(@{$hash->{IODev}{helper}{favorites}}) if ( defined $hash->{IODev}{helper}{favorites} );
|
||||||
|
|
||||||
|
if ( defined $hash->{IODev}{helper}{playlists} ) {
|
||||||
|
|
||||||
|
@playlists = map { my %n; $n{name} = $_->{name}; $n{name} =~ s/\s+/\ /g; $n{name} } (@{ $hash->{IODev}{helper}{playlists}});
|
||||||
|
$list .= " playlist:".join(",",@playlists) if( scalar @playlists > 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( defined $hash->{IODev}{helper}{sources}) {
|
||||||
|
|
||||||
|
@inputs = map { my %n; $n{name} = $_->{name}; $n{name} =~ s/\s+/\ /g; $n{name} } (@{ $hash->{IODev}{helper}{sources}});
|
||||||
|
$list .= " input:".join(",",@inputs) if( scalar @inputs > 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( defined $hash->{IODev}{helper}{media}) {
|
||||||
|
|
||||||
|
@media = map { my %n; $n{name} = $_->{name}; $n{name} =~ s/\s+/\ /g; $n{name} } (@{ $hash->{IODev}{helper}{media}});
|
||||||
|
push(@media,"Alle") if grep { $_->{container} =~ /yes/i && $_->{playable} =~ /yes/i} (@{ $hash->{IODev}{helper}{media} });
|
||||||
|
#print "#####################################################\n".Dumper(@media);
|
||||||
|
$list .= " media:".join(",",@media) if( scalar @media > 0 );
|
||||||
|
}
|
||||||
|
|
||||||
return "Unknown argument $cmd, choose one of $list";
|
return "Unknown argument $cmd, choose one of $list";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
my $string = "pid=$pid";
|
||||||
$string .= "&$action" if( defined($action));
|
$string .= "&$action" if( defined($action));
|
||||||
|
|
||||||
IOWrite($hash,"$heosCmd","$string");
|
IOWrite($hash,"$heosCmd","$string");
|
||||||
@ -365,12 +636,9 @@ sub HEOSPlayer_Parse($$) {
|
|||||||
|
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
#IOWrite($hash,'getPlayerInfo',"pid=$hash->{PID}");
|
IOWrite($hash,'getPlayerInfo',"pid=$hash->{PID}");
|
||||||
#IOWrite($hash,'getPlayState',"pid=$hash->{PID}"); Erst mal schauen ob es ohne das geht, wenn nicht wieder aktivieren
|
|
||||||
#IOWrite($hash,'getNowPlayingMedia',"pid=$hash->{PID}");
|
|
||||||
|
|
||||||
Log3 $name, 4, "HEOSPlayer ($name) - find logical device: $hash->{NAME}";
|
Log3 $name, 4, "HEOSPlayer ($name) - find logical device: $hash->{NAME}";
|
||||||
Log3 $name, 5, "HEOSPlayer ($name) - PID direkt im root von decode_json gefunden";
|
Log3 $name, 4, "HEOSPlayer ($name) - find PID in root from decode_json";
|
||||||
|
|
||||||
return $hash->{NAME};
|
return $hash->{NAME};
|
||||||
|
|
||||||
@ -476,6 +744,11 @@ sub HEOSPlayer_WriteReadings($$) {
|
|||||||
readingsBulkUpdate( $hash, 'currentSid', $decode_json->{payload}{sid} );
|
readingsBulkUpdate( $hash, 'currentSid', $decode_json->{payload}{sid} );
|
||||||
readingsBulkUpdate( $hash, 'currentStation', $decode_json->{payload}{station} );
|
readingsBulkUpdate( $hash, 'currentStation', $decode_json->{payload}{station} );
|
||||||
|
|
||||||
|
#sucht in den Favoriten nach der aktuell gespielten Radiostation und aktualisiert den channel wenn diese enthalten ist
|
||||||
|
my @presets = map { $_->{name} } (@{ $hash->{IODev}{helper}{favorites} });
|
||||||
|
my $search = ReadingsVal($name,"currentStation" ,undef);
|
||||||
|
my( @index )= grep { $presets[$_] eq $search } 0..$#presets if ( defined $search );
|
||||||
|
readingsBulkUpdate( $hash, 'channel', $index[0]+1 ) if ( scalar @index > 0 );
|
||||||
|
|
||||||
readingsBulkUpdate( $hash, 'state', 'on' );
|
readingsBulkUpdate( $hash, 'state', 'on' );
|
||||||
readingsEndUpdate( $hash, 1 );
|
readingsEndUpdate( $hash, 1 );
|
||||||
@ -562,10 +835,20 @@ sub HEOSPlayer_PreProcessingReadings($$) {
|
|||||||
my @value = split('&', $decode_json->{heos}{message});
|
my @value = split('&', $decode_json->{heos}{message});
|
||||||
$buffer{'shuffle'} = substr($value[1],8);
|
$buffer{'shuffle'} = substr($value[1],8);
|
||||||
|
|
||||||
} elsif ( $decode_json->{heos}{command} =~ /player_now_playing_changed/ ) {
|
} elsif ( $decode_json->{heos}{command} =~ /player_now_playing_changed/ or $decode_json->{heos}{command} =~ /favorites_changed/ ) {
|
||||||
|
|
||||||
IOWrite($hash,'getNowPlayingMedia',"pid=$hash->{PID}");
|
IOWrite($hash,'getNowPlayingMedia',"pid=$hash->{PID}");
|
||||||
|
|
||||||
|
} elsif ( $decode_json->{heos}{command} =~ /play_preset/ ) {
|
||||||
|
|
||||||
|
my @value = split('&', $decode_json->{heos}{message});
|
||||||
|
$buffer{'channel'} = substr($value[1],7);
|
||||||
|
|
||||||
|
} elsif ( $decode_json->{heos}{command} =~ /play_input/ ) {
|
||||||
|
|
||||||
|
my @value = split('&', $decode_json->{heos}{message});
|
||||||
|
$buffer{'input'} = substr($value[1],6);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
Log3 $name, 3, "HEOSPlayer ($name) - no match found";
|
Log3 $name, 3, "HEOSPlayer ($name) - no match found";
|
||||||
@ -630,4 +913,5 @@ sub HEOSPlayer_GetVolume($) {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user