Merge pull request #407 from pliablepixels/master

add example of pre_existing labels, adjust release process to create ZM tags
ZoneMinder · Jul 24, 2021 · 32ae62c · 32ae62c
2 parents bd4513f + a5b75f4
commit 32ae62c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/hook/objectconfig.ini b/hook/objectconfig.ini
@@ -453,7 +453,8 @@ ml_sequence= {
 		},
 		'face': {
 			'general':{
-				'pattern': '{{face_detection_pattern}}',				
+				'pattern': '{{face_detection_pattern}}',		
+				#'pre_existing_labels': ['person'], # when put in general section, it will check if a previous detection type (like object) found this label
 				'same_model_sequence_strategy': 'union' # combines all outputs of this sequence
 			},
 			'sequence': [

diff --git a/make_tag.sh b/make_tag.sh
@@ -26,3 +26,4 @@ echo "VERSION = __version__" >> hook/zmes_hook_helpers/__init__.py
 
 git tag -fa v$VER -m"v$VER"
 git push -f --tags
+git push upstream -f  --tags
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ echo "VERSION = __version__" >> hook/zmes_hook_helpers/__init__.py

		git tag -fa v$VER -m"v$VER"
		git push -f --tags
		git push upstream -f --tags