2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00

75_MSG,msgSchema: move default title to msgSchema and remove default title for modules without explicit title support

git-svn-id: https://svn.fhem.de/fhem/trunk@10393 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-01-07 01:21:48 +00:00
parent 4a5306d13c
commit 58e4aa5b68
2 changed files with 864 additions and 675 deletions

File diff suppressed because it is too large Load Diff

View File

@ -35,252 +35,289 @@ use warnings;
# FHEM module schema definitions for messaging commands
my $db = {
'audio' => {
'audio' => {
'AMAD' => {
'Normal' => 'set %DEVICE% ttsMsg %MSG%',
'ShortPrio' => 'set %DEVICE% ttsMsg %MSGSH%',
'Short' => 'set %DEVICE% ttsMsg %MSGSH%',
'defaultValues' => {
'ShortPrio' => {
'MSGSH' => 'Achtung!',
'AMAD' => {
'Normal' => 'set %DEVICE% ttsMsg %MSG%',
'ShortPrio' => 'set %DEVICE% ttsMsg %MSGSH%',
'Short' => 'set %DEVICE% ttsMsg %MSGSH%',
'defaultValues' => {
'ShortPrio' => {
'MSGSH' => 'Achtung!',
},
'Short' => {
'MSGSH' => 'Hinweis!',
},
},
},
'Short' => {
'MSGSH' => 'Hinweis!',
'SB_PLAYER' => {
'Normal' => 'set %DEVICE% talk |%TITLE%| %MSG%',
'ShortPrio' => 'set %DEVICE% talk |%TITLE%| %MSGSH%',
'Short' => 'set %DEVICE% talk |%TITLE%| %MSGSH%',
'defaultValues' => {
'Normal' => {
'TITLE' => 'Announcement',
},
'ShortPrio' => {
'MSGSH' => 'Achtung!',
'TITLE' => 'Announcement',
},
'Short' => {
'MSGSH' => '',
'TITLE' => 'Announcement',
},
},
},
},
'SONOSPLAYER' => {
'Normal' => 'set %DEVICE% Speak %VOLUME% %LANG% |%TITLE%| %MSG%',
'ShortPrio' =>
'set %DEVICE% Speak %VOLUME% %LANG% |%TITLE%| %MSGSH%',
'Short' => 'set %DEVICE% Speak %VOLUME% %LANG% |%TITLE%| %MSGSH%',
'defaultValues' => {
'Normal' => {
'VOLUME' => 38,
'LANG' => 'de',
'TITLE' => 'Announcement',
},
'ShortPrio' => {
'VOLUME' => 33,
'LANG' => 'de',
'MSGSH' => 'Achtung!',
'TITLE' => 'Announcement',
},
'Short' => {
'VOLUME' => 28,
'LANG' => 'de',
'MSGSH' => '',
'TITLE' => 'Announcement',
},
},
},
'Text2Speech' => {
'Normal' => 'set %DEVICE% tts %MSG%',
'ShortPrio' => 'set %DEVICE% tts %MSGSH%',
'Short' => 'set %DEVICE% tts %MSGSH%',
'defaultValues' => {
'ShortPrio' => {
'MSGSH' => 'Achtung!',
},
'Short' => {
'MSGSH' => 'Hinweis!',
},
},
},
},
'SB_PLAYER' => {
'Normal' => 'set %DEVICE% talk |%TITLE%| %MSG%',
'ShortPrio' => 'set %DEVICE% talk |%TITLE%| %MSGSH%',
'Short' => 'set %DEVICE% talk |%TITLE%| %MSGSH%',
'defaultValues' => {
'ShortPrio' => {
'MSGSH' => 'Achtung!',
'light' => {
'HUEDevice' => {
'Normal' =>
'{ my $dev=\'%DEVICE%\'; my $state=ReadingsVal($dev,"state","off"); fhem "set $dev blink 2 1"; fhem "sleep 4.25; set $dev:FILTER=state!=$state $state"; }',
'High' =>
'{ my $dev=\'%DEVICE%\'; my $state=ReadingsVal($dev,"state","off"); fhem "set $dev blink 10 1"; fhem "sleep 20.25; set $dev:FILTER=state!=$state $state"; }',
'Low' => 'set %DEVICE% alert select',
},
'Short' => {
'MSGSH' => '',
},
},
},
'SONOSPLAYER' => {
'Normal' => 'set %DEVICE% Speak %VOLUME% %LANG% |%TITLE%| %MSG%',
'ShortPrio' => 'set %DEVICE% Speak %VOLUME% %LANG% |%TITLE%| %MSGSH%',
'Short' => 'set %DEVICE% Speak %VOLUME% %LANG% |%TITLE%| %MSGSH%',
'defaultValues' => {
'Normal' => {
'VOLUME' => 38,
'LANG' => 'de',
'mail' => {
'fhemMsgMail' => {
'Normal' =>
'{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; system("echo \'$msg\' | /usr/bin/mail -s \'$title\' \'$dev\'"); }',
'High' =>
'{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; system("echo \'$msg\' | /usr/bin/mail -s \'$title\' \'$dev\'"); }',
'Low' =>
'{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; system("echo \'$msg\' | /usr/bin/mail -s \'$title\' \'$dev\'"); }',
'defaultValues' => {
'Normal' => {
'TITLE' => 'System Message',
},
'High' => {
'TITLE' => 'System Message',
},
'Low' => {
'TITLE' => 'System Message',
},
},
},
'ShortPrio' => {
'VOLUME' => 33,
'LANG' => 'de',
'MSGSH' => 'Achtung!',
},
'Short' => {
'VOLUME' => 28,
'LANG' => 'de',
'MSGSH' => '',
},
},
},
'Text2Speech' => {
'Normal' => 'set %DEVICE% tts %MSG%',
'ShortPrio' => 'set %DEVICE% tts %MSGSH%',
'Short' => 'set %DEVICE% tts %MSGSH%',
'defaultValues' => {
'ShortPrio' => {
'MSGSH' => 'Achtung!',
'push' => {
'Fhemapppush' => {
'Normal' => 'set %DEVICE% message \'%MSG%\' %ACTION%',
'High' => 'set %DEVICE% message \'%MSG%\' %ACTION%',
'Low' => 'set %DEVICE% message \'%MSG%\' %ACTION%',
'defaultValues' => {
'Normal' => {
'ACTION' => '',
},
'High' => {
'ACTION' => '',
},
'Low' => {
'ACTION' => '',
},
},
},
'Short' => {
'MSGSH' => 'Hinweis!',
'Jabber' => {
'Normal' => 'set %DEVICE% msg %RECIPIENT% %MSG%',
'High' => 'set %DEVICE% msg %RECIPIENT% %MSG%',
'Low' => 'set %DEVICE% msg %RECIPIENT% %MSG%',
},
},
'Pushbullet' => {
'Normal' => 'set %DEVICE% message %MSG% | %TITLE% %RECIPIENT%',
'High' => 'set %DEVICE% message %MSG% | %TITLE% %RECIPIENT%',
'Low' => 'set %DEVICE% message %MSG% | %TITLE% %RECIPIENT%',
'defaultValues' => {
'Normal' => {
'RECIPIENT' => '',
'TITLE' => '',
},
'High' => {
'RECIPIENT' => '',
'TITLE' => '',
},
'Low' => {
'RECIPIENT' => '',
'TITLE' => '',
},
},
},
'PushNotifier' => {
'Normal' => 'set %DEVICE% message %MSG%',
'High' => 'set %DEVICE% message %MSG%',
'Low' => 'set %DEVICE% message %MSG%',
},
'Pushover' => {
'Normal' =>
'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'%Pushover_SOUND%\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%',
'High' =>
'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'%Pushover_SOUND%\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%',
'Low' =>
'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'%Pushover_SOUND%\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%',
'defaultValues' => {
'Normal' => {
'RECIPIENT' => '',
'RETRY' => '',
'EXPIRE' => '',
'URLTITLE' => '',
'ACTION' => '',
'TITLE' => 'System Message',
'Pushover_SOUND' => '',
},
'High' => {
'RECIPIENT' => '',
'RETRY' => '120',
'EXPIRE' => '600',
'URLTITLE' => '',
'ACTION' => '',
'TITLE' => 'System Message',
'Pushover_SOUND' => '',
},
'Low' => {
'RECIPIENT' => '',
'RETRY' => '',
'EXPIRE' => '',
'URLTITLE' => '',
'ACTION' => '',
'TITLE' => 'System Message',
'Pushover_SOUND' => '',
},
},
},
'TelegramBot' => {
'Normal' => 'set %DEVICE% message %RECIPIENT% %MSG%',
'High' => 'set %DEVICE% message %RECIPIENT% %MSG%',
'Low' => 'set %DEVICE% message %RECIPIENT% %MSG%',
'defaultValues' => {
'Normal' => {
'RECIPIENT' => '',
},
'High' => {
'RECIPIENT' => '',
},
'Low' => {
'RECIPIENT' => '',
},
},
},
'yowsup' => {
'Normal' => 'set %DEVICE% send %RECIPIENT% %MSG%',
'High' => 'set %DEVICE% send %RECIPIENT% %MSG%',
'Low' => 'set %DEVICE% send %RECIPIENT% %MSG%',
},
},
},
'screen' => {
'light' => {
'AMAD' => {
'Normal' => 'set %DEVICE% screenMsg %MSG%',
'High' => 'set %DEVICE% screenMsg %MSG%',
'Low' => 'set %DEVICE% screenMsg %MSG%',
},
'ENIGMA2' => {
'Normal' => 'set %DEVICE% msg %ENIGMA2_TYPE% %TIMEOUT% %MSG%',
'High' => 'set %DEVICE% msg %ENIGMA2_TYPE% %TIMEOUT% %MSG%',
'Low' => 'set %DEVICE% msg %ENIGMA2_TYPE% %TIMEOUT% %MSG%',
'defaultValues' => {
'Normal' => {
'ENIGMA2_TYPE' => 'info',
'TIMEOUT' => 8,
},
'High' => {
'ENIGMA2_TYPE' => 'attention',
'TIMEOUT' => 12,
},
'Low' => {
'ENIGMA2_TYPE' => 'message',
'TIMEOUT' => 8,
},
},
},
'XBMC' => {
'Normal' =>
'{ my $dev=\'%DEVICE%\'; my $msg=\'%MSG%\'; $timeout=%TIMEOUT%*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }',
'High' =>
'{ my $dev=\'%DEVICE%\'; my $msg=\'%MSG%\'; $timeout=%TIMEOUT%*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }',
'Low' =>
'{ my $dev=\'%DEVICE%\'; my $msg=\'%MSG%\'; $timeout=%TIMEOUT%*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }',
'defaultValues' => {
'Normal' => {
'TIMEOUT' => 8,
'XBMC_ICON' => 'info',
},
'High' => {
'TIMEOUT' => 12,
'XBMC_ICON' => 'warning',
},
'Low' => {
'TIMEOUT' => 8,
'XBMC_ICON' => '',
},
},
},
'HUEDevice' => {
'Normal' => '{ my $dev=\'%DEVICE%\'; my $state=ReadingsVal($dev,"state","off"); fhem "set $dev blink 2 1"; fhem "sleep 4.25; set $dev:FILTER=state!=$state $state"; }',
'High' => '{ my $dev=\'%DEVICE%\'; my $state=ReadingsVal($dev,"state","off"); fhem "set $dev blink 10 1"; fhem "sleep 20.25; set $dev:FILTER=state!=$state $state"; }',
'Low' => 'set %DEVICE% alert select',
},
},
'mail' => {
'fhemMsgMail' => {
'Normal' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; system("echo \'$msg\' | /usr/bin/mail -s \'$title\' \'$dev\'"); }',
'High' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; system("echo \'$msg\' | /usr/bin/mail -s \'$title\' \'$dev\'"); }',
'Low' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; system("echo \'$msg\' | /usr/bin/mail -s \'$title\' \'$dev\'"); }',
},
},
'push' => {
'Fhemapppush' => {
'Normal' => 'set %DEVICE% message \'%TITLE%: %MSG%\' %ACTION%',
'High' => 'set %DEVICE% message \'%TITLE%: %MSG%\' %ACTION%',
'Low' => 'set %DEVICE% message \'%TITLE%: %MSG%\' %ACTION%',
'defaultValues' => {
'Normal' => {
'ACTION' => '',
},
'High' => {
'ACTION' => '',
},
'Low' => {
'ACTION' => '',
},
},
},
'Jabber' => {
'Normal' => 'set %DEVICE% msg %RECIPIENT% %TITLE%: %MSG%',
'High' => 'set %DEVICE% msg %RECIPIENT% %TITLE%: %MSG%',
'Low' => 'set %DEVICE% msg %RECIPIENT% %TITLE%: %MSG%',
},
'Pushbullet' => {
'Normal' => 'set %DEVICE% message %MSG% | %TITLE% %RECIPIENT%',
'High' => 'set %DEVICE% message %MSG% | %TITLE% %RECIPIENT%',
'Low' => 'set %DEVICE% message %MSG% | %TITLE% %RECIPIENT%',
'defaultValues' => {
'Normal' => {
'RECIPIENT' => '',
},
'High' => {
'RECIPIENT' => '',
},
'Low' => {
'RECIPIENT' => '',
},
},
},
'PushNotifier' => {
'Normal' => 'set %DEVICE% message %TITLE%: %MSG%',
'High' => 'set %DEVICE% message %TITLE%: %MSG%',
'Low' => 'set %DEVICE% message %TITLE%: %MSG%',
},
'Pushover' => {
'Normal' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'%Pushover_SOUND%\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%',
'High' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'%Pushover_SOUND%\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%',
'Low' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'%Pushover_SOUND%\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%',
'defaultValues' => {
'Normal' => {
'RECIPIENT' => '',
'RETRY' => '',
'EXPIRE' => '',
'URLTITLE' => '',
'ACTION' => '',
'Pushover_SOUND' => '',
},
'High' => {
'RECIPIENT' => '',
'RETRY' => '120',
'EXPIRE' => '600',
'URLTITLE' => '',
'ACTION' => '',
'Pushover_SOUND' => '',
},
'Low' => {
'RECIPIENT' => '',
'RETRY' => '',
'EXPIRE' => '',
'URLTITLE' => '',
'ACTION' => '',
'Pushover_SOUND' => '',
},
},
},
'TelegramBot' => {
'Normal' => 'set %DEVICE% message %RECIPIENT% %TITLE%: %MSG%',
'High' => 'set %DEVICE% message %RECIPIENT% %TITLE%: %MSG%',
'Low' => 'set %DEVICE% message %RECIPIENT% %TITLE%: %MSG%',
'defaultValues' => {
'Normal' => {
'RECIPIENT' => '',
},
'High' => {
'RECIPIENT' => '',
},
'Low' => {
'RECIPIENT' => '',
},
},
},
'yowsup' => {
'Normal' => 'set %DEVICE% send %RECIPIENT% %TITLE%: %MSG%',
'High' => 'set %DEVICE% send %RECIPIENT% %TITLE%: %MSG%',
'Low' => 'set %DEVICE% send %RECIPIENT% %TITLE%: %MSG%',
},
},
'screen' => {
'AMAD' => {
'Normal' => 'set %DEVICE% screenMsg %TITLE%: %MSG%',
'High' => 'set %DEVICE% screenMsg %TITLE%: %MSG%',
'Low' => 'set %DEVICE% screenMsg %TITLE%: %MSG%',
},
'ENIGMA2' => {
'Normal' => 'set %DEVICE% msg %ENIGMA2_TYPE% %TIMEOUT% %MSG%',
'High' => 'set %DEVICE% msg %ENIGMA2_TYPE% %TIMEOUT% %MSG%',
'Low' => 'set %DEVICE% msg %ENIGMA2_TYPE% %TIMEOUT% %MSG%',
'defaultValues' => {
'Normal' => {
'ENIGMA2_TYPE' => 'info',
'TIMEOUT' => 8,
},
'High' => {
'ENIGMA2_TYPE' => 'attention',
'TIMEOUT' => 12,
},
'Low' => {
'ENIGMA2_TYPE' => 'message',
'TIMEOUT' => 8,
},
},
},
'XBMC' => {
'Normal' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; $timeout=%TIMEOUT%*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }',
'High' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; $timeout=%TIMEOUT%*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }',
'Low' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; $timeout=%TIMEOUT%*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }',
'defaultValues' => {
'Normal' => {
'TIMEOUT' => 8,
'XBMC_ICON' => 'info',
},
'High' => {
'TIMEOUT' => 12,
'XBMC_ICON' => 'warning',
},
'Low' => {
'TIMEOUT' => 8,
'XBMC_ICON' => '',
},
},
},
},
};
sub get {
return $db;
return $db;
}
1;