"; @@ -6415,7 +6439,7 @@ sub _parsegethomemodestate { ## no critic "not used" my $name = $paref->{name}; my $hash = $defs{$name}; - my $hmst = $data{SSCam}{$name}{TMPDA}->{'data'}{'on'}; + my $hmst = $owndata{TMPDA}->{'data'}{'on'}; my $hmststr = $hmst == 1 ? 'on' : 'off'; my ($date, $time) = timestampToDateTime (); @@ -6441,12 +6465,12 @@ sub _parsegetPresets { ## no critic "not used" my %ap = (); my $i = 0; - while ($data{SSCam}{$name}{TMPDA}->{'data'}{'preset'}[$i]) { - my $pname = $data{SSCam}{$name}{TMPDA}->{'data'}{'preset'}[$i]{'name'}; - my $ptype = $data{SSCam}{$name}{TMPDA}->{'data'}{'preset'}[$i]{'type'}; - my $ppos = $data{SSCam}{$name}{TMPDA}->{'data'}{'preset'}[$i]{'position'}; - my $pspeed = $data{SSCam}{$name}{TMPDA}->{'data'}{'preset'}[$i]{'speed'}; - my $pextra = $data{SSCam}{$name}{TMPDA}->{'data'}{'preset'}[$i]{'extra'}; + while ($owndata{TMPDA}->{'data'}{'preset'}[$i]) { + my $pname = $owndata{TMPDA}->{'data'}{'preset'}[$i]{'name'}; + my $ptype = $owndata{TMPDA}->{'data'}{'preset'}[$i]{'type'}; + my $ppos = $owndata{TMPDA}->{'data'}{'preset'}[$i]{'position'}; + my $pspeed = $owndata{TMPDA}->{'data'}{'preset'}[$i]{'speed'}; + my $pextra = $owndata{TMPDA}->{'data'}{'preset'}[$i]{'extra'}; $ptype = ($ptype == 1)?"Home":"Normal"; $ap{$ppos} = "Name: $pname, Speed: $pspeed, Type: $ptype"; $i++; @@ -6491,8 +6515,8 @@ sub _parseSnap { ## no critic "not used" $tac = openOrgetTrans($hash); # Transaktion starten oder vorhandenen Code holen } - my $snapid = $data{SSCam}{$name}{TMPDA}->{data}{'id'}; - $snapid = $data{SSCam}{$name}{TMPDA}->{data}{'snapshotId'} if($hash->{HELPER}{CALL}{VKEY} eq 'SNAPWEBAPI'); + my $snapid = $owndata{TMPDA}->{data}{'id'}; + $snapid = $owndata{TMPDA}->{data}{'snapshotId'} if($hash->{HELPER}{CALL}{VKEY} eq 'SNAPWEBAPI'); setReadingErrorNone ($hash, 1); @@ -6521,6 +6545,7 @@ sub _parseSnap { ## no critic "not used" if ($ncount > 0) { InternalTimer (gettimeofday()+$lag, "FHEM::SSCam::__camSnap", "$name!_!$num!_!$lag!_!$ncount!_!$emtxt!_!$teletxt!_!$chattxt!_!$tac", 0); + if (!$tac) { delActiveToken ($hash); # Token freigeben wenn keine Transaktion läuft } @@ -6552,19 +6577,19 @@ sub _parsegetsvsinfo { ## no critic "not used" my $verbose = $paref->{verbose}; my $hash = $defs{$name}; - my $userPriv = $data{SSCam}{$name}{TMPDA}{'data'}{'userPriv'}; + my $userPriv = $owndata{TMPDA}{'data'}{'userPriv'}; if (defined $userPriv) { $userPriv = $hrkeys{userPriv}{$userPriv}; } - $hash->{HELPER}{SVSVERSION}{MAJOR} = $data{SSCam}{$name}{TMPDA}{'data'}{'version'}{'major'}; # Werte in $hash zur späteren Auswertung einfügen - $hash->{HELPER}{SVSVERSION}{MINOR} = $data{SSCam}{$name}{TMPDA}{'data'}{'version'}{'minor'}; - $hash->{HELPER}{SVSVERSION}{SMALL} = $data{SSCam}{$name}{TMPDA}{'data'}{'version'}{'small'}; - $hash->{HELPER}{SVSVERSION}{BUILD} = $data{SSCam}{$name}{TMPDA}{'data'}{'version'}{'build'}; + $hash->{HELPER}{SVSVERSION}{MAJOR} = $owndata{TMPDA}{'data'}{'version'}{'major'}; # Werte in $hash zur späteren Auswertung einfügen + $hash->{HELPER}{SVSVERSION}{MINOR} = $owndata{TMPDA}{'data'}{'version'}{'minor'}; + $hash->{HELPER}{SVSVERSION}{SMALL} = $owndata{TMPDA}{'data'}{'version'}{'small'}; + $hash->{HELPER}{SVSVERSION}{BUILD} = $owndata{TMPDA}{'data'}{'version'}{'build'}; - readingsDelete ($hash, 'SVScustomPortHttp') if(!exists($data{SSCam}{$name}{TMPDA}{'data'}{'customizedPortHttp'})); - readingsDelete ($hash, 'SVScustomPortHttps') if(!exists($data{SSCam}{$name}{TMPDA}{'data'}{'customizedPortHttps'})); + readingsDelete ($hash, 'SVScustomPortHttp') if(!exists($owndata{TMPDA}{'data'}{'customizedPortHttp'})); + readingsDelete ($hash, 'SVScustomPortHttps') if(!exists($owndata{TMPDA}{'data'}{'customizedPortHttps'})); my $major = $hash->{HELPER}{SVSVERSION}{MAJOR} // ''; my $minor = $hash->{HELPER}{SVSVERSION}{MINOR} // ''; @@ -6604,9 +6629,9 @@ sub _parsegetsvsinfo { ## no critic "not used" readingsBeginUpdate ($hash); - readingsBulkUpdate ($hash, 'SVScustomPortHttp', $data{SSCam}{$name}{TMPDA}{'data'}{'customizedPortHttp'}); - readingsBulkUpdate ($hash, 'SVScustomPortHttps', $data{SSCam}{$name}{TMPDA}{'data'}{'customizedPortHttps'}); - readingsBulkUpdate ($hash, 'SVSlicenseNumber', $data{SSCam}{$name}{TMPDA}{'data'}{'liscenseNumber'}); + readingsBulkUpdate ($hash, 'SVScustomPortHttp', $owndata{TMPDA}{'data'}{'customizedPortHttp'}); + readingsBulkUpdate ($hash, 'SVScustomPortHttps', $owndata{TMPDA}{'data'}{'customizedPortHttps'}); + readingsBulkUpdate ($hash, 'SVSlicenseNumber', $owndata{TMPDA}{'data'}{'liscenseNumber'}); readingsBulkUpdate ($hash, 'SVSuserPriv', $userPriv); readingsBulkUpdate ($hash, 'compstate', $compstate); readingsBulkUpdate ($hash, 'SVSversion', $major.".".$minor.".".$small."-".$build); @@ -6698,9 +6723,9 @@ sub __parserunliveviewSNAP { ## no critic "not used" Log3 ($name, $verbose, "$name - Snapinfos of camera $camname retrieved"); - if (exists($data{SSCam}{$name}{TMPDA}->{'data'}{'data'}[0]{imageData})) { + if (exists($owndata{TMPDA}->{'data'}{'data'}[0]{imageData})) { delete $hash->{HELPER}{RUNVIEW}; - $hash->{HELPER}{LINK} = delete $data{SSCam}{$name}{TMPDA}->{data}{data}[0]{imageData}; + $hash->{HELPER}{LINK} = delete $owndata{TMPDA}->{data}{data}[0]{imageData}; } else { Log3($name, 3, "$name - There is no snapshot of camera $camname to display. Take one snapshot before."); @@ -6730,20 +6755,20 @@ sub _parsegetStmUrlPath { ## no critic "not used" my($camforcemcast,$mjpegHttp,$multicst,$mxpegHttp,$unicastOverHttp,$unicastPath); if ($apicamver < 9) { - $camforcemcast = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'pathInfos'}[0]{'forceEnableMulticast'}); - $mjpegHttp = $data{SSCam}{$name}{TMPDA}->{'data'}{'pathInfos'}[0]{'mjpegHttpPath'}; - $multicst = $data{SSCam}{$name}{TMPDA}->{'data'}{'pathInfos'}[0]{'multicstPath'}; - $mxpegHttp = $data{SSCam}{$name}{TMPDA}->{'data'}{'pathInfos'}[0]{'mxpegHttpPath'}; - $unicastOverHttp = $data{SSCam}{$name}{TMPDA}->{'data'}{'pathInfos'}[0]{'unicastOverHttpPath'}; - $unicastPath = $data{SSCam}{$name}{TMPDA}->{'data'}{'pathInfos'}[0]{'unicastPath'}; + $camforcemcast = jboolmap ($owndata{TMPDA}->{'data'}{'pathInfos'}[0]{'forceEnableMulticast'}); + $mjpegHttp = $owndata{TMPDA}->{'data'}{'pathInfos'}[0]{'mjpegHttpPath'}; + $multicst = $owndata{TMPDA}->{'data'}{'pathInfos'}[0]{'multicstPath'}; + $mxpegHttp = $owndata{TMPDA}->{'data'}{'pathInfos'}[0]{'mxpegHttpPath'}; + $unicastOverHttp = $owndata{TMPDA}->{'data'}{'pathInfos'}[0]{'unicastOverHttpPath'}; + $unicastPath = $owndata{TMPDA}->{'data'}{'pathInfos'}[0]{'unicastPath'}; } if ($apicamver >= 9) { - $mjpegHttp = $data{SSCam}{$name}{TMPDA}->{'data'}[0]{'mjpegHttpPath'}; - $multicst = $data{SSCam}{$name}{TMPDA}->{'data'}[0]{'multicstPath'}; - $mxpegHttp = $data{SSCam}{$name}{TMPDA}->{'data'}[0]{'mxpegHttpPath'}; - $unicastOverHttp = $data{SSCam}{$name}{TMPDA}->{'data'}[0]{'rtspOverHttpPath'}; - $unicastPath = $data{SSCam}{$name}{TMPDA}->{'data'}[0]{'rtspPath'}; + $mjpegHttp = $owndata{TMPDA}->{'data'}[0]{'mjpegHttpPath'}; + $multicst = $owndata{TMPDA}->{'data'}[0]{'multicstPath'}; + $mxpegHttp = $owndata{TMPDA}->{'data'}[0]{'mxpegHttpPath'}; + $unicastOverHttp = $owndata{TMPDA}->{'data'}[0]{'rtspOverHttpPath'}; + $unicastPath = $owndata{TMPDA}->{'data'}[0]{'rtspPath'}; } if (AttrVal($name, "livestreamprefix", undef)) { # Rewrite Url's falls livestreamprefix ist gesetzt @@ -6810,13 +6835,13 @@ sub _parseGetcaminfo { ## no critic "not used" my $hash = $defs{$name}; my ($date, $time) = timestampToDateTime (); - my $camLiveMode = $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'camLiveMode'}; + my $camLiveMode = $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'camLiveMode'}; $camLiveMode = $hrkeys{camLiveMode}{$camLiveMode}; - my $deviceType = $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'deviceType'}; + my $deviceType = $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'deviceType'}; $deviceType = $hrkeys{deviceType}{$deviceType}; - my $camStatus = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'camStatus'}); + my $camStatus = jboolmap ($owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'camStatus'}); $camStatus = $hrkeys{camStatus}{$camStatus}; if ($camStatus eq "enabled") { @@ -6828,22 +6853,22 @@ sub _parseGetcaminfo { ## no critic "not used" } } - my $recStatus = $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'recStatus'}; + my $recStatus = $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'recStatus'}; $recStatus = $recStatus ne "0" ? "Start" : "Stop"; - my $rotate = $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_rotation'}; + my $rotate = $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_rotation'}; $rotate = $rotate == 1 ? "true" : "false"; - my $exposuremode = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'exposure_mode'}); + my $exposuremode = jboolmap ($owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'exposure_mode'}); $exposuremode = $hrkeys{exposure_mode}{$exposuremode}; - my $exposurecontrol = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'exposure_control'}); + my $exposurecontrol = jboolmap ($owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'exposure_control'}); $exposurecontrol = $hrkeys{exposure_control}{$exposurecontrol}; - my $camaudiotype = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camAudioType'}); + my $camaudiotype = jboolmap ($owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camAudioType'}); $camaudiotype = $hrkeys{camAudioType}{$camaudiotype}; - my $pdcap = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'PDCap'}); + my $pdcap = jboolmap ($owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'PDCap'}); if (!$pdcap || $pdcap == 0) { $pdcap = "false"; @@ -6852,46 +6877,46 @@ sub _parseGetcaminfo { ## no critic "not used" $pdcap = "true"; } - $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_flip'} = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_flip'}); - $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_mirror'} = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_mirror'}); - $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'blPresetSpeed'} = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'blPresetSpeed'}); + $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_flip'} = jboolmap ($owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_flip'}); + $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_mirror'} = jboolmap ($owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_mirror'}); + $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'blPresetSpeed'} = jboolmap ($owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'blPresetSpeed'}); - my $clstrmno = $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camLiveStreamNo'}; + my $clstrmno = $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camLiveStreamNo'}; $clstrmno++ if($clstrmno == 0); - my $fw = $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camFirmware'}; + my $fw = $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camFirmware'}; readingsBeginUpdate($hash); readingsBulkUpdate($hash, "CamAudioType", $camaudiotype); readingsBulkUpdate($hash, "CamFirmware", $fw) if($fw); readingsBulkUpdate($hash, "CamLiveMode", $camLiveMode); - readingsBulkUpdate($hash, "CamLiveFps", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camLiveFps'}); - readingsBulkUpdate($hash, "CamLiveResolution", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camLiveResolution'}); - readingsBulkUpdate($hash, "CamLiveQuality", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camLiveQuality'}); + readingsBulkUpdate($hash, "CamLiveFps", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camLiveFps'}); + readingsBulkUpdate($hash, "CamLiveResolution", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camLiveResolution'}); + readingsBulkUpdate($hash, "CamLiveQuality", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camLiveQuality'}); readingsBulkUpdate($hash, "CamLiveStreamNo", $clstrmno); readingsBulkUpdate($hash, "CamExposureMode", $exposuremode); readingsBulkUpdate($hash, "CamExposureControl", $exposurecontrol); - readingsBulkUpdate($hash, "CamModel", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camModel'}); - readingsBulkUpdate($hash, "CamRecShare", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'camRecShare'}); - readingsBulkUpdate($hash, "CamRecVolume", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'camRecVolume'}); - readingsBulkUpdate($hash, "CamIP", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'host'}); - readingsBulkUpdate($hash, "CamNTPServer", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'time_server'}); - readingsBulkUpdate($hash, "CamVendor", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camVendor'}); - readingsBulkUpdate($hash, "CamVideoType", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'camVideoType'}); - readingsBulkUpdate($hash, "CamPreRecTime", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camPreRecTime'}); - readingsBulkUpdate($hash, "CamPort", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'port'}); - readingsBulkUpdate($hash, "CamPtSpeed", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'ptSpeed'}) if($deviceType =~ /PTZ/x); - readingsBulkUpdate($hash, "CamblPresetSpeed", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'blPresetSpeed'}); - readingsBulkUpdate($hash, "CamVideoMirror", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_mirror'}); - readingsBulkUpdate($hash, "CamVideoFlip", $data{SSCam}{$name}{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_flip'}); + readingsBulkUpdate($hash, "CamModel", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camModel'}); + readingsBulkUpdate($hash, "CamRecShare", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'camRecShare'}); + readingsBulkUpdate($hash, "CamRecVolume", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'camRecVolume'}); + readingsBulkUpdate($hash, "CamIP", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'host'}); + readingsBulkUpdate($hash, "CamNTPServer", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'time_server'}); + readingsBulkUpdate($hash, "CamVendor", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camVendor'}); + readingsBulkUpdate($hash, "CamVideoType", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'camVideoType'}); + readingsBulkUpdate($hash, "CamPreRecTime", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'detailInfo'}{'camPreRecTime'}); + readingsBulkUpdate($hash, "CamPort", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'port'}); + readingsBulkUpdate($hash, "CamPtSpeed", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'ptSpeed'}) if($deviceType =~ /PTZ/x); + readingsBulkUpdate($hash, "CamblPresetSpeed", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'blPresetSpeed'}); + readingsBulkUpdate($hash, "CamVideoMirror", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_mirror'}); + readingsBulkUpdate($hash, "CamVideoFlip", $owndata{TMPDA}->{'data'}->{'cameras'}->[0]->{'video_flip'}); readingsBulkUpdate($hash, "CamVideoRotate", $rotate); readingsBulkUpdate($hash, "CapPIR", $pdcap); readingsBulkUpdate($hash, "Availability", $camStatus); readingsBulkUpdate($hash, "DeviceType", $deviceType); readingsBulkUpdate($hash, "LastUpdateTime", $date.' / '.$time); readingsBulkUpdate($hash, "Record", $recStatus); - readingsBulkUpdate($hash, "UsedSpaceMB", $data{SSCam}{$name}{TMPDA}->{'data'}{'cameras'}[0]{'volume_space'}); - readingsBulkUpdate($hash, "VideoFolder", AttrVal($name, "videofolderMap", $data{SSCam}{$name}{TMPDA}->{'data'}{'cameras'}[0]{'folder'})); + readingsBulkUpdate($hash, "UsedSpaceMB", $owndata{TMPDA}->{'data'}{'cameras'}[0]{'volume_space'}); + readingsBulkUpdate($hash, "VideoFolder", AttrVal($name, "videofolderMap", $owndata{TMPDA}->{'data'}{'cameras'}[0]{'folder'})); readingsBulkUpdate($hash, "Errorcode", "none"); readingsBulkUpdate($hash, "Error", "none"); readingsEndUpdate($hash, 1); @@ -6916,15 +6941,15 @@ sub _parseGetptzlistpatrol { ## no critic "not used" my $camname = $paref->{camname}; my $hash = $defs{$name}; - my $patrolcnt = $data{SSCam}{$name}{TMPDA}->{'data'}->{'total'}; + my $patrolcnt = $owndata{TMPDA}->{'data'}->{'total'}; my $cnt = 0; delete $hash->{HELPER}{ALLPATROLS}; - while ($cnt < $patrolcnt) { # alle Patrols der Kamera mit Id's in Hash einlesen - my $patrolid = $data{SSCam}{$name}{TMPDA}->{'data'}->{'patrols'}->[$cnt]->{'id'}; - my $patrolname = $data{SSCam}{$name}{TMPDA}->{'data'}->{'patrols'}->[$cnt]->{'name'}; - $patrolname =~ s/\s+/_/gx; # Leerzeichen im Namen ersetzen falls vorhanden + while ($cnt < $patrolcnt) { # alle Patrols der Kamera mit Id's in Hash einlesen + my $patrolid = $owndata{TMPDA}->{'data'}->{'patrols'}->[$cnt]->{'id'}; + my $patrolname = $owndata{TMPDA}->{'data'}->{'patrols'}->[$cnt]->{'name'}; + $patrolname =~ s/\s+/_/gx; # Leerzeichen im Namen ersetzen falls vorhanden $hash->{HELPER}{ALLPATROLS}{$patrolname} = $patrolid; $cnt += 1; @@ -6939,9 +6964,9 @@ sub _parseGetptzlistpatrol { ## no critic "not used" readingsBulkUpdate ($hash, "Error", "none" ); readingsEndUpdate ($hash, 1); - $hash->{".ptzhtml"} = ""; # ptzPanel wird neu eingelesen in FWdetailFn + $hash->{".ptzhtml"} = ""; # ptzPanel wird neu eingelesen in FWdetailFn - Log3($name, $verbose, "$name - PTZ Patrols of camera $camname retrieved"); + Log3 ($name, $verbose, "$name - PTZ Patrols of camera $camname retrieved"); return; } @@ -6957,7 +6982,7 @@ sub _parseGetptzlistpreset { ## no critic "not used" my $camname = $paref->{camname}; my $hash = $defs{$name}; - my $presetcnt = $data{SSCam}{$name}{TMPDA}->{'data'}->{'total'}; + my $presetcnt = $owndata{TMPDA}->{'data'}->{'total'}; my $cnt = 0; # alle Presets der Kamera mit Id's in Assoziatives Array einlesen @@ -6965,9 +6990,9 @@ sub _parseGetptzlistpreset { ## no critic "not used" my $home = "not set"; while ($cnt < $presetcnt) { - my $presid = $data{SSCam}{$name}{TMPDA}->{'data'}->{'presets'}->[$cnt]->{'position'}; - my $presname = $data{SSCam}{$name}{TMPDA}->{'data'}->{'presets'}->[$cnt]->{'name'}; - my $ptype = $data{SSCam}{$name}{TMPDA}->{'data'}->{'presets'}->[$cnt]->{'type'}; + my $presid = $owndata{TMPDA}->{'data'}->{'presets'}->[$cnt]->{'position'}; + my $presname = $owndata{TMPDA}->{'data'}->{'presets'}->[$cnt]->{'name'}; + my $ptype = $owndata{TMPDA}->{'data'}->{'presets'}->[$cnt]->{'type'}; $presname =~ s/\s+/_/gx; # Leerzeichen im Namen ersetzen falls vorhanden $hash->{HELPER}{ALLPRESETS}{$presname} = "$presid"; @@ -7005,40 +7030,40 @@ sub _parseGetcapabilities { ## no critic "not used" my $camname = $paref->{camname}; my $hash = $defs{$name}; - my $ptzfocus = $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzFocus'}; + my $ptzfocus = $owndata{TMPDA}->{'data'}{'ptzFocus'}; $ptzfocus = $hrkeys{ptzFocus}{$ptzfocus}; - my $ptztilt = $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzTilt'}; + my $ptztilt = $owndata{TMPDA}->{'data'}{'ptzTilt'}; $ptztilt = $hrkeys{ptzTilt}{$ptztilt}; - my $ptzzoom = $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzZoom'}; + my $ptzzoom = $owndata{TMPDA}->{'data'}{'ptzZoom'}; $ptzzoom = $hrkeys{ptzZoom}{$ptzzoom}; - my $ptzpan = $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzPan'}; + my $ptzpan = $owndata{TMPDA}->{'data'}{'ptzPan'}; $ptzpan = $hrkeys{ptzPan}{$ptzpan}; - my $ptziris = $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzIris'}; + my $ptziris = $owndata{TMPDA}->{'data'}{'ptzIris'}; $ptziris = $hrkeys{ptzIris}{$ptziris}; - $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzHasObjTracking'} = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'ptzHasObjTracking'}); - $data{SSCam}{$name}{TMPDA}->{'data'}{'audioOut'} = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'audioOut'}); - $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzSpeed'} = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'ptzSpeed'}); - $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzAbs'} = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'ptzAbs'}); - $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzAutoFocus'} = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'ptzAutoFocus'}); - $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzHome'} = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'ptzHome'}); + $owndata{TMPDA}->{'data'}{'ptzHasObjTracking'} = jboolmap ($owndata{TMPDA}->{'data'}{'ptzHasObjTracking'}); + $owndata{TMPDA}->{'data'}{'audioOut'} = jboolmap ($owndata{TMPDA}->{'data'}{'audioOut'}); + $owndata{TMPDA}->{'data'}{'ptzSpeed'} = jboolmap ($owndata{TMPDA}->{'data'}{'ptzSpeed'}); + $owndata{TMPDA}->{'data'}{'ptzAbs'} = jboolmap ($owndata{TMPDA}->{'data'}{'ptzAbs'}); + $owndata{TMPDA}->{'data'}{'ptzAutoFocus'} = jboolmap ($owndata{TMPDA}->{'data'}{'ptzAutoFocus'}); + $owndata{TMPDA}->{'data'}{'ptzHome'} = jboolmap ($owndata{TMPDA}->{'data'}{'ptzHome'}); readingsBeginUpdate($hash); - readingsBulkUpdate ($hash,"CapPTZAutoFocus", $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzAutoFocus'} ); - readingsBulkUpdate ($hash,"CapAudioOut", $data{SSCam}{$name}{TMPDA}->{'data'}{'audioOut'} ); - readingsBulkUpdate ($hash,"CapChangeSpeed", $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzSpeed'} ); - readingsBulkUpdate ($hash,"CapPTZHome", $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzHome'} ); - readingsBulkUpdate ($hash,"CapPTZAbs", $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzAbs'} ); - readingsBulkUpdate ($hash,"CapPTZDirections", $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzDirection'} ); + readingsBulkUpdate ($hash,"CapPTZAutoFocus", $owndata{TMPDA}->{'data'}{'ptzAutoFocus'} ); + readingsBulkUpdate ($hash,"CapAudioOut", $owndata{TMPDA}->{'data'}{'audioOut'} ); + readingsBulkUpdate ($hash,"CapChangeSpeed", $owndata{TMPDA}->{'data'}{'ptzSpeed'} ); + readingsBulkUpdate ($hash,"CapPTZHome", $owndata{TMPDA}->{'data'}{'ptzHome'} ); + readingsBulkUpdate ($hash,"CapPTZAbs", $owndata{TMPDA}->{'data'}{'ptzAbs'} ); + readingsBulkUpdate ($hash,"CapPTZDirections", $owndata{TMPDA}->{'data'}{'ptzDirection'} ); readingsBulkUpdate ($hash,"CapPTZFocus", $ptzfocus ); readingsBulkUpdate ($hash,"CapPTZIris", $ptziris ); - readingsBulkUpdate ($hash,"CapPTZObjTracking", $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzHasObjTracking'} ); + readingsBulkUpdate ($hash,"CapPTZObjTracking", $owndata{TMPDA}->{'data'}{'ptzHasObjTracking'} ); readingsBulkUpdate ($hash,"CapPTZPan", $ptzpan ); - readingsBulkUpdate ($hash,"CapPTZPresetNumber", $data{SSCam}{$name}{TMPDA}->{'data'}{'ptzPresetNumber'} ); + readingsBulkUpdate ($hash,"CapPTZPresetNumber", $owndata{TMPDA}->{'data'}{'ptzPresetNumber'} ); readingsBulkUpdate ($hash,"CapPTZTilt", $ptztilt ); readingsBulkUpdate ($hash,"CapPTZZoom", $ptzzoom ); readingsBulkUpdate ($hash,"Errorcode", "none" ); @@ -7060,24 +7085,24 @@ sub _parsegetmotionenum { ## no critic "not used" my $camname = $paref->{camname}; my $hash = $defs{$name}; - my $motdetsc = $data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'source'}; + my $motdetsc = $owndata{TMPDA}->{'data'}{'MDParam'}{'source'}; $motdetsc = $hrkeys{source}{$motdetsc}; - my $sensitivity_camCap = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'sensitivity'}{'camCap'}); - my $sensitivity_value = $data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'sensitivity'}{'value'}; - my $sensitivity_ssCap = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'sensitivity'}{'ssCap'}); + my $sensitivity_camCap = jboolmap ($owndata{TMPDA}->{'data'}{'MDParam'}{'sensitivity'}{'camCap'}); + my $sensitivity_value = $owndata{TMPDA}->{'data'}{'MDParam'}{'sensitivity'}{'value'}; + my $sensitivity_ssCap = jboolmap ($owndata{TMPDA}->{'data'}{'MDParam'}{'sensitivity'}{'ssCap'}); - my $threshold_camCap = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'threshold'}{'camCap'}); - my $threshold_value = $data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'threshold'}{'value'}; - my $threshold_ssCap = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'threshold'}{'ssCap'}); + my $threshold_camCap = jboolmap ($owndata{TMPDA}->{'data'}{'MDParam'}{'threshold'}{'camCap'}); + my $threshold_value = $owndata{TMPDA}->{'data'}{'MDParam'}{'threshold'}{'value'}; + my $threshold_ssCap = jboolmap ($owndata{TMPDA}->{'data'}{'MDParam'}{'threshold'}{'ssCap'}); - my $percentage_camCap = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'percentage'}{'camCap'}); - my $percentage_value = $data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'percentage'}{'value'}; - my $percentage_ssCap = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'percentage'}{'ssCap'}); + my $percentage_camCap = jboolmap ($owndata{TMPDA}->{'data'}{'MDParam'}{'percentage'}{'camCap'}); + my $percentage_value = $owndata{TMPDA}->{'data'}{'MDParam'}{'percentage'}{'value'}; + my $percentage_ssCap = jboolmap ($owndata{TMPDA}->{'data'}{'MDParam'}{'percentage'}{'ssCap'}); - my $objectSize_camCap = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'objectSize'}{'camCap'}); - my $objectSize_value = $data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'objectSize'}{'value'}; - my $objectSize_ssCap = jboolmap ($data{SSCam}{$name}{TMPDA}->{'data'}{'MDParam'}{'objectSize'}{'ssCap'}); + my $objectSize_camCap = jboolmap ($owndata{TMPDA}->{'data'}{'MDParam'}{'objectSize'}{'camCap'}); + my $objectSize_value = $owndata{TMPDA}->{'data'}{'MDParam'}{'objectSize'}{'value'}; + my $objectSize_ssCap = jboolmap ($owndata{TMPDA}->{'data'}{'MDParam'}{'objectSize'}{'ssCap'}); if ($motdetsc eq "Camera") { if ($sensitivity_camCap) { @@ -7124,18 +7149,18 @@ sub _parsegeteventlist { ## no critic "not used" my $camname = $paref->{camname}; my $hash = $defs{$name}; - my $eventnum = $data{SSCam}{$name}{TMPDA}->{'data'}{'total'}; - my $lrec = $data{SSCam}{$name}{TMPDA}->{'data'}{'events'}[0]{name}; - my $lrecid = $data{SSCam}{$name}{TMPDA}->{'data'}{'events'}[0]{'eventId'}; + my $eventnum = $owndata{TMPDA}->{'data'}{'total'}; + my $lrec = $owndata{TMPDA}->{'data'}{'events'}[0]{name}; + my $lrecid = $owndata{TMPDA}->{'data'}{'events'}[0]{'eventId'}; my ($lastrecstarttime,$lastrecstoptime); if ($eventnum > 0) { - $lastrecstarttime = $data{SSCam}{$name}{TMPDA}->{'data'}{'events'}[0]{startTime}; + $lastrecstarttime = $owndata{TMPDA}->{'data'}{'events'}[0]{startTime}; my ($date, $time) = timestampToDateTime ($lastrecstarttime); $lastrecstarttime = $date.' / '.$time; - $lastrecstoptime = $data{SSCam}{$name}{TMPDA}->{'data'}{'events'}[0]{stopTime}; + $lastrecstoptime = $owndata{TMPDA}->{'data'}{'events'}[0]{stopTime}; ($date, $time) = timestampToDateTime ($lastrecstoptime); $lastrecstoptime = $time; } @@ -7188,12 +7213,13 @@ sub _parsegetsnapinfo { ## no critic "not used" my $camname = $paref->{camname}; my $hash = $defs{$name}; - my $lang = AttrVal('global', 'language', 'EN'); - my ($cache,@as); + my $lang = AttrVal ('global', 'language', 'EN'); + + my ($cache, @as); $paref->{aref} = \@as; - Log3($name, $verbose, "$name - Snapinfos of camera $camname retrieved"); + Log3 ($name, $verbose, "$name - Snapinfos of camera $camname retrieved"); __saveLastSnapToCache ($paref); # aktuellsten Snap in Cache zur Anzeige durch streamDev "lastsnap" speichern __doSnapRotation ($paref); # Rotationsfeature @@ -7216,12 +7242,14 @@ sub _parsegetsnapgallery { ## no critic "not used" my $camname = $paref->{camname}; my $hash = $defs{$name}; - my $lang = AttrVal("global", "language", "EN"); - my @as; + my $lang = AttrVal ('global', 'language', 'EN'); + + my (@as, %snapoldhash); - $paref->{aref} = \@as; + $paref->{aref} = \@as; + $paref->{snapoldhash} = \%snapoldhash; - Log3($name, $verbose, "$name - Snapinfos of camera $camname retrieved"); + Log3 ($name, $verbose, "$name - Snapinfos of camera $camname retrieved"); __saveLastSnapToCache ($paref); # aktuellsten Snap in Cache zur Anzeige durch streamDev "lastsnap" speichern __doSnapRotation ($paref); # Rotationsfeature @@ -7230,7 +7258,7 @@ sub _parsegetsnapgallery { ## no critic "not used" ##### transaktionaler Versand der erzeugten Schnappschüsse ##### ################################################################## if (canEmailSnap($hash) || canTeleSnap($hash) || canChatSnap($hash)) { # es soll die Anzahl "$hash->{HELPER}{SNAPNUM}" Schnappschüsse versendet werden - my $tac = openOrgetTrans($hash); # Transaktion vorhandenen Code holen + my $tac = openOrgetTrans ($hash); # Transaktion vorhandenen Code holen $paref->{tac} = $tac; my $sn = __insertSnapsToCache ($paref); # neu erzeugte Snaps in SNAPHASH eintragen @@ -7240,9 +7268,10 @@ sub _parsegetsnapgallery { ## no critic "not used" # Schnappschüsse als Email / Telegram / SSChatBot versenden ########################################################### - my $cache = cache($name, "c_init"); # Cache initialisieren + my $cache = cache ($name, "c_init"); # Cache initialisieren + if (!$cache || $cache eq "internal" ) { - prepareSendData ($hash, "getsnapgallery", $data{SSCam}{$name}{SENDSNAPS}{$tac}); + prepareSendData ($hash, "getsnapgallery", $owndata{SENDSNAPS}{$tac}); } else { prepareSendData ($hash, "getsnapgallery", "{SENDSNAPS}{$tac}"); @@ -7252,28 +7281,26 @@ sub _parsegetsnapgallery { ## no critic "not used" # Schnappschußgalerie wird bereitgestellt (Attr snapGalleryBoost=1) bzw. gleich angezeigt # (Attr snapGalleryBoost=0) !! kein Versand !! ######################################################################################### - $hash->{HELPER}{TOTALCNT} = $data{SSCam}{$name}{TMPDA}->{data}{total}; # total Anzahl Schnappschüsse + $hash->{HELPER}{TOTALCNT} = $owndata{TMPDA}->{data}{total}; # total Anzahl Schnappschüsse my $sn = __insertSnapsToCache ($paref); # neu erzeugte Snaps in SNAPHASH eintragen $paref->{sn} = $sn; __copySnapsBackFromOld ($paref); # gesicherte Schnappschußdaten aus SNAPOLDHASH an SNAPHASH anhängen - # Direktausgabe Snaphash wenn nicht gepollt wird - if (!AttrVal($name, 'snapGalleryBoost', $sgbdef)) { - my %pars = ( + if (!AttrVal($name, 'snapGalleryBoost', $sgbdef)) { # Direktausgabe Snaphash wenn nicht gepollt wird + my $pars = { linkparent => $name, linkname => '', ftui => 0 - ); + }; - my $htmlCode = composeGallery(\%pars); + my $htmlCode = composeGallery($pars); for (my $c=1; (defined($hash->{HELPER}{CL}{$c})); $c++ ) { - asyncOutput($hash->{HELPER}{CL}{$c},"$htmlCode"); + asyncOutput ($hash->{HELPER}{CL}{$c}, $htmlCode); } - - delete $data{SSCam}{$name}{SNAPHASH}; # Snaphash Referenz löschen + delClHash ($name); } } @@ -7281,7 +7308,6 @@ sub _parsegetsnapgallery { ## no critic "not used" setReadingErrorNone( $hash, 1 ); delete $hash->{HELPER}{GETSNAPGALLERY}; # Steuerbit getsnapgallery - delete $data{SSCam}{$name}{SNAPOLDHASH}; closeTrans ($hash); # Transaktion beenden __refreshAfterSnap ($hash); # fallabhängige Eventgenerierung @@ -7296,17 +7322,20 @@ sub __saveLastSnapToCache { my $paref = shift; my $name = $paref->{name}; - return if(!exists $data{SSCam}{$name}{TMPDA}->{data}{data}[0]{imageData}); # kein Snap vorhanden + delHashRefDeep ($data{SSCam}{$name}{LASTSNAP}); + delete $data{SSCam}{$name}{LASTSNAP}; + + return if(!exists $owndata{TMPDA}->{data}{data}[0]{imageData}); # kein Snap vorhanden my $cache = cache($name, "c_init"); # Cache initialisieren Log3 ($name, 1, "$name - Fall back to internal Cache due to preceding failure.") if(!$cache); if (!$cache || $cache eq "internal" ) { - $data{SSCam}{$name}{LASTSNAP} = $data{SSCam}{$name}{TMPDA}->{data}{data}[0]{imageData}; + $data{SSCam}{$name}{LASTSNAP} = $owndata{TMPDA}->{data}{data}[0]{imageData}; } else { - cache ($name, "c_write", "{LASTSNAP}", $data{SSCam}{$name}{TMPDA}->{data}{data}[0]{imageData}); + cache ($name, "c_write", "{LASTSNAP}", $owndata{TMPDA}->{data}{data}[0]{imageData}); } return; @@ -7326,16 +7355,16 @@ sub __doSnapRotation { my %snaps = ( 0 => {'createdTm' => 'n.a.', 'fileName' => 'n.a.','snapid' => 'n.a.'} ); # Hilfshash my ($k,$l) = (0,0); - if ($data{SSCam}{$name}{TMPDA}->{'data'}{'data'}[0]{'createdTm'}) { - while ($data{SSCam}{$name}{TMPDA}->{'data'}{'data'}[$k]) { + if ($owndata{TMPDA}->{'data'}{'data'}[0]{'createdTm'}) { + while ($owndata{TMPDA}->{'data'}{'data'}[$k]) { - if (!$data{SSCam}{$name}{TMPDA}->{'data'}{'data'}[$k]{'camName'} || - $data{SSCam}{$name}{TMPDA}->{'data'}{'data'}[$k]{'camName'} ne $camname) { # Forum:#97706 + if (!$owndata{TMPDA}->{'data'}{'data'}[$k]{'camName'} || + $owndata{TMPDA}->{'data'}{'data'}[$k]{'camName'} ne $camname) { # Forum:#97706 $k += 1; next; } - my @t = split " ", FmtDateTime ($data{SSCam}{$name}{TMPDA}->{data}{data}[$k]{createdTm}); + my @t = split " ", FmtDateTime ($owndata{TMPDA}->{data}{data}[$k]{createdTm}); my @d = split "-", $t[0]; my $createdTm; @@ -7347,10 +7376,10 @@ sub __doSnapRotation { } $snaps{$l}{createdTm} = $createdTm; - $snaps{$l}{fileName} = $data{SSCam}{$name}{TMPDA}->{data}{data}[$k]{fileName}; - $snaps{$l}{snapid} = $data{SSCam}{$name}{TMPDA}->{data}{data}[$k]{id}; + $snaps{$l}{fileName} = $owndata{TMPDA}->{data}{data}[$k]{fileName}; + $snaps{$l}{snapid} = $owndata{TMPDA}->{data}{data}[$k]{id}; - Log3 ($name,4, "$name - Snap [$l]: ID => $data{SSCam}{$name}{TMPDA}->{data}{data}[$k]{id}, File => $data{SSCam}{$name}{TMPDA}->{data}{data}[$k]{fileName}, Created => $createdTm"); + Log3 ($name,4, "$name - Snap [$l]: ID => $owndata{TMPDA}->{data}{data}[$k]{id}, File => $owndata{TMPDA}->{data}{data}[$k]{fileName}, Created => $createdTm"); $l += 1; $k += 1; @@ -7363,7 +7392,8 @@ sub __doSnapRotation { my $o = ReadingsVal ($name, "LastSnapId", "n.a."); if ($rotnum && "$o" ne "$snaps{0}{snapid}") { - @$aref = sort{$b<=>$a}keys %snaps; + @$aref = sort {$b<=>$a} keys %snaps; + for my $key (@$aref) { rotateReading ($hash, "LastSnapId", $snaps{$key}{snapid}, $rotnum, 1); rotateReading ($hash, "LastSnapFilename", $snaps{$key}{fileName}, $rotnum, 1); @@ -7371,7 +7401,8 @@ sub __doSnapRotation { } } else { - @$aref = sort{$a<=>$b}keys %snaps; + @$aref = sort {$a<=>$b} keys %snaps; + rotateReading ($hash, "LastSnapId", $snaps{$$aref[0]}{snapid}, $rotnum, 1); rotateReading ($hash, "LastSnapFilename", $snaps{$$aref[0]}{fileName}, $rotnum, 1); rotateReading ($hash, "LastSnapTime" , $snaps{$$aref[0]}{createdTm}, $rotnum, 1); @@ -7385,18 +7416,19 @@ return; # und in SNAPHASH löschen ############################################################################### sub __moveSnapCacheToOld { - my $paref = shift; - my $name = $paref->{name}; - my $aref = $paref->{aref}; + my $paref = shift; + my $name = $paref->{name}; + my $aref = $paref->{aref}; + my $snapoldhash = $paref->{snapoldhash}; - my $cache = cache($name, "c_init"); # Cache initialisieren + my $cache = cache ($name, "c_init"); # Cache initialisieren Log3 ($name, 1, "$name - Fall back to internal Cache due to preceding failure.") if(!$cache); if (!$cache || $cache eq "internal" ) { - if ($data{SSCam}{$name}{SNAPHASH}) { - for my $key (sort(keys%{$data{SSCam}{$name}{SNAPHASH}})) { - $data{SSCam}{$name}{SNAPOLDHASH}{$key} = delete $data{SSCam}{$name}{SNAPHASH}{$key}; + if (exists $data{SSCam}{$name}{SNAPHASH}) { + for my $key (sort keys %{$data{SSCam}{$name}{SNAPHASH}}) { + $snapoldhash->{$key} = delete $data{SSCam}{$name}{SNAPHASH}{$key}; } } } @@ -7409,28 +7441,26 @@ sub __moveSnapCacheToOld { } ); - my %seen; - my @unique = sort{$a<=>$b} grep { !$seen{$_}++ } @$aref; + my (%seen, $tmp); + my @unique = sort {$a<=>$b} grep { !$seen{$_}++ } @$aref; for my $key (@unique) { - $data{SSCam}{$name}{TMP} = cache($name, "c_read", "{SNAPHASH}{$key}{snapid}"); - cache ($name, "c_write", "{SNAPOLDHASH}{$key}{snapid}", $data{SSCam}{$name}{TMP}) if($data{SSCam}{$name}{TMP}); + $tmp = cache ($name, "c_read", "{SNAPHASH}{$key}{snapid}"); + cache ($name, "c_write", "{SNAPOLDHASH}{$key}{snapid}", $tmp) if($tmp); cache ($name, "c_remove", "{SNAPHASH}{$key}{snapid}"); - $data{SSCam}{$name}{TMP} = cache($name, "c_read", "{SNAPHASH}{$key}{createdTm}"); - cache ($name, "c_write", "{SNAPOLDHASH}{$key}{createdTm}", $data{SSCam}{$name}{TMP}) if($data{SSCam}{$name}{TMP}); + $tmp = cache ($name, "c_read", "{SNAPHASH}{$key}{createdTm}"); + cache ($name, "c_write", "{SNAPOLDHASH}{$key}{createdTm}", $tmp) if($tmp); cache ($name, "c_remove", "{SNAPHASH}{$key}{createdTm}"); - $data{SSCam}{$name}{TMP} = cache($name, "c_read", "{SNAPHASH}{$key}{fileName}"); - cache ($name, "c_write", "{SNAPOLDHASH}{$key}{fileName}", $data{SSCam}{$name}{TMP}) if($data{SSCam}{$name}{TMP}); + $tmp = cache ($name, "c_read", "{SNAPHASH}{$key}{fileName}"); + cache ($name, "c_write", "{SNAPOLDHASH}{$key}{fileName}", $tmp) if($tmp); cache ($name, "c_remove", "{SNAPHASH}{$key}{fileName}"); - $data{SSCam}{$name}{TMP} = cache($name, "c_read", "{SNAPHASH}{$key}{imageData}"); - cache ($name, "c_write", "{SNAPOLDHASH}{$key}{imageData}", $data{SSCam}{$name}{TMP}) if($data{SSCam}{$name}{TMP}); + $tmp = cache ($name, "c_read", "{SNAPHASH}{$key}{imageData}"); + cache ($name, "c_write", "{SNAPOLDHASH}{$key}{imageData}", $tmp) if($tmp); cache ($name, "c_remove", "{SNAPHASH}{$key}{imageData}"); } - - delete $data{SSCam}{$name}{TMP}; } return; @@ -7452,24 +7482,26 @@ sub __insertSnapsToCache { my $i = 0; my $sn = 0; - my $cache; + my ($cache, $createdTm); + + delHashRefDeep ($data{SSCam}{$name}{SNAPHASH}); + delete $data{SSCam}{$name}{SNAPHASH}; # vorhandenen Snaphash löschen - while ($data{SSCam}{$name}{TMPDA}->{'data'}{'data'}[$i]) { - if (!$data{SSCam}{$name}{TMPDA}->{'data'}{'data'}[$i]{'camName'} || - $data{SSCam}{$name}{TMPDA}->{'data'}{'data'}[$i]{'camName'} ne $camname) { # Forum:#97706 + while ($owndata{TMPDA}{'data'}{'data'}[$i]) { + if (!$owndata{TMPDA}{'data'}{'data'}[$i]{'camName'} || + $owndata{TMPDA}{'data'}{'data'}[$i]{'camName'} ne $camname) { # Forum:#97706 $i += 1; next; } - my $snapid = delete $data{SSCam}{$name}{TMPDA}->{data}{data}[$i]{id}; - my $fileName = delete $data{SSCam}{$name}{TMPDA}->{data}{data}[$i]{fileName}; - $data{SSCam}{$name}{TMP} = delete $data{SSCam}{$name}{TMPDA}->{data}{data}[$i]{imageData}; # Image data of snapshot in base64 format + my $snapid = delete $owndata{TMPDA}{data}{data}[$i]{id}; + my $fileName = delete $owndata{TMPDA}{data}{data}[$i]{fileName}; + my $imgdat = delete $owndata{TMPDA}{data}{data}[$i]{imageData}; # Image data of snapshot in base64 format - my @t = split(" ", FmtDateTime ($data{SSCam}{$name}{TMPDA}->{data}{data}[$i]{createdTm})); - my @d = split("-", $t[0]); - - my $createdTm; - if ($lang eq "DE") { + my @t = split " ", FmtDateTime ($owndata{TMPDA}{data}{data}[$i]{createdTm}); + my @d = split "-", $t[0]; + + if ($lang eq 'DE') { $createdTm = "$d[2].$d[1].$d[0] / $t[1]"; } else { @@ -7480,21 +7512,21 @@ sub __insertSnapsToCache { ############################################## if (canEmailSnap($hash) || canTeleSnap($hash) || canChatSnap($hash)) { if ($tac) { - $cache = cache($name, "c_init"); # Cache initialisieren + $cache = cache($name, "c_init"); # Cache initialisieren Log3 ($name, 1, "$name - Fall back to internal Cache due to preceding failure.") if(!$cache); if (!$cache || $cache eq "internal" ) { - $data{SSCam}{$name}{SENDSNAPS}{$tac}{$sn}{snapid} = $snapid; - $data{SSCam}{$name}{SENDSNAPS}{$tac}{$sn}{createdTm} = $createdTm; - $data{SSCam}{$name}{SENDSNAPS}{$tac}{$sn}{fileName} = $fileName; - $data{SSCam}{$name}{SENDSNAPS}{$tac}{$sn}{imageData} = $data{SSCam}{$name}{TMP}; + $owndata{SENDSNAPS}{$tac}{$sn}{snapid} = $snapid; + $owndata{SENDSNAPS}{$tac}{$sn}{createdTm} = $createdTm; + $owndata{SENDSNAPS}{$tac}{$sn}{fileName} = $fileName; + $owndata{SENDSNAPS}{$tac}{$sn}{imageData} = $imgdat; } else { cache ($name, "c_write", "{SENDSNAPS}{$tac}{$sn}{snapid}", $snapid); cache ($name, "c_write", "{SENDSNAPS}{$tac}{$sn}{createdTm}", $createdTm); cache ($name, "c_write", "{SENDSNAPS}{$tac}{$sn}{fileName}", $fileName); - cache ($name, "c_write", "{SENDSNAPS}{$tac}{$sn}{imageData}", $data{SSCam}{$name}{TMP}); + cache ($name, "c_write", "{SENDSNAPS}{$tac}{$sn}{imageData}", $imgdat); } Log3 ($name,4, "$name - Snap '$sn' (tac: $tac) added to send gallery hash: ID => $snapid, File => $fileName, Created => $createdTm"); @@ -7509,26 +7541,24 @@ sub __insertSnapsToCache { $cache = cache ($name, "c_init"); # Cache initialisieren Log3 ($name, 1, "$name - Fall back to internal Cache due to preceding failure.") if(!$cache); - + if (!$cache || $cache eq "internal" ) { $data{SSCam}{$name}{SNAPHASH}{$sn}{snapid} = $snapid; $data{SSCam}{$name}{SNAPHASH}{$sn}{createdTm} = $createdTm; $data{SSCam}{$name}{SNAPHASH}{$sn}{fileName} = $fileName; - $data{SSCam}{$name}{SNAPHASH}{$sn}{imageData} = $data{SSCam}{$name}{TMP}; + $data{SSCam}{$name}{SNAPHASH}{$sn}{imageData} = $imgdat; } else { - cache($name, "c_write", "{SNAPHASH}{$sn}{snapid}", $snapid ); - cache($name, "c_write", "{SNAPHASH}{$sn}{createdTm}", $createdTm); - cache($name, "c_write", "{SNAPHASH}{$sn}{fileName}", $fileName ); - cache($name, "c_write", "{SNAPHASH}{$sn}{imageData}", $data{SSCam}{$name}{TMP}); + cache ($name, "c_write", "{SNAPHASH}{$sn}{snapid}", $snapid ); + cache ($name, "c_write", "{SNAPHASH}{$sn}{createdTm}", $createdTm); + cache ($name, "c_write", "{SNAPHASH}{$sn}{fileName}", $fileName ); + cache ($name, "c_write", "{SNAPHASH}{$sn}{imageData}", $imgdat); } Log3 ($name, 4, "$name - Snap '$sn' added to gallery view hash: SN => $sn, ID => $snapid, File => $fileName, Created => $createdTm"); $sn += 1; $i += 1; - - delete $data{SSCam}{$name}{TMP}; } return $sn; @@ -7539,9 +7569,10 @@ return $sn; # Cache SNAPHASH anhängen ############################################################################### sub __copySnapsBackFromOld { - my $paref = shift; - my $name = $paref->{name}; - my $sn = $paref->{sn}; # letzte lfd. Nummer aktueller Snaphash + my $paref = shift; + my $name = $paref->{name}; + my $sn = $paref->{sn}; # letzte lfd. Nummer aktueller Snaphash + my $snapoldhash = $paref->{snapoldhash}; my $hash = $defs{$name}; my $snapnum = $hash->{HELPER}{SNAPLIMIT} // $defSlim; @@ -7549,44 +7580,44 @@ sub __copySnapsBackFromOld { my $ss = $sn; $sn = 0; - my $cache = cache($name, "c_init"); # Cache initialisieren + my $cache = cache ($name, 'c_init'); # Cache initialisieren Log3 ($name, 1, "$name - Fall back to internal Cache due to preceding failure.") if(!$cache); - if (!$cache || $cache eq "internal" ) { - if ($data{SSCam}{$name}{SNAPOLDHASH} && $sgn > $ss) { + if (!$cache || $cache eq 'internal' ) { + if ($snapoldhash && $sgn > $ss) { for my $kn ($ss..($sgn-1)) { - $data{SSCam}{$name}{SNAPHASH}{$kn}{snapid} = delete $data{SSCam}{$name}{SNAPOLDHASH}{$sn}{snapid}; - $data{SSCam}{$name}{SNAPHASH}{$kn}{createdTm} = delete $data{SSCam}{$name}{SNAPOLDHASH}{$sn}{createdTm}; - $data{SSCam}{$name}{SNAPHASH}{$kn}{fileName} = delete $data{SSCam}{$name}{SNAPOLDHASH}{$sn}{fileName}; - $data{SSCam}{$name}{SNAPHASH}{$kn}{imageData} = delete $data{SSCam}{$name}{SNAPOLDHASH}{$sn}{imageData}; - + $data{SSCam}{$name}{SNAPHASH}{$kn}{snapid} = delete $snapoldhash->{$sn}{snapid}; + $data{SSCam}{$name}{SNAPHASH}{$kn}{createdTm} = delete $snapoldhash->{$sn}{createdTm}; + $data{SSCam}{$name}{SNAPHASH}{$kn}{fileName} = delete $snapoldhash->{$sn}{fileName}; + $data{SSCam}{$name}{SNAPHASH}{$kn}{imageData} = delete $snapoldhash->{$sn}{imageData}; + $sn += 1; } } } else { + my $tmp; + for my $kn ($ss..($sgn-1)) { - $data{SSCam}{$name}{TMP} = cache($name, "c_read", "{SNAPOLDHASH}{$sn}{snapid}"); - cache ($name, "c_write", "{SNAPHASH}{$kn}{snapid}", $data{SSCam}{$name}{TMP}) if($data{SSCam}{$name}{TMP}); + $tmp = cache ($name, "c_read", "{SNAPOLDHASH}{$sn}{snapid}"); + cache ($name, "c_write", "{SNAPHASH}{$kn}{snapid}", $tmp) if($tmp); cache ($name, "c_remove", "{SNAPOLDHASH}{$sn}{snapid}"); - $data{SSCam}{$name}{TMP} = cache($name, "c_read", "{SNAPOLDHASH}{$sn}{createdTm}"); - cache ($name, "c_write", "{SNAPHASH}{$kn}{createdTm}", $data{SSCam}{$name}{TMP}) if($data{SSCam}{$name}{TMP}); + $tmp = cache ($name, "c_read", "{SNAPOLDHASH}{$sn}{createdTm}"); + cache ($name, "c_write", "{SNAPHASH}{$kn}{createdTm}", $tmp) if($tmp); cache ($name, "c_remove", "{SNAPOLDHASH}{$sn}{createdTm}"); - $data{SSCam}{$name}{TMP} = cache($name, "c_read", "{SNAPOLDHASH}{$sn}{fileName}"); - cache ($name, "c_write", "{SNAPHASH}{$kn}{fileName}", $data{SSCam}{$name}{TMP}) if($data{SSCam}{$name}{TMP}); + $tmp = cache ($name, "c_read", "{SNAPOLDHASH}{$sn}{fileName}"); + cache ($name, "c_write", "{SNAPHASH}{$kn}{fileName}", $tmp) if($tmp); cache ($name, "c_remove", "{SNAPOLDHASH}{$sn}{fileName}" ); - $data{SSCam}{$name}{TMP} = cache($name, "c_read", "{SNAPOLDHASH}{$sn}{imageData}"); - cache ($name, "c_write", "{SNAPHASH}{$kn}{imageData}", $data{SSCam}{$name}{TMP}) if($data{SSCam}{$name}{TMP}); + $tmp = cache ($name, "c_read", "{SNAPOLDHASH}{$sn}{imageData}"); + cache ($name, "c_write", "{SNAPHASH}{$kn}{imageData}", $tmp) if($tmp); cache ($name, "c_remove", "{SNAPOLDHASH}{$sn}{imageData}"); $sn += 1; } - - delete $data{SSCam}{$name}{TMP}; } return; @@ -8044,7 +8075,7 @@ sub streamDev { ## no critic 'comp my ($ttmjpegrun, $tthlsrun, $ttlrrun, $tth264run, $ttlmjpegrun, $ttlsnaprun); # Hinweis Popups - if(AttrVal("global","language","EN") =~ /EN/x) { + if (AttrVal("global","language","EN") =~ /EN/x) { $ttrefresh = $ttips_en{"ttrefresh"}; $ttrefresh =~ s/§NAME§/$calias/gx; $ttrecstart = $ttips_en{"ttrecstart"}; $ttrecstart =~ s/§NAME§/$calias/gx; $ttrecstop = $ttips_en{"ttrecstop"}; $ttrecstop =~ s/§NAME§/$calias/gx; @@ -8166,7 +8197,7 @@ sub streamDev { ## no critic 'comp my $ismm = IsModelMaster($omodel); # prüfen ob Streaming Dev ist MODEL = master - if(!$ismm && (!$StmKey || ReadingsVal($camname, "Availability", "") ne "enabled" || IsDisabled($camname))) { + 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"; @@ -8181,7 +8212,7 @@ sub streamDev { ## no critic 'comp # Streaming ausführen no strict "refs"; ## no critic 'NoStrict' - if($sdfn{$fmt}) { + if ($sdfn{$fmt}) { $ret .= &{$sdfn{$fmt}{fn}} (\%params) if(defined &{$sdfn{$fmt}{fn}}); } else { @@ -8367,6 +8398,7 @@ sub _streamDevLASTSNAP { ## no critic 'not $ret .= "
$cause
![](\"$FW_ME/www/images/sscam/black_btn_DOSNAP.png\")
";
- # bei Aufruf durch FTUI Kommandosyntax anpassen
- if ($ftui) {
+ if ($ftui) { # bei Aufruf durch FTUI Kommandosyntax anpassen
$cmddosnap = "ftui.setFhemStatus('set $name snap 1 2 STRM:$uuid')";
}
my $ha = AttrVal ($name, "snapGalleryHtmlAttr", AttrVal ($name, "htmlattr", 'width="500" height="325"'));
- # falls "composeGallery" durch ein SSCamSTRM-Device aufgerufen wird
- my $pws = "";
+ # falls durch ein SSCamSTRM-Device aufgerufen
+ ###############################################
+ my $pws = "";
+
if ($strmdev) {
- $pws = AttrVal ($strmdev, "popupWindowSize", ""); # Größe eines Popups (umgelegt: Forum:https://forum.fhem.de/index.php/topic,45671.msg927912.html#msg927912)
+ $pws = AttrVal ($strmdev, 'popupWindowSize', ''); # Größe eines Popups (umgelegt: Forum:https://forum.fhem.de/index.php/topic,45671.msg927912.html#msg927912)
$pws =~ s/"//xg if($pws);
- $ha = AttrVal ($strmdev, "htmlattr", $ha); # htmlattr vom SSCamSTRM-Device übernehmen falls von SSCamSTRM-Device aufgerufen und gesetzt
- $hb = AttrVal ($strmdev, "hideButtons", 0); # Drucktasten im unteren Bereich ausblenden ?
+ $ha = AttrVal ($strmdev, 'htmlattr', $ha); # htmlattr vom SSCamSTRM-Device übernehmen falls von SSCamSTRM-Device aufgerufen und gesetzt
+ $hb = AttrVal ($strmdev, 'hideButtons', 0); # Drucktasten im unteren Bereich ausblenden ?
if ($ftui) {
$ha = AttrVal ($strmdev, "htmlattrFTUI", $ha); # wenn aus FTUI aufgerufen divers setzen
}
}
- # wenn SSCamSTRM-device genutzt wird und attr "snapGalleryBoost" nicht gesetzt ist -> Warnung in Gallerie ausgeben
- my $sgbnote = " ";
+ my $sgbnote = ' '; # wenn SSCamSTRM-device genutzt wird und attr "snapGalleryBoost" nicht gesetzt ist -> Warnung in Gallerie ausgeben
+
if ($strmdev && !AttrVal($name, 'snapGalleryBoost', $sgbdef)) {
$sgbnote = "CAUTION - The gallery is not updated automatically. Please set the attribute \"snapGalleryBoost=1\" in device $name";
$sgbnote = "ACHTUNG - Die Galerie wird nicht automatisch aktualisiert. Dazu bitte das Attribut \"snapGalleryBoost=1\" im Device $name setzen." if($lang eq "DE");
@@ -9241,14 +9275,14 @@ sub composeGallery {
$ttsnap = $ttips_de{"ttsnap"}; $ttsnap =~ s/§NAME§/$camname/xg;
}
- # Header Generierung
- my $header;
+ my $header; # Header Generierung
+
if ($strmdev) { # Forum: https://forum.fhem.de/index.php/topic,45671.msg975610.html#msg975610
if ($ftui) {
- $header .= "$dlink " if(!AttrVal ($strmdev,"hideDisplayNameFTUI",0)); + $header .= "$dlink
" if(!AttrVal ($strmdev, 'hideDisplayNameFTUI', 0)); } else { - $header .= "$dlink
" if(!AttrVal ($strmdev,"hideDisplayName",0)); + $header .= "$dlink
" if(!AttrVal ($strmdev, 'hideDisplayName', 0)); } } @@ -9275,12 +9309,12 @@ sub composeGallery { $htmlCode .= "
')\"" if(AttrVal($name, 'snapGalleryBoost', $sgbdef));
+ $tmp = "onClick=\"FW_okDialog('
')\"" if(AttrVal($name, 'snapGalleryBoost', $sgbdef));
}
- $data{SSCam}{$name}{TMPIDAT} = '' if(!defined $data{SSCam}{$name}{TMPIDAT});
+ $tmp = '' if(!defined $tmp);
$cell++;
if ($cell == $sgc + 1) {
- $htmlCode .= sprintf("
')\"" if(AttrVal ($name, 'snapGalleryBoost', $sgbdef));
+ $tmp = "onClick=\"FW_okDialog('
')\"" if(AttrVal ($name, 'snapGalleryBoost', $sgbdef));
}
- $data{SSCam}{$name}{TMPIDAT} = '' if(!defined $data{SSCam}{$name}{TMPIDAT});
+ $tmp = '' if(!defined $tmp);
$cell++;
if ($cell == $sgc + 1) {
- $htmlCode .= sprintf ("