Isaac Connor
bfac696fb7
return logger from loginit so that we can use it
2022-01-05 16:49:00 -05:00
Isaac Connor
cce24ea427
Add RTSPServer and Importance fields
2022-01-05 16:48:46 -05:00
Isaac Connor
6bd04de5f6
Merge branch 'master' into multistream
2021-12-31 17:53:36 -05:00
Isaac Connor
2aacbf790a
handle warning due to not defined last_run
2021-12-26 11:51:32 -05:00
Isaac Connor
d86456b6f2
revamp, using ZoneMinder::Monitor methods to reduce code. Reduce last analysze time was zero to a debug. Fixes #3389
2021-12-15 09:11:55 -05:00
Isaac Connor
12ebdacf54
specify ZoneMinder::Database for zmSQLExecute
2021-12-15 09:11:55 -05:00
Isaac Connor
fe0e4627ef
Specify ZoneMinder::General for runCommand
2021-12-15 09:11:55 -05:00
Isaac Connor
28d5614da0
Fix missing ;
2021-12-15 09:11:55 -05:00
Isaac Connor
f683557b0e
Fix Monitor::Control to handle local cameras
2021-12-15 09:11:55 -05:00
Isaac Connor
4fa804e9a2
Can only SKIP LOCKED if locking rows. Remove FOR SHARE as it isn't supported on < mysql 8
2021-12-14 13:33:00 -05:00
Isaac Connor
fe72fd83f8
Fix auth not getting realm from auth headers due to them being an array now. Get auth and ip from Path if not set in ControlAddress.
2021-12-14 10:04:35 -05:00
Isaac Connor
a65f2b42ce
Implement per-filter delays using the ExecuteInterval member of Filters. Remove uneded lockandload when doing row locks. We will have already locked when executing the filter sql.
2021-12-13 14:59:38 -05:00
Isaac Connor
0382a677df
Add ExecuteInterval to Filter Object. Allow empty sort_field to have the effort of not sorting. Always add FOR SHARE which adds a read-only lock the returned records. Add SKIP LOCKED functionality so that filters can simply skip locked records. This should reduce contention. Also specify FOR UPDATE of the events table, otherwise we also lock Monitors and Storage.
2021-12-13 14:58:32 -05:00
Isaac Connor
ef13c84d8b
fix zmtrigger. Need {}
2021-12-12 17:01:12 -05:00
Isaac Connor
ed360348ef
spacing, remove dead code. If Monitor Function becomes None, skip it
2021-12-10 15:36:47 -05:00
Isaac Connor
aa320cb28f
Fix missing STATE_UNKNOWN
2021-12-10 15:35:53 -05:00
Isaac Connor
35bca1d89b
When launching concurrent zmfilter, use the id instead of Name because Name isn't necessarily unique
2021-12-06 10:32:17 -05:00
Isaac Connor
3b84d7d82a
Add --daemon to command line documentation so it ends up in man page. Fixes #3393 . Improve the description and move the pod documentation to the bottom after __END__. Improve executeCommand a bit
2021-12-06 10:28:02 -05:00
maddios
b47e96d7cf
Fix Copy/Move to Default Storage
...
When moving from a 2nd storage to Default it fails with "New storage does not have an id. Moving will not happen" because the default ID is 0.
2021-11-29 00:20:25 -05:00
Isaac Connor
f9f2615d48
Return if unable to lock the event record. Improve code around CopyTo call.
2021-11-26 15:26:38 -05:00
Isaac Connor
af5436d009
Handle bug where a value of '' will prevent special case handling. Allow '' to mean NULL when specifying Storage Area
2021-11-26 10:31:54 -05:00
Isaac Connor
ffdb0f9824
If we are starting a process that is waiting to term, mark it to get started by the reaper. Fixes case where zmdc thought the process was still running and so didn't start it. We never noticed because zmwatch would eventually notice. The result is instant restart.
2021-11-23 11:05:39 -05:00
Isaac Connor
40e7f607f5
If no protocol defined, fall back to the name of the Control
2021-11-22 11:38:40 -05:00
Isaac Connor
2c798069d3
improve debug logging when loading Control in Monitor
2021-11-18 18:12:07 -05:00
Isaac Connor
20629fdf5a
Include Manufacturer and Model in telemetry
2021-11-16 09:20:14 -05:00
Isaac Connor
df88c5bbef
layout->layer
2021-10-28 15:28:03 -04:00
Isaac Connor
4122ae99a5
add a comment about rollbacks
2021-10-28 15:27:45 -04:00
Isaac Connor
644c6e6b41
Just return the error
2021-10-28 11:48:08 -04:00
Isaac Connor
9fe2762bc8
Add mp4 as an option for generated video and make it the default instead of avi
2021-10-28 10:46:50 -04:00
Isaac Connor
6478999ecf
Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it.
2021-10-27 12:21:03 -04:00
Isaac Connor
a74b785d08
Move the protocol loading into the Monitor Object.
2021-10-26 18:15:43 -04:00
Isaac Connor
a2ec18be5a
Implement Control() function to implement the Protocol Specific Control object
2021-10-26 18:15:43 -04:00
Isaac Connor
d62d88a0a3
add utility functions parseNameEqualsValueToHash and hash_diff
2021-10-26 18:15:43 -04:00
Isaac Connor
c864d0765b
Update, add url parsing to match other control scripts. Add getConfig and setConfig
2021-10-26 18:15:43 -04:00
Isaac Connor
cebe86feb2
Make ZoneMinder::Control ingerit from Object. Make loadMonitor use MonitorId
2021-10-26 18:15:43 -04:00
Isaac Connor
509cecf9f5
Skip image checking capturing==Ondemand
2021-10-25 16:52:20 -04:00
Isaac Connor
72d2b99ca4
Add last_viewed_time
2021-10-25 16:51:57 -04:00
Isaac Connor
5e21d4833a
Remove dead code, remove locking from CopyTo, put locking into MoveTo.
2021-10-25 11:09:29 -04:00
Isaac Connor
9169da6963
Only start a transaction if we are not already in a transaction
2021-10-25 11:09:06 -04:00
Isaac Connor
6fd33b4627
Change commands used to set and goto presets. Fixes #3371
2021-10-13 10:42:23 -04:00
Isaac Connor
a99f9091fc
remove useless commit.
2021-09-25 14:27:10 -04:00
Isaac Connor
7748307c5a
More new defaults. The navbar refreshes every 60 secs so make full page refresh be 240sec. Ajax timeout needs to be 10 seconds. Large event listings can take longer than 3
2021-09-23 16:39:35 -04:00
Isaac Connor
d3cfd3c224
Set new defaults for various settings
2021-09-23 16:39:35 -04:00
ColorfullyZhang
f5d8eaa2ad
Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path.
2021-09-16 18:24:37 +08:00
Isaac Connor
c2472894be
Fix html emails when using ZM_NEW_MAIL_MODULES. Improve debugging and reduce Info logging
2021-09-10 13:47:40 -04:00
Isaac Connor
c5b097af0a
Only suspend/resume motion detection if the monitor is doing motion detection
2021-09-08 13:57:46 -04:00
criadoperez
4a717820b1
Fixed broken wiki links
2021-09-08 15:18:52 +02:00
Isaac Connor
263a846251
Add missing fields. defaults need to be quoted because they are evalled
2021-09-04 10:43:38 -04:00
Isaac Connor
440bb12a9a
defaults need to be quoted because they are evalled
2021-09-04 10:43:25 -04:00
Isaac Connor
1a0d488457
Spacing
2021-08-30 13:32:43 -04:00
Isaac Connor
248ca9a5f9
Fix building SQL for ExistsInFileSystem PostCondition. Fix how we turn the rows into Event objects. Fix value handling in ExistsInFileSystem post condition.
2021-08-12 13:41:17 -04:00
Isaac Connor
91903d2822
Fix user summary, as there must be a space between -u and dbuser, etc
2021-08-05 13:30:52 -04:00
Isaac Connor
14047bc820
Test for existence of file before adding it to zip. Apparently our glob can return the snapshot.jpg string even if it doesn't exist. This is a workaround to Archive::Zip not testing for failure and crashing. Fixes #3313
2021-07-08 11:03:56 -04:00
Isaac Connor
e9845d96f4
Fix Archive FTP .zip filename not including monitor name. Fixes #3304
2021-06-23 10:30:42 -04:00
Isaac Connor
9438445d74
Fix PTZ Diagonal cmds. Fixes #3300
2021-06-16 15:56:08 -04:00
Isaac Connor
94634f1ca7
Spacing
2021-06-14 13:31:05 -04:00
Isaac Connor
d221d6ab3b
If we fail to suspend/resume, assume we need to disconnect/reconnect to the mmap
2021-06-14 13:30:37 -04:00
Isaac Connor
da208457b8
Fix EndTime case handling.
2021-06-14 11:58:23 -04:00
Isaac Connor
0cbb132f08
merge fixes from #3295 . Fixes #3295 .
2021-06-14 09:52:10 -04:00
Isaac Connor
9001327883
Fix incorrect use of == instead eq
2021-06-14 09:45:08 -04:00
Isaac Connor
3d70e621b2
zmstats.pl: add use warnings. Fix log deletion only ever deleting 100 when it should delete more in a loop. Add deleting more than 100 sessions. Fix loop not terminating on Ctrl-C
2021-06-08 16:54:41 -04:00
Isaac Connor
7417d32fbc
Add a 5 second timeout when setting suspending/resuming motion detection.Log errors appropriately
2021-05-28 10:29:44 -04:00
Isaac Connor
bdae5dd9f8
Sort field should be StartDateTime not StartTime
2021-05-12 10:32:03 -04:00
Isaac Connor
c080dd8a12
Fixes #2992 . If no definition for a monitor is found, don't modify it.
2021-05-11 15:29:10 -04:00
Isaac Connor
9ee5e983d6
Add ZM_FEATURES_SNAPSHOTS to Config. Fix true=>yes
2021-05-04 13:19:10 -04:00
Isaac Connor
91a09608ea
Use newlines to make debugging sql easier to read.
2021-05-02 13:37:26 -04:00
Isaac Connor
202c4ef28c
copy array_diff sub into Object so we don't have the dependency
2021-04-29 19:00:36 -04:00
Isaac Connor
e32771c255
Add Zones() to Monitor
2021-04-29 14:49:39 -04:00
Isaac Connor
69098ccdcb
Implement changes() in Object
2021-04-29 14:49:30 -04:00
Isaac Connor
a8bd1662e3
Add objdetect.gif support in filter email replacements
2021-04-28 19:12:37 -04:00
Isaac Connor
2302d814f2
Fix version test. split takes a regexp, so '.' matches everything. So change it to /\./.
2021-04-28 13:25:01 -04:00
Isaac Connor
c50c30c6b5
Add super command line param to use mysql --defaults-file instead of zmuser/zmpass. This will only work for debian based systems.
2021-04-28 10:03:26 -04:00
Isaac Connor
df754f0085
Can't do suspend in sendCmd
2021-04-24 19:22:17 -04:00
Isaac Connor
8d4c2afda8
Can't do suspend in sendCmd
2021-04-24 12:00:38 -04:00
Isaac Connor
4843cb8593
Add ModectDuringPTZ and suspend and resume functions
2021-04-23 14:52:29 -04:00
Isaac Connor
e256d9a5a8
Use ZoneMinder::Monitor->find_one instead of zmDbGetMonitor so that we get an object with useful methods
2021-04-23 14:52:29 -04:00
Isaac Connor
36ac473ad2
Add suspend/resume of MotionDetection of ModectDuringPTZ is off.
2021-04-23 14:52:29 -04:00
Isaac Connor
7c70c26fbd
Cleanup old Continuous stop. Rename lastMove to LastCmd and implement for Zoom
2021-04-21 14:30:02 -04:00
Isaac Connor
79cede7cac
Merge branch 'release-1.34'
2021-04-20 09:24:49 -04:00
Isaac Connor
ed58447c4d
Only update event StorageId when the new StorageId has a value
2021-04-19 17:53:08 -04:00
Isaac Connor
7485735e9c
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-04-19 17:31:22 -04:00
Isaac Connor
6225b8babe
Indicate that there should be a space after single char options and their value
2021-04-19 11:56:59 -04:00
root
200dda11a2
Merge branch 'continuous' into cont_mast
2021-04-16 10:07:10 -04:00
Isaac Connor
c9c4224dd2
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-04-14 17:19:07 -04:00
Isaac Connor
7489c3850d
Store last command for continuous moves so that moveStop can send the correct stop command
2021-04-14 17:19:01 -04:00
Isaac Connor
4ead6886a3
Make shm debug level 3
2021-04-10 15:40:37 -04:00
Isaac Connor
da630f7534
Move shm Memory debug statements to level 2.
2021-04-10 15:35:24 -04:00
Isaac Connor
60970673c7
Implement debug levels in perl side. DEBUG==DEBUG1.
2021-04-10 15:35:04 -04:00
Isaac Connor
3bdd3c0d12
Move event summaries to their own table to reduce contention on Monitor_Status
2021-04-09 10:16:35 -04:00
Isaac Connor
30dfadcbf1
Add some parenthesis and use logic and/or install of binary
2021-04-07 14:15:55 -04:00
Isaac Connor
cc33718a2e
fix did you forget to declare my $deleteLogByRowsSth?)
2021-04-01 12:22:30 -04:00
Isaac Connor
1fd9361e4e
use zmDbDo to replace many lines of code
2021-04-01 09:27:49 -04:00
Isaac Connor
757ec2dbc1
Improve zmDbDo to return rows affected instead of boolean
2021-04-01 09:27:20 -04:00
Isaac Connor
9f5bc8b2b9
Merge pull request #3174 from akeyx/3173-bugfix-fix-onvif-control
...
3173 bugfix fix onvif control
2021-03-30 18:38:00 -04:00
Isaac Connor
dedf42371b
copy onvif.pm which isn't actually onvif to FoscamCGI.pm We will later replace onvif.pm with an Actual onvif implementation.
2021-03-30 18:32:42 -04:00
Isaac Connor
d54ba9b324
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-03-30 16:14:42 -04:00
Isaac Connor
21cf1f47a5
GroupIds is not a valid Column in Monitors
2021-03-25 17:33:04 -04:00
Isaac Connor
ec8e0f5997
replace while(1) with while(not zm_terminate) so that these scripts exit cleanly
2021-03-17 13:09:54 -04:00
Arek Kossendowski
0eab9987fc
Just updated the script with moveMap and moveRel functions.
2021-02-26 00:11:29 +00:00
Arek Kossendowski
36f11158df
Replaced the onvif control module with a modified version of Netcat.
...
The original onvif module was NOT at all ONVIF protocol implementation.
This one pretty much copies the Netcat module but with a bit of clarity
to the XML that is sent to the camera but most importantly allows
specification of full onvif URL including authentication and control URI
through the Control Address field. Parsing of the url is done through a
combination of sane defaults and the URI module.
2021-02-25 22:37:34 +00:00