Skip to content

fix camera.push API overwrite #15334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 4 commits into from
Jul 9, 2018
+17 −9
Merged

fix camera.push API overwrite #15334

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a2c46e
fix camera.push API overwrite
dgomes Jul 6, 2018
07ba004
dont search in the component dictionary, but in hour own
dgomes Jul 8, 2018
364fd7f
remove error message
dgomes Jul 8, 2018
942b9c0
hound
dgomes Jul 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions homeassistant/components/camera/push.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
ATTR_FILENAME = 'filename'
ATTR_LAST_TRIP = 'last_trip'

PUSH_CAMERA_DATA = 'push_camera'

PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_BUFFER_SIZE, default=1): cv.positive_int,
Expand All @@ -41,11 +43,14 @@
async def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Set up the Push Camera platform."""
if PUSH_CAMERA_DATA not in hass.data:
hass.data[PUSH_CAMERA_DATA] = {}

cameras = [PushCamera(config[CONF_NAME],
config[CONF_BUFFER_SIZE],
config[CONF_TIMEOUT])]

hass.http.register_view(CameraPushReceiver(cameras,
hass.http.register_view(CameraPushReceiver(hass,
config[CONF_IMAGE_FIELD]))

async_add_devices(cameras)
Expand All @@ -57,19 +62,18 @@ class CameraPushReceiver(HomeAssistantView):
url = "/api/camera_push/{entity_id}"
name = 'api:camera_push:camera_entity'

def __init__(self, cameras, image_field):
def __init__(self, hass, image_field):
"""Initialize CameraPushReceiver with camera entity."""
self._cameras = cameras
self._cameras = hass.data[PUSH_CAMERA_DATA]
self._image = image_field

async def post(self, request, entity_id):
"""Accept the POST from Camera."""
try:
(_camera,) = [camera for camera in self._cameras
if camera.entity_id == entity_id]
except ValueError:
_LOGGER.error("Unknown push camera %s", entity_id)
return self.json_message('Unknown Push Camera',
_camera = self._cameras.get(entity_id)

if _camera is None:
_LOGGER.error("Unknown %s", entity_id)
return self.json_message('Unknown {}'.format(entity_id),
HTTP_BAD_REQUEST)

try:
Expand Down Expand Up @@ -101,6 +105,10 @@ def __init__(self, name, buffer_size, timeout):
self.queue = deque([], buffer_size)
self._current_image = None

async def async_added_to_hass(self):
"""Call when entity is added to hass."""
self.hass.data[PUSH_CAMERA_DATA][self.entity_id] = self

@property
def state(self):
"""Current state of the camera."""
Expand Down