jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements to RPi camera platform (#4059)

Browse Source 
* Try to create output file instead of checking write permissions

* Kill raspistill process during shutdown
This commit is contained in:
Pierre Ståhl 2016-10-27 08:51:13 +02:00 committed by Paulus Schoutsen
parent 541fec0534
commit 235e1a0885
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
homeassistant/components/camera/rpi_camera.py
View File

@ -12,7 +12,8 @@ import shutil
import voluptuous as vol import voluptuous as vol
from homeassistant.components.camera import (Camera, PLATFORM_SCHEMA) from homeassistant.components.camera import (Camera, PLATFORM_SCHEMA)
from homeassistant.const import (CONF_NAME, CONF_FILE_PATH) from homeassistant.const import (CONF_NAME, CONF_FILE_PATH,
EVENT_HOMEASSISTANT_STOP)
from homeassistant.helpers import config_validation as cv from homeassistant.helpers import config_validation as cv
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -35,7 +36,7 @@ DEFAULT_TIMELAPSE = 1000
DEFAULT_VERTICAL_FLIP = 0 DEFAULT_VERTICAL_FLIP = 0
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_FILE_PATH): cv.isfile, vol.Optional(CONF_FILE_PATH): cv.string,
vol.Optional(CONF_HORIZONTAL_FLIP, default=DEFAULT_HORIZONTAL_FLIP): vol.Optional(CONF_HORIZONTAL_FLIP, default=DEFAULT_HORIZONTAL_FLIP):
vol.All(vol.Coerce(int), vol.Range(min=0, max=1)), vol.All(vol.Coerce(int), vol.Range(min=0, max=1)),
vol.Optional(CONF_IMAGE_HEIGHT, default=DEFAULT_HORIZONTAL_FLIP): vol.Optional(CONF_IMAGE_HEIGHT, default=DEFAULT_HORIZONTAL_FLIP):
@ -53,6 +54,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
}) })
def kill_raspistill(*args):
"""Kill any previously running raspistill process.."""
subprocess.Popen(['killall', 'raspistill'],
stdout=subprocess.DEVNULL,
stderr=subprocess.STDOUT)
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup the Raspberry Camera.""" """Setup the Raspberry Camera."""
if shutil.which("raspistill") is None: if shutil.which("raspistill") is None:
@ -75,11 +83,20 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
} }
) )
if not os.access(setup_config[CONF_FILE_PATH], os.W_OK): hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, kill_raspistill)
try:
# Try to create an empty file (or open existing) to ensure we have
# proper permissions.
open(setup_config[CONF_FILE_PATH], 'a').close()
add_devices([RaspberryCamera(setup_config)])
except PermissionError:
_LOGGER.error("File path is not writable") _LOGGER.error("File path is not writable")
return False return False
except FileNotFoundError:
add_devices([RaspberryCamera(setup_config)]) _LOGGER.error("Could not create output file (missing directory?)")
return False
class RaspberryCamera(Camera): class RaspberryCamera(Camera):
@ -93,9 +110,7 @@ class RaspberryCamera(Camera):
self._config = device_info self._config = device_info
# Kill if there's raspistill instance # Kill if there's raspistill instance
subprocess.Popen(['killall', 'raspistill'], kill_raspistill()
stdout=subprocess.DEVNULL,
stderr=subprocess.STDOUT)
cmd_args = [ cmd_args = [
'raspistill', '--nopreview', '-o', device_info[CONF_FILE_PATH], 'raspistill', '--nopreview', '-o', device_info[CONF_FILE_PATH],