Merge branch 'master' into ai_server

Author: connortechnology

db/triggers.sql

@@ -122,20 +122,7 @@ CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events
 FOR EACH ROW
 BEGIN
   declare diff BIGINT default 0;
-
   set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) + diff,0) WHERE Storage.Id = OLD.StorageId;
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Storage.Id = NEW.StorageId;
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Storage.Id = OLD.StorageId;
-    END IF;
-  END IF;
 
   UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
   UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
@@ -204,9 +191,6 @@ DROP TRIGGER IF EXISTS event_delete_trigger//
 CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
 FOR EACH ROW
 BEGIN
-  IF ( OLD.DiskSpace ) THEN
-    UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Storage.Id = OLD.StorageId;
-  END IF;
   DELETE FROM Events_Hour WHERE EventId=OLD.Id;
   DELETE FROM Events_Day WHERE EventId=OLD.Id;
   DELETE FROM Events_Week WHERE EventId=OLD.Id;

db/zm_update-1.37.69.sql.in

@@ -0,0 +1,22 @@
+SELECT 'This update may make changes that require SUPER privileges. If you see an error message saying:
+
+ERROR 1419 (HY000) at line 298: You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)
+
+You will have to either run this update as root manually using something like (on ubuntu/debian)
+
+sudo mysql --defaults-file=/etc/mysql/debian.cnf zm < /usr/share/zoneminder/db/zm_update-1.37.69.sql
+
+OR
+
+sudo mysql --defaults-file=/etc/mysql/debian.cnf "set global log_bin_trust_function_creators=1;"
+sudo zmupdate.pl
+
+OR
+
+Turn off binary logging in your mysql server by adding this to your mysql config.
+[mysqld]
+skip-log-bin
+
+';
+
+source @PKGDATADIR@/db/triggers.sql

docs/installationguide/easydocker.rst

@@ -1,11 +1,6 @@
 An Easy To Use Docker Image
 ===========================
-If you are interested in trying out ZoneMinder quickly, user Dan Landon maintains an easy to use docker image for ZoneMinder. With a few simple configuration changes, it also provides complete Event Notification Server and Machine Learning hook support. Please follow instructions in his repository. He maintains two repositories:
-
-* If you want to run the latest stable release, please use his `zoneminder machine learning repository <https://github.com/dlandon/zoneminder.machine.learning>`__.
-* If you want to run the latest zoneminder master, please use his `zoneminder master repository <https://github.com/dlandon/zoneminder.master-docker>`__.
-
-In both cases, instructions are provided in the repo README files.
+The docker images previously linked to are now depreciated.
 
 If you are looking at building your own native (non docker) binary packages of ZoneMinder for your distro, please refer to the distro specific install guides or  :doc:`packpack`.
 

docs/installationguide/index.rst

@@ -7,8 +7,6 @@ Contents:
 
 .. toctree::
    :maxdepth: 2
-
-   easydocker 
    packpack
    ubuntu
    debian

docs/installationguide/packpack.rst

@@ -1,8 +1,6 @@
 All Distros - A Docker Way to Build ZoneMinder
 ===============================================
 
-.. note:: If you are looking for an easy way to run ZoneMinder and not interested in building your own docker image, please refer to :doc:`easydocker`.
-
 .. contents::
 
 These instructions represent an alternative way to build ZoneMinder for any supported distro.

scripts/ZoneMinder/lib/ZoneMinder/Event.pm

@@ -417,6 +417,9 @@ sub delete {
     # Do it individually to avoid locking up the table for new events
     ZoneMinder::Database::zmDbDo('DELETE FROM Events WHERE Id=?', $$event{Id});
     $ZoneMinder::Database::dbh->commit() if ! $in_transaction;
+
+    my $storage = $event->Storage();
+    $storage->save({DiskSpace=>$storage->DiskSpace()-$event->DiskSpace()}) if $event->DiskSpace();
   }
 
   if ( ( $in_zmaudit or (!$Config{ZM_OPT_FAST_DELETE})) and $event->Storage()->DoDelete() ) {
@@ -759,16 +762,29 @@ sub MoveTo {
     Warning("Event $$self{Id} has already been moved from $$OldStorage{Id} $SrcPath, just updating the event record in db to $$NewStorage{Id} $NewPath.");
   } else {
     $error = $self->CopyTo($NewStorage);
-    return $error if $error;
+    if ($error) {
+      $ZoneMinder::Database::dbh->commit() if !$was_in_transaction;
+      return $error;
+    }
   }
 
+  my $old_diskspace = $self->DiskSpace();
+  my $new_diskspace = $self->DiskSpace(undef);
+
   # Succeeded in copying all files, so we may now update the Event.
   $self->Storage($NewStorage);
   $error .= $self->save();
   # Going to leave it to upper layer as to whether we rollback or not
-  return $error if $error;
+  if ($error) {
+    $ZoneMinder::Database::dbh->rollback() if !$was_in_transaction;
+    return $error;
+  }
   $ZoneMinder::Database::dbh->commit() if !$was_in_transaction;
 
+  # Update storage diskspace.  The triggers no longer do this. This is ... less important so do it outside the transaction
+  $OldStorage->save({DiskSpace => $OldStorage->DiskSpace()-$old_diskspace}) if $old_diskspace;
+  $NewStorage->save({DiskSpace => $NewStorage->DiskSpace()+$new_diskspace}) if $new_diskspace;
+
   $self->delete_files($OldStorage);
   return $error;
 } # end sub MoveTo

web/includes/Event.php

