ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,323 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

5323 Commits

Author SHA1 Message Date
Isaac Connor c2a857b498 Merge branch 'storageareas' into newpointone 2015-12-21 11:34:27 -05:00
Isaac Connor 3d00c3a50d Make getDiskPercent take an optional path. When a Server is specified, add it to the Filter object so that we can use in getDiskPercent 2015-12-21 11:34:12 -05:00
Isaac Connor 710197a4f2 Merge branch 'filter_object' into storageareas 
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
	scripts/zmfilter.pl.in
 2015-12-21 11:27:48 -05:00
Isaac Connor de83872671 id => Id 2015-12-21 11:25:38 -05:00
Isaac Connor 9f02f4353c it is important to return the object from the constructor 2015-12-21 11:13:01 -05:00
Isaac Connor e7c337f9f3 fix namespace for dbh 2015-12-21 11:10:45 -05:00
Isaac Connor 30353fbcf9 Add special case for Server Attr's because they are on the Monitor, not the event 2015-12-21 10:33:19 -05:00
Isaac Connor 5553760222 Add special cases for ServerId, ServerName, ServerHost to handle supplying the value of the host that the script is running on. 2015-12-21 10:23:37 -05:00
Isaac Connor 2548ec3bc0 Add Attr lines for StrageId and StorageName 2015-12-21 10:10:53 -05:00
Isaac Connor 00c4eedb90 Add StorageId and StorageName to fields that we can filter on 2015-12-21 10:04:13 -05:00
Isaac Connor fc981e063e snap release adding zmvideo 2015-12-21 10:01:55 -05:00
Isaac Connor fd773858a6 Merge branch 'better_zmvideo' into newpointone 
Conflicts:
	scripts/zmfilter.pl.in
 2015-12-18 14:17:45 -05:00
Isaac Connor 623c8a14b0 add multi-package build for 14.04 2015-12-18 14:16:45 -05:00
Isaac Connor 9782204548 include Storage.php 2015-12-18 12:13:26 -05:00
Isaac Connor fb1766f21f Add storage.php 2015-12-18 11:39:42 -05:00
Isaac Connor d035753971 Add the event class. 
Also, remove the unused Storage class
 2015-12-17 14:38:18 -05:00
Isaac Connor b32ef7751b implement the options to generate videos for events specified by a stored filter. Also implement ability to generate a concatenated video of all events specified by the filter. 2015-12-17 14:36:40 -05:00
Isaac Connor c71d1e52ac Fix 2015-12-17 13:13:04 -05:00
Isaac Connor 9db9d243f2 Fix 2015-12-17 13:12:37 -05:00
Isaac Connor 6f34022613 add find and find_one routines 2015-12-17 13:11:32 -05:00
Isaac Connor 7a979bb891 remove duplicated routines 2015-12-17 13:11:15 -05:00
Isaac Connor 64f65b55cc use new Filter object to do some of the heavy lifting in zmfilter.pl 2015-12-17 12:57:14 -05:00
Isaac Connor 7365c053e6 Create a Filter object, out of some of the code in zmfilter.pl. The purpose is to be able to use it elsewhere like zmvideo.pl. 2015-12-17 12:56:40 -05:00
Isaac Connor 3121e5550c Create a new class Storage and use it to handle figureing out where the event is actually stored. 2015-12-17 10:47:47 -05:00
Isaac Connor 09c75e2363 add a storage area editing page 2015-12-15 14:08:34 -05:00
Isaac Connor 8f141305b7 add default parameter in constuctor 2015-12-15 13:27:57 -05:00
Isaac Connor 6bb22a9a1b change method from getPath to Path 2015-12-15 13:27:25 -05:00
Isaac Connor 7588f6088f change method from getPath to Path 2015-12-15 13:27:18 -05:00
Isaac Connor 916cfe5ee6 change method from getPath to Path 2015-12-15 12:10:07 -05:00
Isaac Connor 0f4757b1ad change method from getPath to Path 2015-12-15 12:10:01 -05:00
Isaac Connor 6daa8e2290 add server_id to event_data 2015-12-15 12:09:45 -05:00
Isaac Connor 2597bbd9bf use storage object instead of config.dir_events 2015-12-15 12:09:34 -05:00
Isaac Connor 3802d16922 add ServerId to Events Table 2015-12-15 12:09:11 -05:00
Isaac Connor c345d697b2 missed dbServer -> dbStorage 2015-12-15 11:21:52 -05:00
Isaac Connor 6ce7952acb Merge branch 'multi-server' into storageareas 2015-12-15 11:20:01 -05:00
Isaac Connor aaa9f3bcc9 Handle case where parameter is not passed to constuctor 2015-12-15 11:19:50 -05:00
Isaac Connor 1151fe39ab More debug lines, and use the default config.events_dir path when not specified otherwise 2015-12-15 11:17:32 -05:00
Isaac Connor d7568180fe add getStorage method to return the desired Storage Area object 2015-12-15 11:16:51 -05:00
Isaac Connor 20f9a01a66 Add a Storage tab, to provide a place to define your storage areas 2015-12-15 11:13:21 -05:00
Isaac Connor 14dc447145 add a Storage Area dropdown to set where this monitor will storage it's events 2015-12-15 11:13:00 -05:00
Isaac Connor 9ffbaabde5 add save and delete actions for Storage 2015-12-15 11:12:33 -05:00
Isaac Connor c07c63cde6 Check for setting of IdOrRow. When loading from db, using FETCH_CLASS, the constructor is called without arguments 2015-12-15 11:12:21 -05:00
Isaac Connor 010d7b3d64 convert to using storage->getPath instaed of config.events_dir 2015-12-15 11:11:34 -05:00
Isaac Connor 6aadd7330a make loading a null or invalid storage area not be fatal, but use the default path 2015-12-15 09:39:29 -05:00
Isaac Connor a196906345 Move where StorageId goes to after ServerId 2015-12-15 09:12:11 -05:00
Isaac Connor ccc001a27f bump version to 110 2015-12-15 09:11:56 -05:00
Isaac Connor 43968b7862 add Storage table creation 2015-12-14 17:03:45 -05:00
Isaac Connor 9488f71244 Add zmupdate script to add Storage table and StorageId to Monitors, and bump version 2015-12-14 17:00:04 -05:00
Isaac Connor 14cde582cf Merge branch 'multi-server' into multiserverplusstorage 
Conflicts:
	src/zm_monitor.h
 2015-12-14 16:55:26 -05:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05:00