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

add more debugging and fix LinkPath -> LinkPath

This commit is contained in:
Isaac Connor 2016-09-20 12:16:07 -04:00
parent a3e99cf08d
commit 5604fe5610
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/includes/Event.php
View File

@ -73,7 +73,7 @@ class Event {
} }
public function LinkPath() { public function Link_Path() {
if ( ZM_USE_DEEP_STORAGE ) { if ( ZM_USE_DEEP_STORAGE ) {
return $this->{'MonitorId'} .'/'.strftime( "%y/%m/%d/.", $this->Time()).$this->{'Id'}; return $this->{'MonitorId'} .'/'.strftime( "%y/%m/%d/.", $this->Time()).$this->{'Id'};
} }
@ -82,6 +82,7 @@ class Event {
} }
public function delete() { public function delete() {
# This wouldn't work with foreign keys
dbQuery( 'DELETE FROM Events WHERE Id = ?', array($this->{'Id'}) ); dbQuery( 'DELETE FROM Events WHERE Id = ?', array($this->{'Id'}) );
if ( !ZM_OPT_FAST_DELETE ) { if ( !ZM_OPT_FAST_DELETE ) {
dbQuery( 'DELETE FROM Stats WHERE EventId = ?', array($this->{'Id'}) ); dbQuery( 'DELETE FROM Stats WHERE EventId = ?', array($this->{'Id'}) );
@ -90,15 +91,28 @@ class Event {
# Assumption: All events haev a start time # Assumption: All events haev a start time
$start_date = date_parse( $this->{'StartTime'} ); $start_date = date_parse( $this->{'StartTime'} );
if ( ! $start_date ) {
Error("Unable to parse start time for event " . $this->{'Id'} . ' not deleting files.' );
return;
}
$start_date['year'] = $start_date['year'] % 100; $start_date['year'] = $start_date['year'] % 100;
$Storage = $this->Storage(); $Storage = $this->Storage();
# So this is because ZM creates a link under teh day pointing to the time that the event happened. # So this is because ZM creates a link under teh day pointing to the time that the event happened.
if ( ! $this->Link_Path() ) {
Error("Unable to determine link path for event " . $this->{'Id'} . ' not deleting files.' );
return;
}
$eventlink_path = $Storage->Path().'/'.$this->Link_Path(); $eventlink_path = $Storage->Path().'/'.$this->Link_Path();
if ( $id_files = glob( $eventlink_path ) ) { if ( $id_files = glob( $eventlink_path ) ) {
if ( ! $eventPath = readlink($id_files[0]) ) {
Error("Unable to read link at $id_files[0]");
return;
}
# I know we are using arrays here, but really there can only ever be 1 in the array # I know we are using arrays here, but really there can only ever be 1 in the array
$eventPath = preg_replace( '/\.'.$event['Id'].'$/', readlink($id_files[0]), $id_files[0] ); $eventPath = preg_replace( '/\.'.$this->{'Id'}.'$/', $eventPath, $id_files[0] );
deletePath( $eventPath ); deletePath( $eventPath );
deletePath( $id_files[0] ); deletePath( $id_files[0] );
$pathParts = explode( '/', $eventPath ); $pathParts = explode( '/', $eventPath );
@ -118,7 +132,7 @@ class Event {
} # ! ZM_OPT_FAST_DELETE } # ! ZM_OPT_FAST_DELETE
} # end Event->delete } # end Event->delete
public function getStreamSrc( $args, $querySep='&' ) { public function getStreamSrc( $args, $querySep='&' ) {
return ( ZM_BASE_PATH != '/' ? ZM_BASE_PATH : '' ).'/index.php?view=view_video&eid='.$this->{'Id'}; return ( ZM_BASE_PATH != '/' ? ZM_BASE_PATH : '' ).'/index.php?view=view_video&eid='.$this->{'Id'};
$streamSrc = ZM_BASE_URL.ZM_PATH_ZMS; $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;