From c72ca9f7f7c86aa4ddefdd129a4c7209af4b8dab Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Thu, 16 Jul 2020 06:14:56 +0000 Subject: [PATCH] 49_SSCam: contrib 9.5.0 git-svn-id: https://svn.fhem.de/fhem/trunk@22406 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/49_SSCam.pm | 228 +++++++++++++----------- fhem/contrib/DS_Starter/49_SSCamSTRM.pm | 202 +++++++++++++++++++-- 2 files changed, 311 insertions(+), 119 deletions(-) diff --git a/fhem/contrib/DS_Starter/49_SSCam.pm b/fhem/contrib/DS_Starter/49_SSCam.pm index b749b67f7..b40662667 100644 --- a/fhem/contrib/DS_Starter/49_SSCam.pm +++ b/fhem/contrib/DS_Starter/49_SSCam.pm @@ -159,6 +159,7 @@ BEGIN { # Versions History intern my %vNotesIntern = ( + "9.5.0" => "15.07.2020 streamDev master type added, comref revised ", "9.4.5" => "15.07.2020 fix crash while autocreate CommandDelete, CommandSave is missing ", "9.4.4" => "14.07.2020 fix crash while autocreate makeDeviceName is missing ", "9.4.3" => "13.07.2020 streamDev refactored, comref revised ", @@ -762,8 +763,8 @@ sub Define { $hash->{HELPER}{APIREC} = "SYNO.SurveillanceStation.Recording"; # This API provides method to query recording information. # Startwerte setzen - if(IsModelCam($hash)) { - $attr{$name}{webCmd} = "on:off:snap:enable:disable:runView:stopView"; # initiale Webkommandos setzen + if(IsModelCam($hash)) { # initiale Webkommandos setzen + $attr{$name}{webCmd} = "on:off:snap:enable:disable:runView:stopView"; } else { $attr{$name}{webCmd} = "homeMode"; $attr{$name}{webCmdLabel} = "HomeMode"; @@ -1148,7 +1149,7 @@ sub Set { "off:noArg ". "motdetsc:disable,camera,SVS ". "snap ". - (AttrVal($name, "snapGalleryBoost",0) ? (AttrVal($name,"snapGalleryNumber",undef) || AttrVal($name,"snapGalleryBoost",0))?"snapGallery:noArg ":"snapGallery:$defSnum ":" "). + (AttrVal($name, "snapGalleryBoost",0) ? (AttrVal($name,"snapGalleryNumber",undef) || AttrVal($name,"snapGalleryBoost",0)) ? "snapGallery:noArg " : "snapGallery:$defSnum " : " "). "createReadingsGroup ". "createSnapGallery:noArg ". "createStreamDev:generic,hls,lastsnap,mjpeg,switched ". @@ -1175,10 +1176,11 @@ sub Set { $setlist = "Unknown argument $opt, choose one of ". "autocreateCams:noArg ". "credentials ". + "createStreamDev:master ". "smtpcredentials ". "createReadingsGroup ". "extevent:1,2,3,4,5,6,7,8,9,10 ". - ($hash->{HELPER}{APIHMMAXVER}?"homeMode:on,off ": ""). + ($hash->{HELPER}{APIHMMAXVER} ? "homeMode:on,off " : ""). "snapCams "; } @@ -1472,7 +1474,7 @@ sub Set { $attr{$ptzcdev}{group} = $name."_PTZcontrol"; return qq{PTZ control device "$ptzcdev" created and assigned to room "$room".}; - } elsif ($opt eq "createStreamDev" && IsModelCam($hash)) { + } elsif ($opt eq "createStreamDev") { if (!$hash->{CREDENTIALS}) {return qq{Credentials of $name are not set - make sure you've set it with "set $name credentials username password"};} my ($livedev,$ret); @@ -1507,9 +1509,14 @@ sub Set { $ret = CommandDefine($hash->{CL},"$livedev SSCamSTRM {FHEM::SSCam::streamDev('$name','$livedev','switched')}"); return $ret if($ret); } + if($prop =~ /master/x) { + $livedev = "SSCamSTRM.$name.master"; + $ret = CommandDefine($hash->{CL},"$livedev SSCamSTRM {FHEM::SSCam::streamDev('$name','$livedev','master')}"); + return $ret if($ret); + } my $room = AttrVal($name,"room","SSCam"); - $attr{$livedev}{room} = $room; + $attr{$livedev}{room} = $room; return "Livestream device \"$livedev\" created and assigned to room \"$room\"."; } elsif ($opt eq "createReadingsGroup") { @@ -7867,10 +7874,9 @@ sub ptzPanel { ### add Preset / Patrols ############################### if(!$ftui) { - my ($Presets,$Patrols,$zoom); + my ($Presets,$Patrols); my $cmdPreset = "goPreset"; my $cmdPatrol = "runPatrol"; - my $cmdZoom = "setZoom"; ## Presets for my $fn (sort keys %{$data{webCmdFn}}) { @@ -8067,7 +8073,8 @@ sub streamDev { ## no critic 'comp # Javascript Bibliothek für Tooltips (http://www.walterzorn.de/tooltip/tooltip.htm#download) und Texte my $calias = $hash->{CAMNAME}; # Alias der Kamera my $ttjs = "/fhem/pgm2/sscam_tooltip.js"; - my ($ttrefresh, $ttrecstart, $ttrecstop, $ttsnap, $ttcmdstop, $tthlsreact, $ttmjpegrun, $tthlsrun, $ttlrrun, $tth264run, $ttlmjpegrun, $ttlsnaprun); + my ($ttrefresh, $ttrecstart, $ttrecstop, $ttsnap, $ttcmdstop, $tthlsreact); + my ($ttmjpegrun, $tthlsrun, $ttlrrun, $tth264run, $ttlmjpegrun, $ttlsnaprun); # Hinweis Popups if(AttrVal("global","language","EN") =~ /EN/x) { @@ -8187,11 +8194,13 @@ sub streamDev { ## no critic 'comp } $ret .= ''; $ret .= ''; - - if(!$StmKey || ReadingsVal($camname, "Availability", "") ne "enabled" || IsDisabled($camname)) { + + my $ismm = FHEM::SSCamSTRM::IsModelMaster($streamHash); # prüfen ob Streaming Dev ist MODEL = master + + if(!$ismm && (!$StmKey || ReadingsVal($camname, "Availability", "") ne "enabled" || IsDisabled($camname))) { # Ausgabe bei Fehler my $cam = AttrVal($camname, "alias", $camname); # Linktext als Aliasname oder Devicename setzen - $cause = !$StmKey?"Camera $cam has no Reading \"StmKey\" set !":"Cam \"$cam\" is disabled"; + $cause = !$StmKey ? "Camera $cam has no Reading \"StmKey\" set !" : "Cam \"$cam\" is disabled"; $cause = "Camera \"$cam\" is disabled" if(IsDisabled($camname)); $ret .= "
$cause