@@ -314,7 +314,7 @@ function DiskSpace( $new='' ) {
       $this->{'DiskSpace'} = folder_size($this->Path());
       if ($this->{'EndDateTime'} and $this->{'DiskSpace'}) {
         # Finished events shouldn't grow in size much so we can commit it to the db.
-        dbQuery('UPDATE Events SET DiskSpace=? WHERE Id=?', array($this->{'DiskSpace'}, $this->{'Id'}));
+        #dbQuery('UPDATE Events SET DiskSpace=? WHERE Id=?', array($this->{'DiskSpace'}, $this->{'Id'}));
       }
     }
     return $this->{'DiskSpace'};

web/js/MonitorStream.js

@@ -512,19 +512,24 @@ function MonitorStream(monitorData) {
     this.started = true;
     this.streamListenerBind();
     this.activePlayer = 'zms';
-    this.updateStreamInfo('MJPEG');
+    this.updateStreamInfo('ZMS MJPEG');
   }; // this.start
 
   this.stop = function() {
+    /* Stop should stop the stream (killing zms) but NOT set src=''; This leaves the last jpeg up on screen instead of a broken image */
     const stream = this.getElement();
     if (!stream) {
       console.warn(`! ${dateTimeToISOLocal(new Date())} Stream for ID=${this.id} it is impossible to stop because it is not found.`);
       return;
     }
     console.debug(`! ${dateTimeToISOLocal(new Date())} Stream for ID=${this.id} STOPPED`);
-    //if ( 1 ) {
-    if (-1 === this.activePlayer.indexOf('rtsp2web')) {
-      if (stream.src) {
+    this.statusCmdTimer = clearInterval(this.statusCmdTimer);
+    this.streamCmdTimer = clearInterval(this.streamCmdTimer);
+    this.started = false;
+
+    if (-1 !== this.activePlayer.indexOf('zms')) {
+      // Icon: My current thought is to just tell zms to stop. Don't go to single.
+      if (0 && stream.src) {
         let src = stream.src;
         if (-1 === src.indexOf('mode=')) {
           src += '&mode=single';
@@ -537,20 +542,20 @@ function MonitorStream(monitorData) {
           stream.src = src;
         }
       }
-    }
-    this.streamCommand(CMD_STOP);
-    this.statusCmdTimer = clearInterval(this.statusCmdTimer);
-    this.streamCmdTimer = clearInterval(this.streamCmdTimer);
-    this.started = false;
-    if (-1 !== this.activePlayer.indexOf('go2rtc')) {
+      this.streamCommand(CMD_STOP);
+    } else if (-1 !== this.activePlayer.indexOf('go2rtc')) {
       if (!(stream.wsState === WebSocket.CLOSED && stream.pcState === WebSocket.CLOSED)) {
         try {
           stream.ondisconnect();
         } catch (e) {
           console.warn(e);
         }
       }
-      if (this.webrtc && ('close' in this.webrtc)) this.webrtc.close();
+      if (this.webrtc && ('close' in this.webrtc)) {
+        this.webrtc.close();
+      } else {
+        console.log('close not in ', this.webrtc);
+      }
       this.webrtc = null;
     } else if (-1 !== this.activePlayer.indexOf('rtsp2web')) {
       if (this.webrtc) {
@@ -570,6 +575,8 @@ function MonitorStream(monitorData) {
       stream.src = '';
       stream.srcObject = null;
       janus = null;
+    } else {
+      console.log("Unknown activePlayer", this.activePlayer);
     }
   };
 
@@ -631,6 +638,7 @@ function MonitorStream(monitorData) {
   };
 
   this.kill = function() {
+    /* kill should actually remove the zms process.  Resulting in a broken image on screen. */
     if (janus && streaming[this.id]) {
       streaming[this.id].detach();
     }
@@ -643,9 +651,12 @@ function MonitorStream(monitorData) {
     stream.onload = null;
 
     // this.stop tells zms to stop streaming, but the process remains. We need to turn the stream into an image.
-    if (stream.src && -1 === this.player.indexOf('rtsp2web')) {
+    if (stream.src && (-1 !== this.player.indexOf('zms'))) {
       stream.src = '';
+      // Make zms exit
+      this.streamCommand(CMD_QUIT);
     }
+    // Kill and stop share a lot of the same code... so just call stop
     this.stop();
   };
 
@@ -1258,7 +1269,7 @@ function MonitorStream(monitorData) {
     $j.ajaxSetup({timeout: AJAX_TIMEOUT});
 
     this.streamCmdReq = function(streamCmdParms) {
-      if (!(streamCmdParms.command == CMD_STOP && (this.RTSP2WebEnabled || this.Go2RTCEnabled))) {
+      if (!(streamCmdParms.command == CMD_STOP && ((-1 !== this.activePlayer.indexOf('go2rtc')) || (-1 !== this.activePlayer.indexOf('rtsp2web'))))) {
         //Otherwise, there will be errors in the console "Socket ... does not exist" when quickly switching stop->start and we also do not need to replace SRC in getStreamCmdResponse
         this.ajaxQueue = jQuery.ajaxQueue({
           url: this.url + (auth_relay?'?'+auth_relay:''),

web/skins/classic/views/js/watch.js

@@ -216,8 +216,7 @@ function streamCmdStop(action) {
     setButtonState('fastRevBtn', 'unavail');
   }
   if (action) {
-    //monitorStream.streamCommand(CMD_STOP);
-    monitorStream.kill();
+    monitorStream.stop();
   }
   //setButtonState('stopBtn', 'unavail');
   //setButtonState('playBtn', 'active');