ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement Server function which figures out which Server likely has the video. Use it to remove duplicate logic

This commit is contained in:
Isaac Connor 2022-02-03 14:45:17 -05:00
parent da4c880233
commit 7515711eb8
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
web/includes/Event.php
View File

@ -214,22 +214,24 @@ class Event extends ZM_Object {
} }
} # end Event->delete } # end Event->delete
public function getStreamSrc( $args=array(), $querySep='&' ) { public function Server() {
$streamSrc = '';
$Server = null;
if ( $this->Storage()->ServerId() ) { if ( $this->Storage()->ServerId() ) {
# The Event may have been moved to Storage on another server, # The Event may have been moved to Storage on another server,
# So prefer viewing the Event from the Server that is actually # So prefer viewing the Event from the Server that is actually
# storing the video # storing the video
$Server = $this->Storage()->Server(); return $this->Storage()->Server();
} else if ( $this->Monitor()->ServerId() ) { } else if ( $this->Monitor()->ServerId() ) {
# Assume that the server that recorded it has it # Assume that the server that recorded it has it
$Server = $this->Monitor()->Server(); return $this->Monitor()->Server();
} else {
# A default Server will result in the use of ZM_DIR_EVENTS
$Server = new Server();
} }
# A default Server will result in the use of ZM_DIR_EVENTS
return new Server();
}
public function getStreamSrc( $args=array(), $querySep='&' ) {
$streamSrc = '';
$Server = $this->Server();
# If we are in a multi-port setup, then use the multiport, else by # If we are in a multi-port setup, then use the multiport, else by
# passing null Server->Url will use the Port set in the Server setting # passing null Server->Url will use the Port set in the Server setting
@ -354,15 +356,7 @@ class Event extends ZM_Object {
# We always store at least 1 image when capturing # We always store at least 1 image when capturing
$streamSrc = ''; $streamSrc = '';
$Server = null; $Server = $this->Server();
if ( $this->Storage()->ServerId() ) {
$Server = $this->Storage()->Server();
} else if ( $this->Monitor()->ServerId() ) {
# Assume that the server that recorded it has it
$Server = $this->Monitor()->Server();
} else {
$Server = new Server();
}
$streamSrc .= $Server->UrlToIndex( $streamSrc .= $Server->UrlToIndex(
ZM_MIN_STREAMING_PORT ? ZM_MIN_STREAMING_PORT ?
ZM_MIN_STREAMING_PORT+$this->{'MonitorId'} : ZM_MIN_STREAMING_PORT+$this->{'MonitorId'} :
@ -514,7 +508,7 @@ class Event extends ZM_Object {
return false; return false;
} }
$Storage= $this->Storage(); $Storage= $this->Storage();
$Server = $Storage->ServerId() ? $Storage->Server() : $this->Monitor()->Server(); $Server = $this->Server();
if ( $Server->Id() != ZM_SERVER_ID ) { if ( $Server->Id() != ZM_SERVER_ID ) {
$url = $Server->UrlToApi() . '/events/'.$this->{'Id'}.'.json'; $url = $Server->UrlToApi() . '/events/'.$this->{'Id'}.'.json';
@ -562,7 +556,7 @@ class Event extends ZM_Object {
return false; return false;
} }
$Storage= $this->Storage(); $Storage= $this->Storage();
$Server = $Storage->ServerId() ? $Storage->Server() : $this->Monitor()->Server(); $Server = $this->Server();
if ( $Server->Id() != ZM_SERVER_ID ) { if ( $Server->Id() != ZM_SERVER_ID ) {
$url = $Server->UrlToApi().'/events/'.$this->{'Id'}.'.json'; $url = $Server->UrlToApi().'/events/'.$this->{'Id'}.'.json';