danvics/howdy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use defaults for config values; simplify path detection

Browse source
This commit is contained in:
dmig 2018-12-09 14:24:50 +07:00
parent b465982092
commit 8671be425d
No known key found for this signature in database
GPG key ID: A4A245B3AD37C4FC
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cli/add.py
View file

@ -20,8 +20,8 @@ except ImportError as err:
print("pip3 show face_recognition") print("pip3 show face_recognition")
sys.exit(1) sys.exit(1)
# Get the absolute path to the current file # Get the absolute path to the current directory
path = os.path.dirname(os.path.abspath(__file__)) path = os.path.abspath(__file__ + '/..')
# Read config from disk # Read config from disk
config = configparser.ConfigParser() config = configparser.ConfigParser()
@ -81,13 +81,13 @@ insert_model = {
video_capture = cv2.VideoCapture(config.get("video", "device_path")) video_capture = cv2.VideoCapture(config.get("video", "device_path"))
# Force MJPEG decoding if true # Force MJPEG decoding if true
if config.getboolean("video", "force_mjpeg"): if config.getboolean("video", "force_mjpeg", fallback=False):
# Set a magic number, will enable MJPEG but is badly documentated # Set a magic number, will enable MJPEG but is badly documentated
video_capture.set(cv2.CAP_PROP_FOURCC, 1196444237) video_capture.set(cv2.CAP_PROP_FOURCC, 1196444237)
# Set the frame width and height if requested # Set the frame width and height if requested
fw = config.getint("video", "frame_width") fw = config.getint("video", "frame_width", fallback=-1)
fh = config.getint("video", "frame_height") fh = config.getint("video", "frame_height", fallback=-1)
if fw != -1: if fw != -1:
video_capture.set(cv2.CAP_PROP_FRAME_WIDTH, fw) video_capture.set(cv2.CAP_PROP_FRAME_WIDTH, fw)
@ -95,7 +95,7 @@ if fh != -1:
video_capture.set(cv2.CAP_PROP_FRAME_HEIGHT, fh) video_capture.set(cv2.CAP_PROP_FRAME_HEIGHT, fh)
# Request a frame to wake the camera up # Request a frame to wake the camera up
video_capture.read() video_capture.grab()
print("\nPlease look straight into the camera") print("\nPlease look straight into the camera")