FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 20:06:18 +00:00
Code Issues Releases Wiki Activity

49_SSCam: contrib 9.0.2

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20446 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-11-03 17:50:18 +00:00
parent 3f68a324a3
commit e1787f7d66
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fhem/contrib/DS_Starter/49_SSCam.pm
View File

@ -54,6 +54,7 @@ eval "use Cache::Cache;1;" or my $SScamMMCacheCache = "Cache::Cache";
# Versions History intern # Versions History intern
our %SSCam_vNotesIntern = ( our %SSCam_vNotesIntern = (
"9.0.2" => "03.11.2019 change Streamdev type \"lastsnap\" use \$data Hash or CHI cache ",
"9.0.1" => "02.11.2019 correct snapgallery number of snaps in case of cache usage, fix display number of retrieved snaps ", "9.0.1" => "02.11.2019 correct snapgallery number of snaps in case of cache usage, fix display number of retrieved snaps ",
"9.0.0" => "26.10.2019 finalize all changes beginning with 8.20.0 and revised commandref ", "9.0.0" => "26.10.2019 finalize all changes beginning with 8.20.0 and revised commandref ",
"8.23.0" => "26.10.2019 new attribute \"debugCachetime\" ", "8.23.0" => "26.10.2019 new attribute \"debugCachetime\" ",
@ -5517,7 +5518,16 @@ sub SSCam_camop_parse ($) {
my ($cache,@as,$g); my ($cache,@as,$g);
Log3($name, $verbose, "$name - Snapinfos of camera $camname retrieved"); Log3($name, $verbose, "$name - Snapinfos of camera $camname retrieved");
$hash->{HELPER}{".LASTSNAP"} = $data->{data}{data}[0]{imageData}; # aktuellster Snap zur Anzeige im StreamDev "lastsnap"
# aktuellsten Snap zur Anzeige im StreamDev "lastsnap" speichern
# $hash->{HELPER}{".LASTSNAP"} = $data->{data}{data}[0]{imageData};
$cache = SSCam_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->{data}{data}[0]{imageData};
} else {
SSCam_cache($name, "c_write", "{LASTSNAP}", $data->{data}{data}[0]{imageData});
}
my %snaps = ( 0 => {'createdTm' => 'n.a.', 'fileName' => 'n.a.','snapid' => 'n.a.'} ); # Hilfshash my %snaps = ( 0 => {'createdTm' => 'n.a.', 'fileName' => 'n.a.','snapid' => 'n.a.'} ); # Hilfshash
my ($k,$l) = (0,0); my ($k,$l) = (0,0);
@ -7598,7 +7608,15 @@ sub SSCam_StreamDev($$$;$) {
} }
} elsif ($fmt =~ /lastsnap/) { } elsif ($fmt =~ /lastsnap/) {
$link = $hash->{HELPER}{".LASTSNAP"}; # $link = $hash->{HELPER}{".LASTSNAP"};
my $cache = SSCam_cache($camname, "c_init"); # Cache initialisieren
Log3($camname, 1, "$camname - Fall back to internal Cache due to preceding failure.") if(!$cache);
if(!$cache || $cache eq "internal" ) {
$link = $data{SSCam}{$camname}{LASTSNAP};
} else {
$link = SSCam_cache($camname, "c_read", "{LASTSNAP}");
}
my $gattr = (AttrVal($camname,"snapGallerySize","Icon") eq "Full")?$ha:""; my $gattr = (AttrVal($camname,"snapGallerySize","Icon") eq "Full")?$ha:"";
if($link) { if($link) {
if(!$ftui) { if(!$ftui) {