diff --git a/fhem/CHANGED b/fhem/CHANGED index dbd1099cc..7a73d7dc8 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 49_SSCam: internal code changed - change: 88_Timer: Remove line end when importing file of the saved timers Background color of the table from CSS Correction log level diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index 5061e3169..b038fd1f8 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -48,6 +48,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; # Versions History intern our %SSCam_vNotesIntern = ( + "8.19.6" => "14.10.2019 optimize memory usage of SSCam_composegallery ", "8.19.5" => "13.10.2019 change FH to Data in SSCam_sendEmailblocking, save variables ", "8.19.4" => "11.10.2019 further optimize memory usage when send recordings by email and/or telegram ", "8.19.3" => "09.10.2019 optimize memory usage when send images and recordings by email and/or telegram ", @@ -7722,8 +7723,7 @@ return $ret; sub SSCam_composegallery ($;$$$) { my ($name,$strmdev,$model,$ftui) = @_; my $hash = $defs{$name}; - my $camname = $hash->{CAMNAME}; - # my $allsnaps = $data{SSCam}{$name}{SNAPHASH}; + my $camname = $hash->{CAMNAME}; my $sgc = AttrVal($name,"snapGalleryColumns",3); # Anzahl der Images in einer Tabellenzeile my $lss = ReadingsVal($name, "LastSnapTime", ""); # Zeitpunkt neueste Aufnahme my $lang = AttrVal("global","language","EN"); # Systemsprache @@ -7815,7 +7815,6 @@ sub SSCam_composegallery ($;$$$) { $header .= $sgbnote; my $gattr = (AttrVal($name,"snapGallerySize","Icon") eq "Full")?$ha:""; - my @as = sort{$a<=>$b}keys %{$data{SSCam}{$name}{SNAPHASH}}; # Ausgabetabelle erstellen my ($htmlCode); @@ -7827,27 +7826,27 @@ sub SSCam_composegallery ($;$$$) { $htmlCode .= ""; my $cell = 1; - foreach my $key (@as) { - # $ct = $data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}; - my $idata = ""; + my $idata = ""; + foreach my $key (sort{$a<=>$b}keys %{$data{SSCam}{$name}{SNAPHASH}}) { if(!$ftui) { $idata = "onClick=\"FW_okDialog('')\"" if(AttrVal($name,"snapGalleryBoost",0)); } - my $html = sprintf("$data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}
" ); $cell++; if ( $cell == $sgc+1 ) { - $htmlCode .= $html; + $htmlCode .= sprintf("$data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}
" );; $htmlCode .= ""; $htmlCode .= ""; $cell = 1; } else { - $htmlCode .= $html; + $htmlCode .= sprintf("$data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}
" );; } + + $idata = ""; } if ( $cell == 2 ) { - $htmlCode .= " "; + $htmlCode .= " "; } $htmlCode .= ""; @@ -7858,7 +7857,7 @@ sub SSCam_composegallery ($;$$$) { $htmlCode .= "$imgdosnap " if($strmdev); } $htmlCode .= ""; - + return $htmlCode; } diff --git a/fhem/contrib/DS_Starter/49_SSCam.pm b/fhem/contrib/DS_Starter/49_SSCam.pm index 226766e8a..d3ce1ab4c 100644 --- a/fhem/contrib/DS_Starter/49_SSCam.pm +++ b/fhem/contrib/DS_Starter/49_SSCam.pm @@ -48,6 +48,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; # Versions History intern our %SSCam_vNotesIntern = ( + "8.19.6" => "14.10.2019 optimize memory usage of SSCam_composegallery ", "8.19.5" => "13.10.2019 change FH to Data in SSCam_sendEmailblocking, save variables ", "8.19.4" => "11.10.2019 further optimize memory usage when send recordings by email and/or telegram ", "8.19.3" => "09.10.2019 optimize memory usage when send images and recordings by email and/or telegram ", @@ -7722,8 +7723,7 @@ return $ret; sub SSCam_composegallery ($;$$$) { my ($name,$strmdev,$model,$ftui) = @_; my $hash = $defs{$name}; - my $camname = $hash->{CAMNAME}; - # my $allsnaps = $data{SSCam}{$name}{SNAPHASH}; + my $camname = $hash->{CAMNAME}; my $sgc = AttrVal($name,"snapGalleryColumns",3); # Anzahl der Images in einer Tabellenzeile my $lss = ReadingsVal($name, "LastSnapTime", ""); # Zeitpunkt neueste Aufnahme my $lang = AttrVal("global","language","EN"); # Systemsprache @@ -7815,7 +7815,6 @@ sub SSCam_composegallery ($;$$$) { $header .= $sgbnote; my $gattr = (AttrVal($name,"snapGallerySize","Icon") eq "Full")?$ha:""; - my @as = sort{$a<=>$b}keys %{$data{SSCam}{$name}{SNAPHASH}}; # Ausgabetabelle erstellen my ($htmlCode); @@ -7827,27 +7826,27 @@ sub SSCam_composegallery ($;$$$) { $htmlCode .= ""; my $cell = 1; - foreach my $key (@as) { - # $ct = $data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}; - my $idata = ""; + my $idata = ""; + foreach my $key (sort{$a<=>$b}keys %{$data{SSCam}{$name}{SNAPHASH}}) { if(!$ftui) { $idata = "onClick=\"FW_okDialog('')\"" if(AttrVal($name,"snapGalleryBoost",0)); } - my $html = sprintf("$data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}
" ); $cell++; if ( $cell == $sgc+1 ) { - $htmlCode .= $html; + $htmlCode .= sprintf("$data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}
" );; $htmlCode .= ""; $htmlCode .= ""; $cell = 1; } else { - $htmlCode .= $html; + $htmlCode .= sprintf("$data{SSCam}{$name}{SNAPHASH}{$key}{createdTm}
" );; } + + $idata = ""; } if ( $cell == 2 ) { - $htmlCode .= " "; + $htmlCode .= " "; } $htmlCode .= ""; @@ -7858,7 +7857,7 @@ sub SSCam_composegallery ($;$$$) { $htmlCode .= "$imgdosnap " if($strmdev); } $htmlCode .= ""; - + return $htmlCode; }