"; $ret .= ''; @@ -8207,6 +8216,7 @@ sub streamDev { ## no critic 'comp $ret .= &{$sdfn{$fmt}{fn}} (\%params); } else { $cause = qq{Streaming of format "$fmt" is not supported}; + $cause = qq{Select a Streaming client with the "adoptFrom" command.} if($ismm); $ret .= "
$cause

"; } use strict "refs"; @@ -9040,7 +9050,7 @@ sub composeGallery { if($strmdev) { my $streamHash = $defs{$strmdev}; # Hash des SSCamSTRM-Devices - $uuid = $streamHash->{FUUID}; # eindeutige UUID des Streamingdevices + $uuid = $streamHash->{FUUID}; # eindeutige UUID des Streamingdevices delete $streamHash->{HELPER}{STREAM}; $alias = AttrVal($strmdev, "alias", $strmdev); # Linktext als Aliasname oder Devicename setzen if(AttrVal($strmdev, "noLink", 0)) { @@ -9050,8 +9060,8 @@ sub composeGallery { } } - my $cmddosnap = "FW_cmd('$FW_ME$FW_subdir?XHR=1&cmd=set $name snap 1 2 STRM:$uuid')"; # Snapshot auslösen mit Kennzeichnung "by STRM-Device" - my $imgdosnap = ""; + my $cmddosnap = "FW_cmd('$FW_ME$FW_subdir?XHR=1&cmd=set $name snap 1 2 STRM:$uuid')"; # Snapshot auslösen mit Kennzeichnung "by STRM-Device" + my $imgdosnap = ""; # bei Aufruf durch FTUI Kommandosyntax anpassen if($ftui) { @@ -9111,8 +9121,8 @@ sub composeGallery { my $gattr = (AttrVal($name,"snapGallerySize","Icon") eq "Full")?$ha:""; # Ausgabetabelle erstellen - my ($htmlCode); - $htmlCode = ""; + my $htmlCode; + # $htmlCode = ""; $htmlCode .= ""; $htmlCode .= "
$header
"; $htmlCode .= ''; @@ -9132,16 +9142,17 @@ sub composeGallery { $cell++; if ( $cell == $sgc+1 ) { - $htmlCode .= sprintf("" ); - $htmlCode .= ""; - $htmlCode .= ""; - $cell = 1; + $htmlCode .= sprintf("" ); + $htmlCode .= ""; + $htmlCode .= ""; + $cell = 1; } else { - $htmlCode .= sprintf("" ); + $htmlCode .= sprintf("" ); } $idata = ""; } + } else { my @as; for(cache($name, "c_getkeys")) { # relevant keys aus allen vorkommenden selektieren @@ -9151,6 +9162,7 @@ sub composeGallery { } my %seen; my @unique = sort{$a<=>$b} grep { !$seen{$_}++ } @as; # distinct / unique the keys + for my $key (@unique) { $imgdat = cache($name, "c_read", "{SNAPHASH}{$key}{imageData}"); $imgTm = cache($name, "c_read", "{SNAPHASH}{$key}{createdTm}"); @@ -9160,12 +9172,12 @@ sub composeGallery { $cell++; if ( $cell == $sgc+1 ) { - $htmlCode .= sprintf("" ); - $htmlCode .= ""; - $htmlCode .= ""; - $cell = 1; + $htmlCode .= sprintf("" ); + $htmlCode .= ""; + $htmlCode .= ""; + $cell = 1; } else { - $htmlCode .= sprintf("" ); + $htmlCode .= sprintf("" ); } $idata = ""; @@ -9177,13 +9189,19 @@ sub composeGallery { } $htmlCode .= ""; + + if(!$hb) { + $htmlCode .= ""; + $htmlCode .= ""; + $htmlCode .= ""; + } + $htmlCode .= ""; $htmlCode .= "
$data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}
$data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}
$data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}
$data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}
$imgTm
$imgTm
$imgTm
$imgTm
"; + $htmlCode .= "$imgdosnap " if($strmdev); + $htmlCode .= "
"; $htmlCode .= "
"; - if(!$hb) { - $htmlCode .= "$imgdosnap " if($strmdev); - } - $htmlCode .= ""; + # $htmlCode .= ""; undef $imgdat; undef $imgTm; @@ -9346,7 +9364,7 @@ sub prepareSendData { } } $asref = $svshash->{HELPER}{ALLSNAPREF}; # Hashreferenz zum summarischen Snaphash - for my $key (keys%{$asref}) { # prüfen ob Bildhash komplett ? + for my $key (keys%{$asref}) { # prüfen ob Bildhash komplett ? if(!$asref->{$key}) { return; # Bildhash noch nicht komplett } @@ -9357,10 +9375,10 @@ sub prepareSendData { $name = $svshash->{NAME}; # Name des auslösenden SVS-Devices wird eingesetzt Log3($name, 4, "$name - Central Snaphash fillup completed by all selected cams. Send it now ..."); - my $cache = cache($name, "c_init"); # Cache initialisieren (im SVS Device) + my $cache = cache($name, "c_init"); # Cache initialisieren (im SVS Device) if(!$cache || $cache eq "internal" ) { delete $data{SSCam}{RS}; - for my $key (keys%{$asref}) { # Referenz zum summarischen Hash einsetzen + for my $key (keys%{$asref}) { # Referenz zum summarischen Hash einsetzen $data{SSCam}{RS}{$key} = delete $asref->{$key}; } $dat = $data{SSCam}{RS}; # Referenz zum summarischen Hash einsetzen @@ -9425,16 +9443,16 @@ sub prepareSendData { $smtpmsg{$bodyk} = "$bodyt"; $ret = sendEmail($hash, {'subject' => $smtpmsg{subject}, - 'part1txt' => $smtpmsg{body}, - 'part2type' => 'image/jpeg', - 'smtpport' => $sp, - 'sdat' => $dat, - 'opmode' => $OpMode, - 'smtpnousessl' => $nousessl, - 'sslfrominit' => $sslfrominit, - 'smtpsslport' => $smtpsslport, - 'tac' => $tac, - } + 'part1txt' => $smtpmsg{body}, + 'part2type' => 'image/jpeg', + 'smtpport' => $sp, + 'sdat' => $dat, + 'opmode' => $OpMode, + 'smtpnousessl' => $nousessl, + 'sslfrominit' => $sslfrominit, + 'smtpsslport' => $smtpsslport, + 'tac' => $tac, + } ); readingsSingleUpdate($hash, "sendEmailState", $ret, 1) if ($ret); } @@ -9465,16 +9483,16 @@ sub prepareSendData { $smtpmsg{$bodyk} = "$bodyt"; $ret = sendEmail($hash, {'subject' => $smtpmsg{subject}, - 'part1txt' => $smtpmsg{body}, - 'part2type' => 'video/mpeg', - 'smtpport' => $sp, - 'vdat' => $dat, - 'opmode' => $OpMode, - 'smtpnousessl' => $nousessl, - 'sslfrominit' => $sslfrominit, - 'smtpsslport' => $smtpsslport, - 'tac' => $tac, - } + 'part1txt' => $smtpmsg{body}, + 'part2type' => 'video/mpeg', + 'smtpport' => $sp, + 'vdat' => $dat, + 'opmode' => $OpMode, + 'smtpnousessl' => $nousessl, + 'sslfrominit' => $sslfrominit, + 'smtpsslport' => $smtpsslport, + 'tac' => $tac, + } ); readingsSingleUpdate($hash, "sendEmailState", $ret, 1) if ($ret); } @@ -9490,7 +9508,7 @@ sub prepareSendData { $mt =~ s/['"]//gx; my ($tbotk,$tbott,$peerk,$peert,$subjk,$subjt); - my ($telebot,$peers,$subj) = split(",", $mt, 3 ); + my ($telebot,$peers,$subj) = split(",", $mt, 3 ); ($tbotk,$tbott) = split("=>", $telebot) if($telebot); ($peerk,$peert) = split("=>", $peers ) if($peers); ($subjk,$subjt) = split("=>", $subj ) if($subj); @@ -9513,14 +9531,14 @@ sub prepareSendData { $telemsg{$subjk} = "$subjt" if($subjt); $ret = sendTelegram($hash, {'subject' => $telemsg{subject}, - 'part2type' => 'image/jpeg', - 'sdat' => $dat, - 'opmode' => $OpMode, - 'tac' => $tac, - 'telebot' => $telemsg{$tbotk}, - 'peers' => $telemsg{$peerk}, - 'MediaStream' => '-1', # Code für MediaStream im TelegramBot (png/jpg = -1) - } + 'part2type' => 'image/jpeg', + 'sdat' => $dat, + 'opmode' => $OpMode, + 'tac' => $tac, + 'telebot' => $telemsg{$tbotk}, + 'peers' => $telemsg{$peerk}, + 'MediaStream' => '-1', # Code für MediaStream im TelegramBot (png/jpg = -1) + } ); readingsSingleUpdate($hash, "sendTeleState", $ret, 1) if ($ret); } @@ -9559,14 +9577,14 @@ sub prepareSendData { $telemsg{$subjk} = "$subjt" if($subjt); $vdat = $dat; - $ret = sendTelegram($hash, {'subject' => $telemsg{subject}, - 'vdat' => $vdat, - 'opmode' => $OpMode, - 'telebot' => $telemsg{$tbotk}, - 'peers' => $telemsg{$peerk}, - 'tac' => $tac, - 'MediaStream' => '-30', # Code für MediaStream im TelegramBot (png/jpg = -1) - } + $ret = sendTelegram($hash, {'subject' => $telemsg{subject}, + 'vdat' => $vdat, + 'opmode' => $OpMode, + 'telebot' => $telemsg{$tbotk}, + 'peers' => $telemsg{$peerk}, + 'tac' => $tac, + 'MediaStream' => '-30', # Code für MediaStream im TelegramBot (png/jpg = -1) + } ); readingsSingleUpdate($hash, "sendTeleState", $ret, 1) if ($ret); } @@ -9605,12 +9623,12 @@ sub prepareSendData { $chatmsg{$subjk} = "$subjt" if($subjt); $ret = sendChat($hash, {'subject' => $chatmsg{subject}, - 'opmode' => $OpMode, - 'tac' => $tac, - 'sdat' => $dat, - 'chatbot' => $chatmsg{$cbotk}, - 'peers' => $chatmsg{$peerk}, - } + 'opmode' => $OpMode, + 'tac' => $tac, + 'sdat' => $dat, + 'chatbot' => $chatmsg{$cbotk}, + 'peers' => $chatmsg{$peerk}, + } ); readingsSingleUpdate($hash, "sendChatState", $ret, 1) if ($ret); } @@ -9648,13 +9666,13 @@ sub prepareSendData { $chatmsg{$peerk} = "$peert" if($peert); $chatmsg{$subjk} = "$subjt" if($subjt); - $ret = sendChat($hash, {'subject' => $chatmsg{subject}, - 'opmode' => $OpMode, - 'tac' => $tac, - 'vdat' => $dat, - 'chatbot' => $chatmsg{$cbotk}, - 'peers' => $chatmsg{$peerk}, - } + $ret = sendChat($hash, {'subject' => $chatmsg{subject}, + 'opmode' => $OpMode, + 'tac' => $tac, + 'vdat' => $dat, + 'chatbot' => $chatmsg{$cbotk}, + 'peers' => $chatmsg{$peerk}, + } ); readingsSingleUpdate($hash, "sendChatState", $ret, 1) if ($ret); } @@ -9679,14 +9697,14 @@ sub sendChat { Log3($name, 4, "$name - ####################################################"); my %chatparams = ( - 'subject' => { 'default'=>'', 'required'=>1, 'set'=>1}, - 'opmode' => { 'default'=>'', 'required'=>1, 'set'=>1}, # OpMode muss gesetzt sein - 'tac' => { 'default'=>'', 'required'=>0, 'set'=>1}, # übermittelter Transaktionscode der ausgewerteten Transaktion - 'sdat' => { 'default'=>'', 'required'=>0, 'set'=>1}, # Hashref der Bilddaten (Bilddaten base64 codiert) - 'vdat' => { 'default'=>'', 'required'=>0, 'set'=>1}, # Hashref der Videodaten - 'chatbot' => { 'default'=>'', 'required'=>1, 'set'=>1}, # SSChatBot-Device welches zum Senden verwendet werden soll - 'peers' => { 'default'=>'', 'required'=>0, 'set'=>1}, # SSChatBot Peers - 'videofolderMap' => {'attr'=>'videofolderMap', 'default'=>'', 'required'=>1, 'set'=>1}, # Wert des Attributs videofolderMap (muss gesetzt sein !) + 'subject' => { 'default'=>'', 'required'=>1, 'set'=>1}, + 'opmode' => { 'default'=>'', 'required'=>1, 'set'=>1}, # OpMode muss gesetzt sein + 'tac' => { 'default'=>'', 'required'=>0, 'set'=>1}, # übermittelter Transaktionscode der ausgewerteten Transaktion + 'sdat' => { 'default'=>'', 'required'=>0, 'set'=>1}, # Hashref der Bilddaten (Bilddaten base64 codiert) + 'vdat' => { 'default'=>'', 'required'=>0, 'set'=>1}, # Hashref der Videodaten + 'chatbot' => { 'default'=>'', 'required'=>1, 'set'=>1}, # SSChatBot-Device welches zum Senden verwendet werden soll + 'peers' => { 'default'=>'', 'required'=>0, 'set'=>1}, # SSChatBot Peers + 'videofolderMap' => {'attr'=>'videofolderMap', 'default'=>'', 'required'=>1, 'set'=>1}, # Wert des Attributs videofolderMap (muss gesetzt sein !) ); my $tac = $extparamref->{tac}; @@ -9944,7 +9962,7 @@ sub sendTelegram { 'telebot' => { 'default'=>'', 'required'=>1, 'set'=>1}, # TelegramBot-Device welches zum Senden verwendet werden soll 'peers' => { 'default'=>'', 'required'=>0, 'set'=>1}, # TelegramBot Peers 'MediaStream' => { 'default'=>'', 'required'=>0, 'set'=>1}, # Code für MediaStream im TelegramBot (png/jpg = -1) - ); + ); my $tac = $extparamref->{tac}; @@ -10516,7 +10534,7 @@ sub sendEmail { 'sslfrominit' => { 'default'=>'', 'required'=>0, 'set'=>1}, # SSL soll sofort ! aufgebaut werden 'tac' => { 'default'=>'', 'required'=>0, 'set'=>1}, # übermittelter Transaktionscode der ausgewerteten Transaktion 'vdat' => { 'default'=>'', 'required'=>0, 'set'=>1}, # Videodaten, wenn gesetzt muss 'part2type' auf 'video/mpeg' gesetzt sein - ); + ); my $tac = $extparamref->{tac}; @@ -11670,7 +11688,10 @@ return;