Merge branch 'master' into patch-474778

Author: IgorA100

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/ConfigData.pm.in

@@ -2834,11 +2834,11 @@ our @options = (
   {
     name        => 'ZM_WEB_LIST_THUMBS',
     default     => 'yes',
-    description => 'Display mini-thumbnails of event images in event lists',
+    description => 'Display mini-thumbnails of event images in event lists and on console',
     help        => q`
-      Ordinarily the event lists just display text details of the
-      events to save space and time. By switching this option on you
-      can also display small thumbnails to help you identify events
+      Originally the event lists and console just displayed text details of the
+      events and monitors to save space and time. By switching this option on you
+      can also display small thumbnails to help you identify events or cameras
       of interest. The size of these thumbnails is controlled by the
       following two options.
       `,
@@ -2848,10 +2848,10 @@ our @options = (
   {
     name        => 'ZM_WEB_LIST_THUMB_WIDTH',
     default     => '48',
-    description => 'The width of the thumbnails that appear in the event lists',
+    description => 'The width of the thumbnails that appear in the event lists and on console',
     help        => q`
       This options controls the width of the thumbnail images that
-      appear in the event lists. It should be fairly small to fit in
+      appear in the event lists and on the console. It should be fairly small to fit in
       with the rest of the table. If you prefer you can specify a
       height instead in the next option but you should only use one
       of the width or height and the other option should be set to

scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm

@@ -46,6 +46,7 @@ use Time::HiRes qw( usleep );
 use URI;
 
 our $uri;
+my $use_optics;
 
 sub open {
   my $self = shift;
@@ -390,17 +391,46 @@ sub focusRelNear {
   my $self = shift;
   my $params = shift;
   my $step = $self->getParam($params, 'step');
-  Debug('Focus Near');
-  my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=-$step";
-  $self->sendCmd($cmd);
+  Debug('Focus Rel Near');
+   if ($use_optics) {
+    my $cmd = "/axis-cgi/opticssetup.cgi?rfocus=-minstep";
+    $self->sendCmd($cmd);
+  } else {
+    my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=-$step";
+    my $res = $self->sendCmd($cmd);
+    if ($res->content ne 'ok') {
+      $use_optics = 1;
+      $self->focusRelNear($self, $params);
+    }
+  }
 }
 
 sub focusRelFar {
   my $self = shift;
   my $params = shift;
   my $step = $self->getParam($params, 'step');
-  Debug('Focus Far');
-  my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=$step";
+  Debug('FocusRelFar');
+  if ($use_optics) {
+    my $cmd = "/axis-cgi/opticssetup.cgi?rfocus=minstep";
+    $self->sendCmd($cmd);
+  } else {
+    my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=$step";
+    my $res = $self->sendCmd($cmd);
+    if ($res->content ne 'ok') {
+      $use_optics = 1;
+      $self->focusRelNear($self, $params);
+    }
+  }
+}
+
+sub focusAbs {
+  # Takes a value 0-1 in small decimal incremements
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'step');
+  # step comes in as an integer, needs to be 0-1
+  Debug('Focus Abs');
+  my $cmd = "/axis-cgi/opticssetup.cgi.cgi?afocus=$step";
   $self->sendCmd($cmd);
 }
 

scripts/ZoneMinder/lib/ZoneMinder/Event.pm

@@ -403,6 +403,11 @@ sub delete {
       $ZoneMinder::Database::dbh->commit() if ! $in_transaction;
       return;
     }
+    ZoneMinder::Database::zmDbDo('DELETE FROM Event_Data WHERE EventId=?', $$event{Id});
+    if ( $ZoneMinder::Database::dbh->errstr() ) {
+      $ZoneMinder::Database::dbh->commit() if ! $in_transaction;
+      return;
+    }
     ZoneMinder::Database::zmDbDo('DELETE FROM Frames WHERE EventId=?', $$event{Id});
     if ( $ZoneMinder::Database::dbh->errstr() ) {
       $ZoneMinder::Database::dbh->commit() if ! $in_transaction;
@@ -412,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() ) {
@@ -751,20 +759,32 @@ sub MoveTo {
 
   my $error = '';
   if ((! -e $SrcPath) and -e $NewPath) {
-    Debug("srcPath: $SrcPath newPath: $NewPath");
-    Warning("Event has already been moved, just updating the event record in db.");
+    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

src/zm_db.cpp

@@ -137,17 +137,18 @@ MYSQL_RES *zmDbFetch(const std::string &query) {
     return nullptr;
   }
 
-  int rc = mysql_query(&dbconn, query.c_str());
 
+  int rc = mysql_query(&dbconn, query.c_str());
   if (rc) {
-    Debug(1, "Can't run query: %s rc:%d, reason:%s", query.c_str(), rc, mysql_error(&dbconn));
+    std::string reason = mysql_error(&dbconn); // store for later because it will get clobbered by second attempt
+    Debug(1, "Can't run query: %s rc:%d, reason:%s", query.c_str(), rc, reason.c_str());
     if (mysql_ping(&dbconn) and zmDbReconnect()) {
       rc = mysql_query(&dbconn, query.c_str());
     }
-  }
-  if (rc) {
-    Error("Can't run query: %s rc:%d, reason:%s", query.c_str(), rc, mysql_error(&dbconn));
-    return nullptr;
+    if (rc) {
+      Error("Can't run query: %s rc:%d, reason:%s", query.c_str(), rc, reason.c_str());
+      return nullptr;
+    }
   }
   MYSQL_RES *result = mysql_store_result(&dbconn);
   if (!result) {

src/zm_ffmpeg_camera.cpp

@@ -391,8 +391,7 @@ int FfmpegCamera::OpenFfmpeg() {
     return -1;
   }
 
-  // Find first video stream present
-  // The one we want Might not be the first
+  // Find first video stream present, the one we want Might not be the first
   mVideoStreamId = -1;
   mAudioStreamId = -1;
   for (unsigned int i=0; i < mFormatContext->nb_streams; i++) {
@@ -408,13 +407,13 @@ int FfmpegCamera::OpenFfmpeg() {
         mVideoStream = stream;
       } else {
         Debug(2, "Have another video stream.");
-	if (stream->codecpar->width == width and stream->codecpar->height == height) {
-		Debug(1, "Choosing alternate video stream because it matches our resolution.");
-		mVideoStreamId = i;
-		mVideoStream = stream;
-	} else {
-		stream->discard = AVDISCARD_ALL;
-	}
+        if (stream->codecpar->width == width and stream->codecpar->height == height) {
+          Debug(1, "Choosing alternate video stream because it matches our resolution.");
+          mVideoStreamId = i;
+          mVideoStream = stream;
+        } else {
+          stream->discard = AVDISCARD_ALL;
+        }
       }
     } else if (is_audio_stream(stream)) {
       if (mAudioStreamId == -1) {
@@ -446,9 +445,9 @@ int FfmpegCamera::OpenFfmpeg() {
   }
 
   if (!mVideoCodec) {
+    // Try and get the codec from the codec context
     mVideoCodec = avcodec_find_decoder(mVideoStream->codecpar->codec_id);
     if (!mVideoCodec) {
-      // Try and get the codec from the codec context
       Error("Can't find codec for video stream from %s", mMaskedPath.c_str());
       return -1;
     }