Commit Graph

115 Commits

Author SHA1 Message Date
Isaac Connor 3be0b774bd better error logging 2019-05-23 16:26:21 -04:00
Isaac Connor 1498027f12 Add option to attach the objdetect image in emails 2019-05-08 22:45:04 -04:00
Isaac Connor 349693e27d Add a missing comma 2018-10-25 11:24:23 -04:00
Andy Bauer 5b964ba3d5 create the upload folder if it does not exist 2018-10-11 15:57:25 -05:00
Andrew Bauer 71e150daae
add missing brackets around second expression in archImagePath 2018-10-11 14:32:40 -05:00
Isaac Connor 428b2506ec Add .mp4 and snapshot files to glob for upload archive 2018-10-11 11:28:07 -04:00
Andrew Bauer c1de20a081 use $Event rather than $event (#2240) 2018-10-08 09:25:17 -04:00
Isaac Connor 4a642e1a9d pass Event instead of event to executeCommand 2018-10-08 08:31:16 -04:00
Isaac Connor 9275a1d046 fix missing spaces after 'to' and some spacing and quotes 2018-10-05 09:45:47 -04:00
Isaac Connor c94367c7ad The uploadArchFile takes an Event object now 2018-09-29 08:32:57 -04:00
Isaac Connor 4528a043c5 fixtypo 2018-09-14 11:04:52 -04:00
Isaac Connor 63bed3af10 replace all uses of getEventPath with object function event->Path(). Remove getEventPath 2018-09-14 09:23:09 -04:00
Isaac Connor b545528bb0 If DefaultVideo is set, use the passthrough mp4 instead of generating and mp4 from jpegs 2018-09-11 08:49:42 -04:00
Isaac Connor dbdb9680c0 exit on HUP to free up memory. 2018-08-07 11:32:17 -04:00
Isaac Connor fd72689182 Spacing, quotes. Main thing is to delete Object cache on HUP 2018-06-21 10:49:51 -04:00
Isaac Connor a594a1b6f1 Merge branch 'master' into storageareas 2018-06-15 09:45:11 -04:00
Isaac Connor f5f4649886 Fix #2100 2018-06-08 15:14:11 -04:00
Isaac Connor 5b38585071 add a --daemon command line option to zmfilter.pl to tell it to run as a daemon even when --filter_id is specified.
Use this command line option in zmpkg.pl to make zmfilter.pl's stick around.
This reduces the impact of the memork leak in zmdc.pl
2018-06-06 14:05:58 -04:00
Isaac Connor d3a611ae49 google code style. sth does not have a errstr() method. 2018-04-30 07:56:51 -07:00
Isaac Connor a4da624f4c break out of loops when zm-terminate is set 2018-04-27 13:20:38 -07:00
Isaac Connor a68ed3a305 watchfeed => watch. Fixes #2086 2018-04-23 11:38:25 -04:00
Isaac Connor a868bb70ed Better debug when fail to attach images 2018-04-20 15:56:14 -04:00
Isaac Connor 1d4e79feb1 Update filters a bit, using Event as an object to get the Path, etc 2018-04-20 15:22:31 -04:00
Isaac Connor 64c3c21564 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-04-19 14:22:23 -04:00
Isaac Connor 2516846176 only update DiskSpace if new DiskSpace is defined 2018-04-19 14:22:19 -04:00
Isaac Connor 925f640118 Fix Filters using a cached SQL 2018-04-14 11:09:01 -04:00
Isaac Connor f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor aea1816e8e Add in signal handlers to as to complete an action before exiting. 2018-01-30 09:19:08 -05:00
Isaac Connor 5472a1a012 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-18 11:40:37 -05:00
Isaac Connor 715adb5acb add locking to Event moving and diskspace updating. 2018-01-18 11:38:08 -05:00
Isaac Connor b71581922f Only update db record if there is a change in diskspace 2018-01-17 12:56:37 -08:00
Isaac Connor 16f01d5ecb Fix when specifying by filter_id or filter_name. Probably a botched merge. 2018-01-02 07:10:38 -08:00
Isaac Connor eebc7ce856 code doc 2017-12-12 11:16:17 -05:00
Isaac Connor 1ccd344bf5 implement Storage Area move 2017-12-04 11:05:50 -05:00
Isaac Connor 663cc6df87 improve logging of zmfilter 2017-10-27 09:09:12 -07:00
Isaac Connor 82fbec697f add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid 2017-10-27 08:37:53 -07:00
Isaac Connor e27b95c820 make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace 2017-10-27 08:05:35 -07:00
Isaac Connor 653d213d62 Add EndTime and DiskSpace to Filters 2017-10-25 11:11:19 -07:00
Isaac Connor c75215ad29 fix merge problems 2017-06-09 09:13:30 -04:00
Isaac Connor 451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor 07704dd5d6 coments 2017-06-04 17:30:39 -04:00
Isaac Connor b6b4738b9f fix quotes 2017-06-02 12:31:54 -04:00
Isaac Connor 71b9ca97c6 no need to store filters as an array ref 2017-06-02 12:25:26 -04:00
Isaac Connor 5228b9d008 move command line option parsing up, so if we are just getting the version we exit quick before doing a bunch of other things. 2017-06-02 11:54:40 -04:00
Isaac Connor be5b93a64e whitespace, braces, quotes 2017-06-02 11:39:35 -04:00
Isaac Connor f4224bb88e Merge branch 'master' into storageareas 2017-05-17 17:47:39 -04:00
Vladimir Poluyaktov 2c9d21f59f 1768 fix email tokens for h264 storage (#1814)
* 1768-Fix-email-tokens-for-h264-storage Snapshot extraction impmemented

* 1768-Fix-email-tokens-for-h264-storage: Video file path fixed

* 1768-Fix-email-tokens-for-h264-storage: vframes 1 option added

* 1768-Fix-email-tokens-for-h264-storage: generateImage sub created

* 1768-Fix-email-tokens-for-h264-storage: Few typos fixed

* 1768-Fix-email-tokens-for-h264-storage: Code refactoring. EI1A and EIMA macros added
2017-05-16 13:04:42 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Isaac Connor de24ba7120 Merge pull request #1779 from vajonam/1778-add-subtituteTags-for-exec
add the ability to add substitued tags to the commandline
2017-05-10 09:00:36 -04:00
Isaac Connor c2461f93cd google code style and a better debug message 2017-03-20 16:47:58 -04:00