Skip to content

Merging from dev #5

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
tchellomello merged 5 commits into from
Feb 12, 2017
Merged

Merging from dev #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd8d32e
updated pylintrc
tchellomello Feb 12, 2017
b9222e6
Added has_subscription and check if device is online/offline
tchellomello Feb 12, 2017
b068e6a
Makes lint happy
tchellomello Feb 12, 2017
75a819d
Show error only into debug mode
tchellomello Feb 12, 2017
6a3f8d4
Fixed bug to refresh authentication token when having multiple connec…
tchellomello Feb 12, 2017
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
2 changes: 1 addition & 1 deletion pylintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ disable=
abstract-method

[EXCEPTIONS]
overgeneral-exceptions=Exception,HomeAssistantError
overgeneral-exceptions=Exception
129 changes: 101 additions & 28 deletions ring_doorbell/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,14 @@ def _authenticate(self, attempts=RETRY_TOKEN):
self.token = data.get('authentication_token')
self._params = {'api_version': API_VERSION,
'auth_token': self.token}
return
return True

self.is_connected = False
req.raise_for_status()

def _query(self, url, attempts=RETRY_TOKEN,
raw=False, params=None):
raw=False, extra_params=None):
"""Query data from Ring API."""
# allow to override params
if params is None:
params = self._params

if self.debug:
_LOGGER.debug("Querying %s", url)

Expand All @@ -79,6 +75,15 @@ def _query(self, url, attempts=RETRY_TOKEN,
response = None
loop = 0
while loop <= attempts:

# allow to override params when necessary
# and update self._params globally for the next connection
if extra_params:
params = self._params
params.update(extra_params)
else:
params = self._params

loop += 1
try:
req = self.session.get((url), params=urlencode(params))
Expand All @@ -100,10 +105,18 @@ def _query(self, url, attempts=RETRY_TOKEN,

break

if response is None:
_LOGGER.error(GENERIC_FAIL)
if response is None and self.debug:
_LOGGER.debug(GENERIC_FAIL)
return response

@property
def has_subscription(self):
"""Return if account has subscription."""
try:
return self.features.get('subscriptions_enabled')
except AttributeError:
return NOT_FOUND

@property
def devices(self):
"""Return all devices."""
Expand All @@ -121,20 +134,49 @@ def __devices(self):
@property
def chimes(self):
"""Return list of chimes by name."""
req = self.__devices.get('chimes')
return list((obj['description'] for obj in req))
try:
req = self.__devices.get('chimes')
return list((obj['description'] for obj in req))
except AttributeError:
return NOT_FOUND

def chime_id(self, name):
"""Return chime ID."""
return self.chime_attributes(name).get('id')
try:
return self.chime_attributes(name).get('id')
except AttributeError:
return NOT_FOUND

def chime_attributes(self, name):
"""Return chime attributes."""
lst = self.__devices.get('chimes')
index = _locator(lst, 'description', name)
if index == NOT_FOUND:
return None
return lst[index]
try:
lst = self.__devices.get('chimes')
index = _locator(lst, 'description', name)
if index == NOT_FOUND:
return NOT_FOUND
return lst[index]
except AttributeError:
return NOT_FOUND

def is_chime_online(self, name):
"""Return if chime is online."""
try:
result = self.chime_attributes(name).get('subscribed')
if result is None:
return False
except AttributeError:
return NOT_FOUND
return True

def is_chime_subscribed_motions(self, name):
"""Return if chime is subscribed_motions."""
try:
result = self.chime_attributes(name).get('subscribed_motions')
if result is None:
return False
except AttributeError:
return NOT_FOUND
return True

def chime_tree(self, name):
"""Return doorbell data linked to chime."""
Expand All @@ -145,24 +187,56 @@ def chime_tree(self, name):
@property
def doorbells(self):
"""Return list of doorbells by name."""
req = self.__devices.get('doorbots')
return list((obj['description'] for obj in req))
try:
req = self.__devices.get('doorbots')
return list((obj['description'] for obj in req))
except AttributeError:
return NOT_FOUND

def doorbell_attributes(self, name):
"""Return doorbell attributes."""
lst = self.__devices.get('doorbots')
index = _locator(lst, 'description', name)
if index == NOT_FOUND:
return None
return lst[index]
try:
lst = self.__devices.get('doorbots')
index = _locator(lst, 'description', name)
if index == NOT_FOUND:
return NOT_FOUND
return lst[index]
except AttributeError:
return NOT_FOUND

def doorbell_id(self, name):
"""Return doorbell ID."""
return self.doorbell_attributes(name).get('id')
try:
return self.doorbell_attributes(name).get('id')
except AttributeError:
return NOT_FOUND

def is_doorbell_online(self, name):
"""Return state for doorbell is online."""
try:
result = self.doorbell_attributes(name).get('subscribed')
if result is None:
return False
except AttributeError:
return NOT_FOUND
return True

def is_doorbell_subscribed_motions(self, name):
"""Return if doorbell is subscribed."""
try:
result = self.doorbell_attributes(name).get('subscribed_motions')
if result is None:
return False
except AttributeError:
return NOT_FOUND
return True

def doorbell_battery_life(self, name):
"""Return doorbell battery life."""
return self.doorbell_attributes(name).get('battery_life')
try:
return self.doorbell_attributes(name).get('battery_life')
except AttributeError:
return NOT_FOUND

def __live_streaming_create_session(self, name):
"""Initiate session live streaming URL."""
Expand Down Expand Up @@ -190,11 +264,10 @@ def check_activity(self):
def history(self, limit=30):
"""Return history."""
# allow modify the items to return
params = self._params
params.update({'limit': str(limit)})
params = {'limit': str(limit)}

url = API_URI + URL_HISTORY
return self._query(url, params=params)
return self._query(url, extra_params=params)

def doorbell_recording(self, recording_id):
"""Return recording in MP4 format."""
Expand Down