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

49_SSCam: usage of attribute \"livestreamprefix\" changed, minor code changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17654 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-10-31 22:44:31 +00:00
parent e0547f32bf
commit 7594b4ba38
5 changed files with 181 additions and 9624 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/CHANGED
View File

@ -1,5 +1,8 @@
# 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.
- changed: 49_SSCam: usage of attribute \"livestreamprefix\" changed,
minor code changes, SSCamSTRM changed for compatibility
and new attributes with direct attribute help
- feature: 74_Unifi: Added readings for wan_ip and results of speedtest
- feature: 77_UWZ: new language support, french and hollandisch
- change: 93_DbRep: V8.6.0, devices and readings can be excluded by

94
fhem/FHEM/49_SSCam.pm
View File

@ -36,9 +36,17 @@ package main;
use strict;
use warnings;
eval "use JSON qw( decode_json );1;" or my $SScamMMDBI = "JSON"; # Debian: apt-get install libjson-perl
use Data::Dumper; # Perl Core module
use MIME::Base64;
use Time::HiRes;
use HttpUtils;
# no if $] >= 5.017011, warnings => 'experimental';
# Versions History intern
our %SSCam_vNotesIntern = (
"7.3.1" => "31.10.2018 fix connection lost failure if several SSCamSTRM devices are defined and updated by longpoll from same parent device ",
"7.3.0" => "28.10.2018 usage of attribute \"livestreamprefix\" changed, exec SSCam_getStmUrlPath on boot ",
"7.2.1" => "23.10.2018 new routine SSCam_versionCheck, COMPATIBILITY changed to 8.2.1 ",
"7.2.0" => "20.10.2018 direct help for attributes, new get versionNotes command, fix PERL WARNING: Use of uninitialized value \$small, get versionNotes ",
"7.1.1" => "18.10.2018 Message of \"Your current/simulated SVS-version...\" changed, commandref corrected ",
@ -83,6 +91,7 @@ our %SSCam_vNotesIntern = (
# Versions History extern
our %SSCam_vNotesExtern = (
"7.3.0" => "28.10.2018 In attribute \"livestreamprefix\" can now \"DEF\" be specified to overwrite livestream address by specification from device definition ",
"7.2.1" => "23.10.2018 COMPATIBILITY changed to 8.2.1 ",
"7.2.0" => "20.10.2018 direct help for attributes, new get versionNotes command, please see commandref for details ",
"7.1.1" => "18.10.2018 Message of \"current/simulated SVS-version...\" changed, commandref corrected ",
@ -190,13 +199,6 @@ our %SSCam_vHintsExt_de = (
"Diese Vorlage kann zum Beispiel mit Paint.Net bearbeitet werden. ",
"1" => "Hilfreiche Hinweise zu SSCam im <a href=\"https://wiki.fhem.de/wiki/SSCAM_-_Steuerung_von_Kameras_in_Synology_Surveillance_Station\">FHEM-Wiki</a>"
);
eval "use JSON qw( decode_json );1;" or my $SScamMMDBI = "JSON"; # Debian: apt-get install libjson-perl
use Data::Dumper; # Perl Core module
use MIME::Base64;
use Time::HiRes;
use HttpUtils;
# no if $] >= 5.017011, warnings => 'experimental';
# getestete SVS-Version
my $compstat = "8.2.1";
@ -433,7 +435,7 @@ sub SSCam_Attr($$$$) {
if($aName =~ m/ptzPanel_row.*|ptzPanel_Home|ptzPanel_use/) {
InternalTimer(gettimeofday()+0.7, "SSCam_addptzattr", "$name", 0);
}
if ($aName eq "disable") {
if($cmd eq "set") {
$do = ($aVal) ? 1 : 0;
@ -556,8 +558,7 @@ sub SSCam_Attr($$$$) {
}
if($aName =~ m/pollcaminfoall/) {
return "The value of \"$aName\" has to be greater than 10 seconds." if($aVal <= 10);
}
}
}
if ($cmd eq "del") {
@ -1427,8 +1428,8 @@ sub SSCam_initonboot ($) {
if(SSCam_IsModelCam($hash)) {
# Kameraspezifische Infos holen
SSCam_getcaminfo($hash);
SSCam_getcapabilities($hash);
SSCam_getStmUrlPath($hash);
# Preset/Patrollisten in Hash einlesen zur PTZ-Steuerung
SSCam_getptzlistpreset($hash);
@ -3806,8 +3807,6 @@ return SSCam_camop($hash);
sub SSCam_camop ($) {
my ($hash) = @_;
my $name = $hash->{NAME};
my $serveraddr = $hash->{SERVERADDR};
my $serverport = $hash->{SERVERPORT};
my $apicam = $hash->{HELPER}{APICAM};
my $apicampath = $hash->{HELPER}{APICAMPATH};
my $apicammaxver = $hash->{HELPER}{APICAMMAXVER};
@ -3857,6 +3856,8 @@ sub SSCam_camop ($) {
my $OpMode = $hash->{OPMODE};
my $camid = $hash->{CAMID};
my $proto = $hash->{PROTOCOL};
my $serveraddr = $hash->{SERVERADDR};
my $serverport = $hash->{SERVERPORT};
my ($exturl,$winname,$attr,$room,$param);
my ($url,$snapid,$httptimeout,$expmode,$motdetsc);
@ -4120,7 +4121,9 @@ sub SSCam_camop ($) {
Log3($name, 4, "$name - trigger external event \"$hash->{HELPER}{EVENTID}\"");
$url = "$proto://$serveraddr:$serverport/webapi/$apiextevtpath?api=$apiextevt&version=$apiextevtmaxver&method=Trigger&eventId=$hash->{HELPER}{EVENTID}&eventName=$hash->{HELPER}{EVENTID}&_sid=\"$sid\"";
} elsif ($OpMode eq "runliveview" && $hash->{HELPER}{RUNVIEW} !~ m/snap|^live_.*hls$/) {
} elsif ($OpMode eq "runliveview" && $hash->{HELPER}{RUNVIEW} !~ m/snap|^live_.*hls$/) {
$exturl = AttrVal($name, "livestreamprefix", "$proto://$serveraddr:$serverport");
$exturl = ($exturl eq "DEF")?"$proto://$serveraddr:$serverport":$exturl;
if ($hash->{HELPER}{RUNVIEW} =~ m/live/) {
if($apiaudiostmmaxver) { # API "SYNO.SurveillanceStation.AudioStream" vorhanden ? (removed ab API v2.8)
$hash->{HELPER}{AUDIOLINK} = "$proto://$serveraddr:$serverport/webapi/$apiaudiostmpath?api=$apiaudiostm&version=$apiaudiostmmaxver&method=Stream&cameraId=$camid&_sid=$sid";
@ -4128,7 +4131,6 @@ sub SSCam_camop ($) {
delete $hash->{HELPER}{AUDIOLINK} if($hash->{HELPER}{AUDIOLINK});
}
$exturl = AttrVal($name, "livestreamprefix", "$proto://$serveraddr:$serverport");
if($apivideostmsmaxver) { # API "SYNO.SurveillanceStation.VideoStream" vorhanden ? (removed ab API v2.8)
# externe URL in Reading setzen
$exturl .= "/webapi/$apivideostmspath?api=$apivideostms&version=$apivideostmsmaxver&method=Stream&cameraId=$camid&format=mjpeg&_sid=$sid";
@ -4142,7 +4144,6 @@ sub SSCam_camop ($) {
} else {
# Abspielen der letzten Aufnahme (EventId)
$exturl = AttrVal($name, "livestreamprefix", "$proto://$serveraddr:$serverport");
# externe URL in Reading setzen
$exturl .= "/webapi/$apistmpath?api=$apistm&version=$apistmmaxver&method=EventStream&eventId=$hash->{HELPER}{CAMLASTRECID}&timestamp=1&_sid=$sid";
@ -4939,12 +4940,14 @@ sub SSCam_camop_parse ($) {
$unicastPath = $data->{'data'}[0]{'rtspPath'};
}
# Rewrite Url's falls livestreamprefix ist gesetzt
# Rewrite Url's falls livestreamprefix ist gesetzt
if (AttrVal($name, "livestreamprefix", undef)) {
my $exturl = AttrVal($name, "livestreamprefix", "$proto://$serveraddr:$serverport");
$exturl = ($exturl eq "DEF")?"$proto://$serveraddr:$serverport":$exturl;
my @mjh = split(/\//, $mjpegHttp, 4);
$mjpegHttp = AttrVal($name, "livestreamprefix", undef)."/".$mjh[3];
$mjpegHttp = $exturl."/".$mjh[3];
my @mxh = split(/\//, $mxpegHttp, 4);
$mxpegHttp = AttrVal($name, "livestreamprefix", undef)."/".$mxh[3];
$mxpegHttp = $exturl."/".$mxh[3];
if($unicastPath) {
my @ucp = split(/[@\|:]/, $unicastPath);
my @lspf = split(/[\/\/\|:]/, AttrVal($name, "livestreamprefix", undef));
@ -5778,18 +5781,15 @@ sub SSCam_refresh($$$$) {
}
# parentState des SSCamSTRM-Device mit Opmode updaten (mit/ohne Event)
my @strmdvs = devspec2array("TYPE=SSCamSTRM:FILTER=PARENT=".$name);
if(@strmdvs) {
foreach (@strmdvs) {
my $strmhash = $defs{$_};
if($lpoll_strm) {
readingsSingleUpdate($strmhash,"parentState", $hash->{OPMODE}, 1);
} else {
readingsSingleUpdate($strmhash,"parentState", $hash->{OPMODE}, 0);
}
}
if($hash->{HELPER}{STRMDEV}) {
my $strmhash = $defs{$hash->{HELPER}{STRMDEV}};
if($lpoll_strm) {
readingsSingleUpdate($strmhash,"parentState", $hash->{OPMODE}, 1);
} else {
readingsSingleUpdate($strmhash,"parentState", $hash->{OPMODE}, 0);
}
}
return;
}
@ -7543,8 +7543,20 @@ attr &lt;name&gt; genericStrmHtmlTag &lt;video $HTMLATTR controls autoplay&gt;
<a name="livestreamprefix"></a>
<li><b>livestreamprefix</b><br>
overwrites the specifications of protocol, servername and port for further use of the livestream address, e.g.
as an link to external use. It has to be specified as "http(s)://&lt;servername&gt;:&lt;port&gt;" </li><br>
Overwrites the specifications of protocol, servername and port for further use in livestream address and
StmKey.*-readings , e.g. as a link for external use. <br>
It can be specified of two ways as follows: <br><br>
<table>
<colgroup> <col width=25%> <col width=75%> </colgroup>
<tr><td> <b>DEF</b> </td><td>: the protocol, servername and port as specified in device
definition is used </td></tr>
<tr><td> <b>http(s)://&lt;servername&gt;:&lt;port&gt;</b> </td><td>: your own address specification is used </td></tr>
</table>
<br>
Servername can be the name or the IP-address of your Synology Surveillance Station.
</li><br>
<a name="loginRetries"></a>
<li><b>loginRetries</b><br>
@ -8874,9 +8886,21 @@ attr &lt;name&gt; genericStrmHtmlTag &lt;video $HTMLATTR controls autoplay&gt;
<a name="livestreamprefix"></a>
<li><b>livestreamprefix</b><br>
überschreibt die Angaben zu Protokoll, Servernamen und Port zur Weiterverwendung der
Livestreamadresse als z.B. externer Link. Anzugeben in der Form
"http(s)://&lt;servername&gt;:&lt;port&gt;" </li><br>
Überschreibt die Angaben zu Protokoll, Servernamen und Port in StmKey.*-Readings bzw. der Livestreamadresse zur
Weiterverwendung z.B. als externer Link. <br>
Die Spezifikation kann auf zwei Arten erfolgen: <br><br>
<table>
<colgroup> <col width=25%> <col width=75%> </colgroup>
<tr><td> <b>DEF</b> </td><td>: es wird Protokoll, Servername und Port aus der Definition
des SSCam-Devices verwendet </td></tr>
<tr><td> <b>http(s)://&lt;servername&gt;:&lt;port&gt;</b> </td><td>: eine eigene Adressenangabe wird verwendet </td></tr>
</table>
<br>
Servername kann der Name oder die IP-Adresse der Synology Surveillance Station sein.
</li><br>
<a name="loginRetries"></a>
<li><b>loginRetries</b><br>

156
fhem/FHEM/49_SSCamSTRM.pm
View File

@ -26,34 +26,49 @@
# along with fhem. If not, see <http://www.gnu.org/licenses/>.
#
#########################################################################################################################
# Versions History:
#
# 1.2.3 03.07.2018 behavior changed if device is disabled
# 1.2.2 26.06.2018 make changes for generic stream dev
# 1.2.1 23.06.2018 no name add-on if MODEL is snapgallery
# 1.2.0 20.06.2018 running stream as human readable entry for SSCamSTRM-Device
# 1.1.0 16.06.2018 attr hideDisplayName regarding to Forum #88667
# 1.0.1 14.06.2018 commandref revised
# 1.0.0 14.06.2018 switch to longpoll refresh
# 0.4 13.06.2018 new attribute "noDetaillink" (deleted in V1.0.0)
# 0.3 12.06.2018 new attribute "forcePageRefresh"
# 0.2 11.06.2018 check in with SSCam 5.0.0
# 0.1 10.06.2018 initial Version
package main;
use strict;
use warnings;
my $SSCamSTRMVersion = "1.2.3";
# Versions History intern
our %SSCamSTRM_vNotesIntern = (
"1.4.1" => "31.10.2018 attribute \"autoLoop\" changed to \"autoRefresh\", new attribute \"autoRefreshFW\" ",
"1.4.0" => "29.10.2018 readingFnAttributes added ",
"1.3.0" => "28.10.2018 direct help for attributes, new attribute \"autoLoop\" ",
"1.2.4" => "27.10.2018 fix undefined subroutine &main::SSCam_ptzpanel (https://forum.fhem.de/index.php/topic,45671.msg850505.html#msg850505) ",
"1.2.3" => "03.07.2018 behavior changed if device is disabled ",
"1.2.2" => "26.06.2018 make changes for generic stream dev ",
"1.2.1" => "23.06.2018 no name add-on if MODEL is snapgallery ",
"1.2.0" => "20.06.2018 running stream as human readable entry for SSCamSTRM-Device ",
"1.1.0" => "16.06.2018 attr hideDisplayName regarding to Forum #88667 ",
"1.0.1" => "14.06.2018 commandref revised ",
"1.0.0" => "14.06.2018 switch to longpoll refresh ",
"0.4.0" => "13.06.2018 new attribute \"noDetaillink\" (deleted in V1.0.0) ",
"0.3.0" => "12.06.2018 new attribute \"forcePageRefresh\" ",
"0.2.0" => "11.06.2018 check in with SSCam 5.0.0 ",
"0.1.0" => "10.06.2018 initial Version "
);
# Standardvariablen und Forward-Declaration
sub SSCam_ptzpanel($;$$);
sub SSCam_StreamDev($$$);
################################################################
sub SSCamSTRM_Initialize($) {
my ($hash) = @_;
my $fwd = join(",",devspec2array("TYPE=FHEMWEB:FILTER=STATE=Initialized"));
$hash->{DefFn} = "SSCamSTRM_Define";
$hash->{AttrList} = "disable:1,0 forcePageRefresh:1,0 htmlattr hideDisplayName:1,0 ";
$hash->{AttrList} = "autoRefresh:selectnumbers,120,0.2,1800,0,log10 ".
"autoRefreshFW:$fwd ".
"disable:1,0 ".
"forcePageRefresh:1,0 ".
"htmlattr ".
"hideDisplayName:1,0 ".
$readingFnAttributes;
$hash->{FW_summaryFn} = "SSCamSTRM_FwFn";
$hash->{FW_detailFn} = "SSCamSTRM_FwFn";
$hash->{AttrFn} = "SSCamSTRM_Attr";
@ -76,7 +91,7 @@ sub SSCamSTRM_Define($$) {
$arg =~ s/'//g;
($hash->{PARENT},$hash->{MODEL}) = ((split(",",$arg))[0],(split(",",$arg))[2]);
$hash->{VERSION} = $SSCamSTRMVersion;
$hash->{VERSION} = $hash->{VERSION} = (reverse sort(keys %SSCamSTRM_vNotesIntern))[0];
$hash->{LINK} = $link;
readingsSingleUpdate($hash,"state", "initialized", 1); # Init für "state"
@ -108,13 +123,14 @@ return undef;
}
################################################################
sub SSCamSTRM_FwFn($$$$) {
sub SSCamSTRM_FwFn($;$$$) {
my ($FW_wname, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn.
my $hash = $defs{$d};
my $link = $hash->{LINK};
# return undef if(IsDisabled($d));
RemoveInternalTimer($hash);
$hash->{HELPER}{FW} = $FW_wname;
$link = AnalyzePerlCommand(undef, $link) if($link =~ m/^{(.*)}$/s);
my $show = $defs{$hash->{PARENT}}->{HELPER}{ACTSTRM} if($hash->{MODEL} =~ /switched/);
$show = $show?"($show)":"";
@ -133,10 +149,37 @@ sub SSCamSTRM_FwFn($$$$) {
} else {
$ret .= $link;
}
# Autorefresh nur des aufrufenden FHEMWEB-Devices
my $al = AttrVal($d, "autoRefresh", 0);
if($al) {
InternalTimer(gettimeofday()+$al, "SSCamSTRM_refresh", $hash, 0);
Log3($d, 5, "$d - next start of autoRefresh: ".FmtDateTime(gettimeofday()+$al));
}
return $ret;
}
################################################################
sub SSCamSTRM_refresh($) {
my ($hash) = @_;
my $d = $hash->{NAME};
# Seitenrefresh festgelegt durch SSCamSTRM-Attribut "autoRefresh" und "autoRefreshFW"
my $rd = AttrVal($d, "autoRefreshFW", $hash->{HELPER}{FW});
{ map { FW_directNotify("#FHEMWEB:$_", "location.reload('true')", "") } $rd }
my $al = AttrVal($d, "autoRefresh", 0);
if($al) {
InternalTimer(gettimeofday()+$al, "SSCamSTRM_refresh", $hash, 0);
Log3($d, 5, "$d - next start of autoRefresh: ".FmtDateTime(gettimeofday()+$al));
} else {
RemoveInternalTimer($hash);
}
return;
}
1;
=pod
@ -192,30 +235,51 @@ Dependend of the Streaming-Device state, different buttons are provided to start
<ul>
<ul>
<li><b>disable</b><br>
deactivates the device definition
<a name="autoRefresh"></a>
<li><b>autoRefresh</b><br>
If set, active browser pages of the FHEMWEB-Device which has called the SSCamSTRM-Device, are new reloaded after
the specified time (seconds). Browser pages of a particular FHEMWEB-Device to be refreshed can be specified by
attribute "autoRefreshFW" instead.
This may stabilize the video playback in some cases.
</li>
<br>
<a name="autoRefreshFW"></a>
<li><b>autoRefreshFW</b><br>
If "autoRefresh" is activated, you can specify a particular FHEMWEB-Device whose active browser pages are refreshed
periodically.
</li>
<br>
<a name="disable"></a>
<li><b>disable</b><br>
Deactivates the device.
</li>
<br>
<a name="forcePageRefresh"></a>
<li><b>forcePageRefresh</b><br>
The attribute is evaluated by SSCam. <br>
If set, a reload of all browser pages with active FHEMWEB-connections will be enforced.
This may be helpful if problems with longpoll are appear.
If set, a reload of all browser pages with active FHEMWEB connections will be enforced when particular camera operations
were finished.
This may stabilize the video playback in some cases.
</li>
<br>
<a name="hideDisplayName"></a>
<li><b>hideDisplayName</b><br>
hide the device/alias name (link to detail view)
Hide the device/alias name (link to detail view).
</li>
<br>
<a name="htmlattr"></a>
<li><b>htmlattr</b><br>
HTML attributes to be used for Streaming device e.g.: <br><br>
Additional HTML tags to manipulate the streaming device. <br>
<ul>
<code>
<ul>
<b>Example: </b><br>
attr &lt;name&gt; htmlattr width="480" height="560" <br>
</code>
</ul>
</ul>
</li>
@ -275,31 +339,49 @@ Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unters
<ul>
<ul>
<li><b>disable</b><br>
aktiviert/deaktiviert das Device
<a name="autoRefresh"></a>
<li><b>autoRefresh</b><br>
Wenn gesetzt, werden aktive Browserseiten des FHEMWEB-Devices welches das SSCamSTRM-Device aufgerufen hat, nach der
eingestellten Zeit (Sekunden) neu geladen. Sollen statt dessen Broserseiten eines bestimmten FHEMWEB-Devices neu
geladen werden, kann dieses Device mit dem Attribut "autoRefreshFW" festgelegt werden.
Dies kann in manchen Fällen die Wiedergabe innerhalb einer Anwendung stabilisieren.
</li>
<br>
<a name="autoRefreshFW"></a>
<li><b>autoRefreshFW</b><br>
Ist "autoRefresh" aktiviert, kann mit diesem Attribut das FHEMWEB-Device bestimmt werden dessen aktive Browserseiten
regelmäßig neu geladen werden sollen.
</li>
<br>
<a name="disable"></a>
<li><b>disable</b><br>
Aktiviert/deaktiviert das Device.
</li>
<br>
<a name="forcePageRefresh"></a>
<li><b>forcePageRefresh</b><br>
Das Attribut wird durch SSCam ausgewertet. <br>
Wenn gesetzt, wird ein Reload aller Browserseiten mit aktiven FHEMWEB-Verbindungen bei bestimmten Aktionen erzwungen.
Das kann hilfreich sein, falls es mit Longpoll Probleme geben sollte.
eingefügt ist.
Wenn gesetzt, wird ein Reload aller Browserseiten mit aktiven FHEMWEB-Verbindungen nach dem Abschluß bestimmter
SSCam-Befehle erzwungen.
Dies kann in manchen Fällen die Wiedergabe innerhalb einer Anwendung stabilisieren.
</li>
<br>
<a name="hideDisplayName"></a>
<li><b>hideDisplayName</b><br>
verbirgt den Device/Alias-Namen (Link zur Detailansicht)
Verbirgt den Device/Alias-Namen (Link zur Detailansicht).
</li>
<br>
<a name="htmlattr"></a>
<li><b>htmlattr</b><br>
HTML-Attribute zur Darstellungsänderung des SSCam Streaming Device z.B.: <br><br>
Zusätzliche HTML Tags zur Darstellungsänderung im Streaming Device. <br>
<ul>
<code>
<b>Beispiel: </b><br>
attr &lt;name&gt; htmlattr width="480" height="560" <br>
</code>
</ul>
</li>

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

File diff suppressed because it is too large Load Diff

394
fhem/contrib/DS_Starter/49_SSCamSTRM.pm
View File

@ -1,394 +0,0 @@
########################################################################################################################
# $Id: 49_SSCamSTRM.pm 16938 2018-07-03 17:31:13Z DS_Starter $
#########################################################################################################################
# 49_SSCamSTRM.pm
#
# (c) 2018 by Heiko Maaz
# forked from 98_weblink.pm by Rudolf König
# e-mail: Heiko dot Maaz at t-online dot de
#
# This Module is used by module 49_SSCam to create Streaming devices.
# It can't be used without any SSCam-Device.
#
# This script is part of fhem.
#
# Fhem is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# Fhem is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with fhem. If not, see <http://www.gnu.org/licenses/>.
#
#########################################################################################################################
package main;
use strict;
use warnings;
# Versions History intern
our %SSCamSTRM_vNotesIntern = (
"1.4.1" => "31.10.2018 attribute \"autoLoop\" changed to \"autoRefresh\", new attribute \"autoRefreshFW\" ",
"1.4.0" => "29.10.2018 readingFnAttributes added ",
"1.3.0" => "28.10.2018 direct help for attributes, new attribute \"autoLoop\" ",
"1.2.4" => "27.10.2018 fix undefined subroutine &main::SSCam_ptzpanel (https://forum.fhem.de/index.php/topic,45671.msg850505.html#msg850505) ",
"1.2.3" => "03.07.2018 behavior changed if device is disabled ",
"1.2.2" => "26.06.2018 make changes for generic stream dev ",
"1.2.1" => "23.06.2018 no name add-on if MODEL is snapgallery ",
"1.2.0" => "20.06.2018 running stream as human readable entry for SSCamSTRM-Device ",
"1.1.0" => "16.06.2018 attr hideDisplayName regarding to Forum #88667 ",
"1.0.1" => "14.06.2018 commandref revised ",
"1.0.0" => "14.06.2018 switch to longpoll refresh ",
"0.4.0" => "13.06.2018 new attribute \"noDetaillink\" (deleted in V1.0.0) ",
"0.3.0" => "12.06.2018 new attribute \"forcePageRefresh\" ",
"0.2.0" => "11.06.2018 check in with SSCam 5.0.0 ",
"0.1.0" => "10.06.2018 initial Version "
);
# Standardvariablen und Forward-Declaration
sub SSCam_ptzpanel($;$$);
sub SSCam_StreamDev($$$);
################################################################
sub SSCamSTRM_Initialize($) {
my ($hash) = @_;
my $fwd = join(",",devspec2array("TYPE=FHEMWEB:FILTER=STATE=Initialized"));
$hash->{DefFn} = "SSCamSTRM_Define";
$hash->{AttrList} = "autoRefresh:selectnumbers,120,0.2,1800,0,log10 ".
"autoRefreshFW:$fwd ".
"disable:1,0 ".
"forcePageRefresh:1,0 ".
"htmlattr ".
"hideDisplayName:1,0 ".
$readingFnAttributes;
$hash->{FW_summaryFn} = "SSCamSTRM_FwFn";
$hash->{FW_detailFn} = "SSCamSTRM_FwFn";
$hash->{AttrFn} = "SSCamSTRM_Attr";
$hash->{FW_hideDisplayName} = 1; # Forum 88667
# $hash->{FW_addDetailToSummary} = 1;
# $hash->{FW_atPageEnd} = 1; # wenn 1 -> kein Longpoll ohne informid in HTML-Tag
}
################################################################
sub SSCamSTRM_Define($$) {
my ($hash, $def) = @_;
my ($name, $type, $link) = split("[ \t]+", $def, 3);
if(!$link) {
return "Usage: define <name> SSCamSTRM <arg>";
}
my $arg = (split("[()]",$link))[1];
$arg =~ s/'//g;
($hash->{PARENT},$hash->{MODEL}) = ((split(",",$arg))[0],(split(",",$arg))[2]);
$hash->{VERSION} = $hash->{VERSION} = (reverse sort(keys %SSCamSTRM_vNotesIntern))[0];
$hash->{LINK} = $link;
readingsSingleUpdate($hash,"state", "initialized", 1); # Init für "state"
return undef;
}
################################################################
sub SSCamSTRM_Attr($$$$) {
my ($cmd,$name,$aName,$aVal) = @_;
my $hash = $defs{$name};
my ($do,$val);
# $cmd can be "del" or "set"
# $name is device name
# aName and aVal are Attribute name and value
if ($aName eq "disable") {
if($cmd eq "set") {
$do = ($aVal) ? 1 : 0;
}
$do = 0 if($cmd eq "del");
$val = ($do == 1 ? "disabled" : "initialized");
readingsSingleUpdate($hash, "state", $val, 1);
}
return undef;
}
################################################################
sub SSCamSTRM_FwFn($;$$$) {
my ($FW_wname, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn.
my $hash = $defs{$d};
my $link = $hash->{LINK};
RemoveInternalTimer($hash);
$hash->{HELPER}{FW} = $FW_wname;
$link = AnalyzePerlCommand(undef, $link) if($link =~ m/^{(.*)}$/s);
my $show = $defs{$hash->{PARENT}}->{HELPER}{ACTSTRM} if($hash->{MODEL} =~ /switched/);
$show = $show?"($show)":"";
my $alias = AttrVal($d, "alias", $d); # Linktext als Aliasname oder Devicename setzen
my $dlink = "<a href=\"/fhem?detail=$d\">$alias</a>";
my $ret = "";
$ret .= "<span>$dlink $show</span><br>" if(!AttrVal($d,"hideDisplayName",0));
if(IsDisabled($d)) {
if(AttrVal($d,"hideDisplayName",0)) {
$ret .= "Stream-device <a href=\"/fhem?detail=$d\">$d</a> is disabled";
} else {
$ret .= "<html>Stream-device is disabled</html>";
}
} else {
$ret .= $link;
}
# Autorefresh nur des aufrufenden FHEMWEB-Devices
my $al = AttrVal($d, "autoRefresh", 0);
if($al) {
InternalTimer(gettimeofday()+$al, "SSCamSTRM_refresh", $hash, 0);
Log3($d, 5, "$d - next start of autoRefresh: ".FmtDateTime(gettimeofday()+$al));
}
return $ret;
}
################################################################
sub SSCamSTRM_refresh($) {
my ($hash) = @_;
my $d = $hash->{NAME};
# Seitenrefresh festgelegt durch SSCamSTRM-Attribut "autoRefresh" und "autoRefreshFW"
my $rd = AttrVal($d, "autoRefreshFW", $hash->{HELPER}{FW});
{ map { FW_directNotify("#FHEMWEB:$_", "location.reload('true')", "") } $rd }
my $al = AttrVal($d, "autoRefresh", 0);
if($al) {
InternalTimer(gettimeofday()+$al, "SSCamSTRM_refresh", $hash, 0);
Log3($d, 5, "$d - next start of autoRefresh: ".FmtDateTime(gettimeofday()+$al));
} else {
RemoveInternalTimer($hash);
}
return;
}
1;
=pod
=item summary define a Streaming device by SSCam module
=item summary_DE Erstellung eines Streaming-Device durch das SSCam-Modul
=begin html
<a name="SSCamSTRM"></a>
<h3>SSCamSTRM</h3>
<br>
The module SSCamSTRM is a special device module synchronized to the SSCam module. It is used for definition of
Streaming-Devices. <br>
Dependend of the Streaming-Device state, different buttons are provided to start actions:
<ul>
<table>
<colgroup> <col width=25%> <col width=75%> </colgroup>
<tr><td> Switch off </td><td>- stops a running playback </td></tr>
<tr><td> Refresh </td><td>- refresh a view (no page reload) </td></tr>
<tr><td> Restart </td><td>- restart a running content (e.g. a HLS-Stream) </td></tr>
<tr><td> MJPEG </td><td>- starts a MJPEG Livestream </td></tr>
<tr><td> HLS </td><td>- starts HLS (HTTP Live Stream) </td></tr>
<tr><td> Last Record </td><td>- playback the last recording as iFrame </td></tr>
<tr><td> Last Rec H.264 </td><td>- playback the last recording if available as H.264 </td></tr>
<tr><td> Last Rec MJPEG </td><td>- playback the last recording if available as MJPEG </td></tr>
<tr><td> Last SNAP </td><td>- show the last snapshot </td></tr>
<tr><td> Start Recording </td><td>- starts an endless recording </td></tr>
<tr><td> Stop Recording </td><td>- stopps the recording </td></tr>
<tr><td> Take Snapshot </td><td>- take a snapshot </td></tr>
</table>
</ul>
<br>
<ul>
<a name="SSCamSTRMdefine"></a>
<b>Define</b>
<ul>
A SSCam Streaming-device is defined by the SSCam "set &lt;name&gt; createStreamDev" command.
Please refer to SSCam <a href="#SSCamcreateStreamDev">"createStreamDev"</a> command.
<br><br>
</ul>
<a name="SSCamSTRMset"></a>
<b>Set</b> <ul>N/A</ul><br>
<a name="SSCamSTRMget"></a>
<b>Get</b> <ul>N/A</ul><br>
<a name="SSCamSTRMattr"></a>
<b>Attributes</b>
<br><br>
<ul>
<ul>
<a name="autoRefresh"></a>
<li><b>autoRefresh</b><br>
If set, active browser pages of the FHEMWEB-Device which has called the SSCamSTRM-Device, are new reloaded after
the specified time (seconds). Browser pages of a particular FHEMWEB-Device to be refreshed can be specified by
attribute "autoRefreshFW" instead.
This may stabilize the video playback in some cases.
</li>
<br>
<a name="autoRefreshFW"></a>
<li><b>autoRefreshFW</b><br>
If "autoRefresh" is activated, you can specify a particular FHEMWEB-Device whose active browser pages are refreshed
periodically.
</li>
<br>
<a name="disable"></a>
<li><b>disable</b><br>
Deactivates the device.
</li>
<br>
<a name="forcePageRefresh"></a>
<li><b>forcePageRefresh</b><br>
The attribute is evaluated by SSCam. <br>
If set, a reload of all browser pages with active FHEMWEB connections will be enforced when particular camera operations
were finished.
This may stabilize the video playback in some cases.
</li>
<br>
<a name="hideDisplayName"></a>
<li><b>hideDisplayName</b><br>
Hide the device/alias name (link to detail view).
</li>
<br>
<a name="htmlattr"></a>
<li><b>htmlattr</b><br>
Additional HTML tags to manipulate the streaming device. <br>
<ul>
<ul>
<b>Example: </b><br>
attr &lt;name&gt; htmlattr width="480" height="560" <br>
</ul>
</ul>
</li>
</ul>
</ul>
</ul>
=end html
=begin html_DE
<a name="SSCamSTRM"></a>
<h3>SSCamSTRM</h3>
<br>
Das Modul SSCamSTRM ist ein mit SSCam abgestimmtes Gerätemodul zur Definition von Streaming-Devices. <br>
Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unterschiedliche Drucktasten angeboten:
<ul>
<table>
<colgroup> <col width=25%> <col width=75%> </colgroup>
<tr><td> Switch off </td><td>- stoppt eine laufende Wiedergabe </td></tr>
<tr><td> Refresh </td><td>- auffrischen einer Ansicht (kein Browser Seiten-Reload) </td></tr>
<tr><td> Restart </td><td>- neu starten eines laufenden Contents (z.B. eines HLS-Streams) </td></tr>
<tr><td> MJPEG </td><td>- Startet MJPEG Livestream </td></tr>
<tr><td> HLS </td><td>- Startet HLS (HTTP Live Stream) </td></tr>
<tr><td> Last Record </td><td>- spielt die letzte Aufnahme als iFrame </td></tr>
<tr><td> Last Rec H.264 </td><td>- spielt die letzte Aufnahme wenn als H.264 vorliegend </td></tr>
<tr><td> Last Rec MJPEG </td><td>- spielt die letzte Aufnahme wenn als MJPEG vorliegend </td></tr>
<tr><td> Last SNAP </td><td>- zeigt den letzten Snapshot </td></tr>
<tr><td> Start Recording </td><td>- startet eine Endlosaufnahme </td></tr>
<tr><td> Stop Recording </td><td>- stoppt eine Aufnahme </td></tr>
<tr><td> Take Snapshot </td><td>- löst einen Schnappschuß aus </td></tr>
</table>
</ul>
<br>
<ul>
<a name="SSCamSTRMdefine"></a>
<b>Define</b>
<ul>
Ein SSCam Streaming-Device wird durch den SSCam Befehl "set &lt;name&gt; createStreamDev" erstellt.
Siehe auch die Beschreibung zum SSCam <a href="#SSCamcreateStreamDev">"createStreamDev"</a> Befehl.
<br><br>
</ul>
<a name="SSCamSTRMset"></a>
<b>Set</b> <ul>N/A</ul><br>
<a name="SSCamSTRMget"></a>
<b>Get</b> <ul>N/A</ul><br>
<a name="SSCamSTRMattr"></a>
<b>Attributes</b>
<br><br>
<ul>
<ul>
<a name="autoRefresh"></a>
<li><b>autoRefresh</b><br>
Wenn gesetzt, werden aktive Browserseiten des FHEMWEB-Devices welches das SSCamSTRM-Device aufgerufen hat, nach der
eingestellten Zeit (Sekunden) neu geladen. Sollen statt dessen Broserseiten eines bestimmten FHEMWEB-Devices neu
geladen werden, kann dieses Device mit dem Attribut "autoRefreshFW" festgelegt werden.
Dies kann in manchen Fällen die Wiedergabe innerhalb einer Anwendung stabilisieren.
</li>
<br>
<a name="autoRefreshFW"></a>
<li><b>autoRefreshFW</b><br>
Ist "autoRefresh" aktiviert, kann mit diesem Attribut das FHEMWEB-Device bestimmt werden dessen aktive Browserseiten
regelmäßig neu geladen werden sollen.
</li>
<br>
<a name="disable"></a>
<li><b>disable</b><br>
Aktiviert/deaktiviert das Device.
</li>
<br>
<a name="forcePageRefresh"></a>
<li><b>forcePageRefresh</b><br>
Das Attribut wird durch SSCam ausgewertet. <br>
Wenn gesetzt, wird ein Reload aller Browserseiten mit aktiven FHEMWEB-Verbindungen nach dem Abschluß bestimmter
SSCam-Befehle erzwungen.
Dies kann in manchen Fällen die Wiedergabe innerhalb einer Anwendung stabilisieren.
</li>
<br>
<a name="hideDisplayName"></a>
<li><b>hideDisplayName</b><br>
Verbirgt den Device/Alias-Namen (Link zur Detailansicht).
</li>
<br>
<a name="htmlattr"></a>
<li><b>htmlattr</b><br>
Zusätzliche HTML Tags zur Darstellungsänderung im Streaming Device. <br>
<ul>
<b>Beispiel: </b><br>
attr &lt;name&gt; htmlattr width="480" height="560" <br>
</ul>
</li>
</ul>
</ul>
</ul>
=end html_DE
=cut