Compare commits
90
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7815ba4a3e | ||
|
|
dff0a66c05 | ||
|
|
849b3e060f | ||
|
|
29c6d269a2 | ||
|
|
725debaebe | ||
|
|
7507163422 | ||
|
|
4cb9893fd9 | ||
|
|
6b4fba902b | ||
|
|
c1dc538627 | ||
|
|
6f262c8522 | ||
|
|
d8cf932672 | ||
|
|
42422b3462 | ||
|
|
c51f723133 | ||
|
|
7270a1c1ee | ||
|
|
67b9fe0555 | ||
|
|
887e4288ae | ||
|
|
1c59b34ac4 | ||
|
|
ea2ba8dfcf | ||
|
|
78a1b9b74d | ||
|
|
b99cfc74e9 | ||
|
|
3d6efa4b0a | ||
|
|
b998c47ac7 | ||
|
|
fc7848f00b | ||
|
|
125c562df5 | ||
|
|
f748147dcc | ||
|
|
77c23f8109 | ||
|
|
b98c56938f | ||
|
|
23308cd5db | ||
|
|
9d9d3aa7a3 | ||
|
|
3ddfd10678 | ||
|
|
7c75ffa815 | ||
|
|
4e4b22314a | ||
|
|
4e6b570cba | ||
|
|
b12d9ba969 | ||
|
|
83df95f0da | ||
|
|
3c5caae93f | ||
|
|
b41460c569 | ||
|
|
9ff02de48b | ||
|
|
14cbbacc1b | ||
|
|
1cadf3488d | ||
|
|
c78f411014 | ||
|
|
ab2db14bc8 | ||
|
|
36ff8e4917 | ||
|
|
f42c49d221 | ||
|
|
114f8fbfa8 | ||
|
|
8bbf03fdb4 | ||
|
|
5b57982b41 | ||
|
|
ecf7a5b13a | ||
|
|
f68951fab7 | ||
|
|
23eec5187d | ||
|
|
caa3e10648 | ||
|
|
4bc0b80eea | ||
|
|
959a7dfa85 | ||
|
|
9e793b6748 | ||
|
|
c75e057e83 | ||
|
|
6fa4aa6f75 | ||
|
|
89da167404 | ||
|
|
f2520e35fe | ||
|
|
aaaaea4dd1 | ||
|
|
ec67d97809 | ||
|
|
f6118ea4a7 | ||
|
|
d257f676ec | ||
|
|
58f4a9df57 | ||
|
|
9d91ce62d3 | ||
|
|
511ca99cba | ||
|
|
465701810b | ||
|
|
c8c0ed58df | ||
|
|
cfe3c10cec | ||
|
|
014509bd64 | ||
|
|
f5d5d34eda | ||
|
|
64c8bec614 | ||
|
|
1b765035de | ||
|
|
93f46bde6a | ||
|
|
4a09fcf06f | ||
|
|
12a2ae1326 | ||
|
|
325241d56a | ||
|
|
95664fea1f | ||
|
|
e2b43f4b06 | ||
|
|
845c8a2a40 | ||
|
|
306f8b6cb4 | ||
|
|
a704933a35 | ||
|
|
8bd09c3726 | ||
|
|
6240364067 | ||
|
|
9d37cfccd0 | ||
|
|
125efd9436 | ||
|
|
6701fd39d8 | ||
|
|
d4edf96f83 | ||
|
|
a2555a6c40 | ||
|
|
c01a6ce16b | ||
|
|
ab38afa105 |
@@ -0,0 +1,9 @@
|
|||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: pip
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: daily
|
||||||
|
open-pull-requests-limit: 10
|
||||||
|
reviewers:
|
||||||
|
- fronzbot
|
||||||
+3
-2
@@ -1,5 +1,5 @@
|
|||||||
# Number of days of inactivity before an issue becomes stale
|
# Number of days of inactivity before an issue becomes stale
|
||||||
daysUntilStale: 60
|
daysUntilStale: 30
|
||||||
|
|
||||||
# Number of days of inactivity before a stale issue is closed
|
# Number of days of inactivity before a stale issue is closed
|
||||||
daysUntilClose: 7
|
daysUntilClose: 7
|
||||||
@@ -8,7 +8,8 @@ daysUntilClose: 7
|
|||||||
exemptLabels:
|
exemptLabels:
|
||||||
- Priority
|
- Priority
|
||||||
- bug
|
- bug
|
||||||
- Help Wanted
|
- help wanted
|
||||||
|
- feature request
|
||||||
|
|
||||||
# Set to true to ignore issues in a project (defaults to false)
|
# Set to true to ignore issues in a project (defaults to false)
|
||||||
exemptProjects: true
|
exemptProjects: true
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
python-version: [3.8]
|
python-version: [3.9]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v1
|
uses: actions/setup-python@v1
|
||||||
with:
|
with:
|
||||||
python-version: '3.7'
|
python-version: '3.8'
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
|
|||||||
@@ -10,11 +10,11 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.platform }}
|
||||||
strategy:
|
strategy:
|
||||||
max-parallel: 3
|
max-parallel: 4
|
||||||
matrix:
|
matrix:
|
||||||
platform:
|
platform:
|
||||||
- ubuntu-latest
|
- ubuntu-latest
|
||||||
python-version: [3.6, 3.7, 3.8]
|
python-version: [3.6, 3.7, 3.8, 3.9]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|||||||
@@ -14,3 +14,4 @@ build/*
|
|||||||
docs/_build
|
docs/_build
|
||||||
*.log
|
*.log
|
||||||
venv
|
venv
|
||||||
|
.session*
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
image: python
|
|
||||||
|
|
||||||
stages:
|
|
||||||
- test
|
|
||||||
|
|
||||||
before_script:
|
|
||||||
- curl -O https://bootstrap.pypa.io/get-pip.py
|
|
||||||
- python get-pip.py
|
|
||||||
- pip install tox
|
|
||||||
|
|
||||||
python35:
|
|
||||||
image: python:3.5
|
|
||||||
stage: test
|
|
||||||
script: tox -e py35
|
|
||||||
|
|
||||||
python36:
|
|
||||||
image: python:3.6
|
|
||||||
stage: test
|
|
||||||
script: tox -e py36
|
|
||||||
|
|
||||||
lint:
|
|
||||||
image: python:3.6
|
|
||||||
stage: test
|
|
||||||
script: tox -e lint
|
|
||||||
|
|
||||||
+55
@@ -4,6 +4,61 @@ Changelog
|
|||||||
|
|
||||||
A list of changes between each release
|
A list of changes between each release
|
||||||
|
|
||||||
|
0.17.1 (2021-02-18)
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
- Add delay parameter to Blink.download_videos method in order to throttle API during video retrieval (`#437 <https://github.com/fronzbot/blinkpy/pull/437>`__)
|
||||||
|
- Bump pylint to 2.6.2
|
||||||
|
|
||||||
|
|
||||||
|
0.17.0 (2021-02-15)
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
**Bugfixes:**
|
||||||
|
- Fix video downloading bug (`#424 <https://github.com/fronzbot/blinkpy/pull/424>`__)
|
||||||
|
- Fix repeated authorization email bug (`#432 <https://github.com/fronzbot/blinkpy/pull/432>`__ and `#428 <https://github.com/fronzbot/blinkpy/pull/428>`__)
|
||||||
|
|
||||||
|
**New Features:**
|
||||||
|
- Add logout method (`#429 <https://github.com/fronzbot/blinkpy/pull/429>`__)
|
||||||
|
- Add camera record method (`#430 <https://github.com/fronzbot/blinkpy/pull/430>`__)
|
||||||
|
|
||||||
|
**Other:**
|
||||||
|
- Add debug script to main repo to help with general debug
|
||||||
|
- Upgrade login endpoint from v4 to v5
|
||||||
|
- Add python 3.9 support
|
||||||
|
- Bump coverage to 5.4
|
||||||
|
- Bump pytest to 6.2.2
|
||||||
|
- Bump pytest-cov to 2.11.1
|
||||||
|
- Bump pygments to 2.8.0
|
||||||
|
- Bump pre-commit to 2.10.1
|
||||||
|
- Bump restructuredtext-lint to 1.3.2
|
||||||
|
|
||||||
|
|
||||||
|
0.16.4 (2020-11-22)
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
**Bugfixes:**
|
||||||
|
|
||||||
|
- Updated liveview endpoint (`#389 <https://github.com/fronzbot/blinkpy/pull/389>`__)
|
||||||
|
- Fixed mini thumbnail not updating (`#388 <https://github.com/fronzbot/blinkpy/pull/388>`__)
|
||||||
|
- Add exception catch to prevent NoneType error on refresh, added test to check behavior as well (`#401 <https://github.com/fronzbot/blinkpy/pull/401>`__)
|
||||||
|
- Unrelated: had to add two force methods to refresh for testing purposes. Should not change normal usage.
|
||||||
|
- Fix malformed stream url (`#395 <https://github.com/fronzbot/blinkpy/pull/395>`__)
|
||||||
|
|
||||||
|
**All:**
|
||||||
|
|
||||||
|
- Moved testtools to requirements_test.txt (`#387 <https://github.com/fronzbot/blinkpy/pull/387>`__)
|
||||||
|
- Bumped pytest to 6.1.1
|
||||||
|
- Bumped flake8 to 3.8.4
|
||||||
|
- Fixed README spelling ((`#381 <https://github.com/fronzbot/blinkpy/pull/381>`__) via @rohitsud)
|
||||||
|
- Bumped pygments to 2.7.1
|
||||||
|
- Bumped coverage to 5.3
|
||||||
|
- Bumped pydocstyle to 5.1.1
|
||||||
|
- Bumped pre-commit to 2.7.1
|
||||||
|
- Bumped pylint to 2.6.0
|
||||||
|
- Bumped pytest-cov to 2.10.1
|
||||||
|
|
||||||
|
|
||||||
0.16.3 (2020-08-02)
|
0.16.3 (2020-08-02)
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -174,13 +174,13 @@ Similar methods exist for individual cameras:
|
|||||||
|
|
||||||
Download videos
|
Download videos
|
||||||
----------------
|
----------------
|
||||||
You can also use this library to download all videos from the server. In order to do this, you must specify a ``path``. You may also specifiy a how far back in time to go to retrieve videos via the ``since=`` variable (a simple string such as ``"2017/09/21"`` is sufficient), as well as how many pages to traverse via the ``stop=`` variable. Note that by default, the library will search the first ten pages which is sufficient in most use cases. Additionally, you can specify one or more cameras via the ``camera=`` property. This can be a single string indicating the name of the camera, or a list of camera names. By default, it is set to the string ``'all'`` to grab videos from all cameras.
|
You can also use this library to download all videos from the server. In order to do this, you must specify a ``path``. You may also specifiy a how far back in time to go to retrieve videos via the ``since=`` variable (a simple string such as ``"2017/09/21"`` is sufficient), as well as how many pages to traverse via the ``stop=`` variable. Note that by default, the library will search the first ten pages which is sufficient in most use cases. Additionally, you can specify one or more cameras via the ``camera=`` property. This can be a single string indicating the name of the camera, or a list of camera names. By default, it is set to the string ``'all'`` to grab videos from all cameras. If you are downloading many items, setting the ``delay`` parameter is advised in order to throttle sequential calls to the API. By default this is set to ``1`` but can be any integer representing the number of seconds to delay between calls.
|
||||||
|
|
||||||
Example usage, which downloads all videos recorded since July 4th, 2018 at 9:34am to the ``/home/blink`` directory:
|
Example usage, which downloads all videos recorded since July 4th, 2018 at 9:34am to the ``/home/blink`` directory with a 2s delay between calls:
|
||||||
|
|
||||||
.. code:: python
|
.. code:: python
|
||||||
|
|
||||||
blink.download_videos('/home/blink', since='2018/07/04 09:34')
|
blink.download_videos('/home/blink', since='2018/07/04 09:34', delay=2)
|
||||||
|
|
||||||
|
|
||||||
.. |Build Status| image:: https://github.com/fronzbot/blinkpy/workflows/build/badge.svg
|
.. |Build Status| image:: https://github.com/fronzbot/blinkpy/workflows/build/badge.svg
|
||||||
|
|||||||
+7
-3
@@ -23,18 +23,16 @@ def request_login(
|
|||||||
headers = {
|
headers = {
|
||||||
"Host": DEFAULT_URL,
|
"Host": DEFAULT_URL,
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
"Accept": "/",
|
|
||||||
"user-agent": DEFAULT_USER_AGENT,
|
"user-agent": DEFAULT_USER_AGENT,
|
||||||
}
|
}
|
||||||
data = dumps(
|
data = dumps(
|
||||||
{
|
{
|
||||||
"email": login_data["username"],
|
"email": login_data["username"],
|
||||||
"password": login_data["password"],
|
"password": login_data["password"],
|
||||||
"notification_key": login_data["notification_key"],
|
|
||||||
"unique_id": login_data["uid"],
|
"unique_id": login_data["uid"],
|
||||||
"device_identifier": login_data["device_id"],
|
"device_identifier": login_data["device_id"],
|
||||||
"client_name": "Computer",
|
"client_name": "Computer",
|
||||||
"reauth": "false",
|
"reauth": True,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -57,6 +55,12 @@ def request_verify(auth, blink, verify_key):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def request_logout(blink):
|
||||||
|
"""Logout of blink servers."""
|
||||||
|
url = f"{blink.urls.base_url}/api/v4/account/{blink.account_id}/client/{blink.client_id}/logout"
|
||||||
|
return http_post(blink, url=url)
|
||||||
|
|
||||||
|
|
||||||
def request_networks(blink):
|
def request_networks(blink):
|
||||||
"""Request all networks information."""
|
"""Request all networks information."""
|
||||||
url = f"{blink.urls.base_url}/networks"
|
url = f"{blink.urls.base_url}/networks"
|
||||||
|
|||||||
+25
-14
@@ -58,7 +58,11 @@ class Auth:
|
|||||||
"""Return authorization header."""
|
"""Return authorization header."""
|
||||||
if self.token is None:
|
if self.token is None:
|
||||||
return None
|
return None
|
||||||
return {"TOKEN_AUTH": self.token, "user-agent": DEFAULT_USER_AGENT}
|
return {
|
||||||
|
"TOKEN_AUTH": self.token,
|
||||||
|
"user-agent": DEFAULT_USER_AGENT,
|
||||||
|
"content-type": "application/json",
|
||||||
|
}
|
||||||
|
|
||||||
def create_session(self, opts=None):
|
def create_session(self, opts=None):
|
||||||
"""Create a session for blink communication."""
|
"""Create a session for blink communication."""
|
||||||
@@ -104,8 +108,12 @@ class Auth:
|
|||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
return response.json()
|
return response.json()
|
||||||
raise LoginError
|
raise LoginError
|
||||||
except AttributeError:
|
except AttributeError as error:
|
||||||
raise LoginError
|
raise LoginError from error
|
||||||
|
|
||||||
|
def logout(self, blink):
|
||||||
|
"""Log out."""
|
||||||
|
return api.request_logout(blink)
|
||||||
|
|
||||||
def refresh_token(self):
|
def refresh_token(self):
|
||||||
"""Refresh auth token."""
|
"""Refresh auth token."""
|
||||||
@@ -115,21 +123,21 @@ class Auth:
|
|||||||
self.login_response = self.login()
|
self.login_response = self.login()
|
||||||
self.extract_login_info()
|
self.extract_login_info()
|
||||||
self.is_errored = False
|
self.is_errored = False
|
||||||
except LoginError:
|
except LoginError as error:
|
||||||
_LOGGER.error("Login endpoint failed. Try again later.")
|
_LOGGER.error("Login endpoint failed. Try again later.")
|
||||||
raise TokenRefreshFailed
|
raise TokenRefreshFailed from error
|
||||||
except (TypeError, KeyError):
|
except (TypeError, KeyError) as error:
|
||||||
_LOGGER.error("Malformed login response: %s", self.login_response)
|
_LOGGER.error("Malformed login response: %s", self.login_response)
|
||||||
raise TokenRefreshFailed
|
raise TokenRefreshFailed from error
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def extract_login_info(self):
|
def extract_login_info(self):
|
||||||
"""Extract login info from login response."""
|
"""Extract login info from login response."""
|
||||||
self.region_id = self.login_response["region"]["tier"]
|
self.region_id = self.login_response["account"]["tier"]
|
||||||
self.host = f"{self.region_id}.{BLINK_URL}"
|
self.host = f"{self.region_id}.{BLINK_URL}"
|
||||||
self.token = self.login_response["authtoken"]["authtoken"]
|
self.token = self.login_response["auth"]["token"]
|
||||||
self.client_id = self.login_response["client"]["id"]
|
self.client_id = self.login_response["account"]["client_id"]
|
||||||
self.account_id = self.login_response["account"]["id"]
|
self.account_id = self.login_response["account"]["account_id"]
|
||||||
|
|
||||||
def startup(self):
|
def startup(self):
|
||||||
"""Initialize tokens for communication."""
|
"""Initialize tokens for communication."""
|
||||||
@@ -151,8 +159,8 @@ class Auth:
|
|||||||
json_data = response.json()
|
json_data = response.json()
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
except (AttributeError, ValueError):
|
except (AttributeError, ValueError) as error:
|
||||||
raise BlinkBadResponse
|
raise BlinkBadResponse from error
|
||||||
|
|
||||||
self.is_errored = False
|
self.is_errored = False
|
||||||
return json_data
|
return json_data
|
||||||
@@ -227,6 +235,9 @@ class Auth:
|
|||||||
try:
|
try:
|
||||||
json_resp = response.json()
|
json_resp = response.json()
|
||||||
blink.available = json_resp["valid"]
|
blink.available = json_resp["valid"]
|
||||||
|
if not json_resp["valid"]:
|
||||||
|
_LOGGER.error("%s", json_resp["message"])
|
||||||
|
return False
|
||||||
except (KeyError, TypeError):
|
except (KeyError, TypeError):
|
||||||
_LOGGER.error("Did not receive valid response from server.")
|
_LOGGER.error("Did not receive valid response from server.")
|
||||||
return False
|
return False
|
||||||
@@ -235,7 +246,7 @@ class Auth:
|
|||||||
def check_key_required(self):
|
def check_key_required(self):
|
||||||
"""Check if 2FA key is required."""
|
"""Check if 2FA key is required."""
|
||||||
try:
|
try:
|
||||||
if self.login_response["client"]["verification_required"]:
|
if self.login_response["account"]["client_verification_required"]:
|
||||||
return True
|
return True
|
||||||
except (KeyError, TypeError):
|
except (KeyError, TypeError):
|
||||||
pass
|
pass
|
||||||
|
|||||||
+8
-3
@@ -264,7 +264,9 @@ class Blink:
|
|||||||
"""Save login data to file."""
|
"""Save login data to file."""
|
||||||
util.json_save(self.auth.login_attributes, file_name)
|
util.json_save(self.auth.login_attributes, file_name)
|
||||||
|
|
||||||
def download_videos(self, path, since=None, camera="all", stop=10, debug=False):
|
def download_videos(
|
||||||
|
self, path, since=None, camera="all", stop=10, delay=1, debug=False
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Download all videos from server since specified time.
|
Download all videos from server since specified time.
|
||||||
|
|
||||||
@@ -275,6 +277,7 @@ class Blink:
|
|||||||
:param camera: Camera name to retrieve. Defaults to "all".
|
:param camera: Camera name to retrieve. Defaults to "all".
|
||||||
Use a list for multiple cameras.
|
Use a list for multiple cameras.
|
||||||
:param stop: Page to stop on (~25 items per page. Default page 10).
|
:param stop: Page to stop on (~25 items per page. Default page 10).
|
||||||
|
:param delay: Number of seconds to wait in between subsequent video downloads.
|
||||||
:param debug: Set to TRUE to prevent downloading of items.
|
:param debug: Set to TRUE to prevent downloading of items.
|
||||||
Instead of downloading, entries will be printed to log.
|
Instead of downloading, entries will be printed to log.
|
||||||
"""
|
"""
|
||||||
@@ -301,9 +304,9 @@ class Blink:
|
|||||||
_LOGGER.info("No videos found on page %s. Exiting.", page)
|
_LOGGER.info("No videos found on page %s. Exiting.", page)
|
||||||
break
|
break
|
||||||
|
|
||||||
self._parse_downloaded_items(result, camera, path, debug)
|
self._parse_downloaded_items(result, camera, path, delay, debug)
|
||||||
|
|
||||||
def _parse_downloaded_items(self, result, camera, path, debug):
|
def _parse_downloaded_items(self, result, camera, path, delay, debug):
|
||||||
"""Parse downloaded videos."""
|
"""Parse downloaded videos."""
|
||||||
for item in result:
|
for item in result:
|
||||||
try:
|
try:
|
||||||
@@ -351,6 +354,8 @@ class Blink:
|
|||||||
"Address: {address}, Filename: {filename}"
|
"Address: {address}, Filename: {filename}"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
if delay > 0:
|
||||||
|
time.sleep(delay)
|
||||||
|
|
||||||
|
|
||||||
class BlinkSetupError(Exception):
|
class BlinkSetupError(Exception):
|
||||||
|
|||||||
@@ -98,6 +98,10 @@ class BlinkCamera:
|
|||||||
self.sync.blink, self.network_id, self.camera_id
|
self.sync.blink, self.network_id, self.camera_id
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def record(self):
|
||||||
|
"""Initiate clip recording."""
|
||||||
|
return api.request_new_video(self.sync.blink, self.network_id, self.camera_id)
|
||||||
|
|
||||||
def get_media(self, media_type="image"):
|
def get_media(self, media_type="image"):
|
||||||
"""Download media (image or video)."""
|
"""Download media (image or video)."""
|
||||||
url = self.thumbnail
|
url = self.thumbnail
|
||||||
|
|||||||
@@ -3,8 +3,8 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
MAJOR_VERSION = 0
|
MAJOR_VERSION = 0
|
||||||
MINOR_VERSION = 17
|
MINOR_VERSION = 18
|
||||||
PATCH_VERSION = "0.dev1"
|
PATCH_VERSION = "0.dev0"
|
||||||
|
|
||||||
__version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}"
|
__version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}"
|
||||||
|
|
||||||
@@ -34,6 +34,7 @@ PROJECT_CLASSIFIERS = [
|
|||||||
"Programming Language :: Python :: 3.6",
|
"Programming Language :: Python :: 3.6",
|
||||||
"Programming Language :: Python :: 3.7",
|
"Programming Language :: Python :: 3.7",
|
||||||
"Programming Language :: Python :: 3.8",
|
"Programming Language :: Python :: 3.8",
|
||||||
|
"Programming Language :: Python :: 3.9",
|
||||||
"Topic :: Home Automation",
|
"Topic :: Home Automation",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -48,7 +49,7 @@ URLS
|
|||||||
BLINK_URL = "immedia-semi.com"
|
BLINK_URL = "immedia-semi.com"
|
||||||
DEFAULT_URL = f"rest-prod.{BLINK_URL}"
|
DEFAULT_URL = f"rest-prod.{BLINK_URL}"
|
||||||
BASE_URL = f"https://{DEFAULT_URL}"
|
BASE_URL = f"https://{DEFAULT_URL}"
|
||||||
LOGIN_ENDPOINT = f"{BASE_URL}/api/v4/account/login"
|
LOGIN_ENDPOINT = f"{BASE_URL}/api/v5/account/login"
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Dictionaries
|
Dictionaries
|
||||||
|
|||||||
@@ -33,10 +33,13 @@ def json_save(data, file_name):
|
|||||||
json.dump(data, json_file, indent=4)
|
json.dump(data, json_file, indent=4)
|
||||||
|
|
||||||
|
|
||||||
def gen_uid(size):
|
def gen_uid(size, uid_format=False):
|
||||||
"""Create a random sring."""
|
"""Create a random sring."""
|
||||||
full_token = secrets.token_hex(size)
|
if uid_format:
|
||||||
return full_token[0:size]
|
token = f"BlinkCamera_{secrets.token_hex(4)}-{secrets.token_hex(2)}-{secrets.token_hex(2)}-{secrets.token_hex(2)}-{secrets.token_hex(6)}"
|
||||||
|
else:
|
||||||
|
token = secrets.token_hex(size)
|
||||||
|
return token
|
||||||
|
|
||||||
|
|
||||||
def time_to_seconds(timestamp):
|
def time_to_seconds(timestamp):
|
||||||
@@ -79,10 +82,7 @@ def prompt_login_data(data):
|
|||||||
|
|
||||||
def validate_login_data(data):
|
def validate_login_data(data):
|
||||||
"""Check for missing keys."""
|
"""Check for missing keys."""
|
||||||
data["uid"] = data.get("uid", gen_uid(const.SIZE_UID))
|
data["uid"] = data.get("uid", gen_uid(const.SIZE_UID, uid_format=True))
|
||||||
data["notification_key"] = data.get(
|
|
||||||
"notification_key", gen_uid(const.SIZE_NOTIFICATION_KEY)
|
|
||||||
)
|
|
||||||
data["device_id"] = data.get("device_id", const.DEVICE_ID)
|
data["device_id"] = data.get("device_id", const.DEVICE_ID)
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
"""Login testing script."""
|
||||||
|
import sys
|
||||||
|
import os
|
||||||
|
from blinkpy.blinkpy import Blink
|
||||||
|
from blinkpy.auth import Auth
|
||||||
|
from blinkpy.helpers.util import json_load, json_save
|
||||||
|
|
||||||
|
save_session = False
|
||||||
|
print("")
|
||||||
|
print("Blink Login Debug Script ...")
|
||||||
|
print(" ... Loading previous session information.")
|
||||||
|
cwd = os.getcwd()
|
||||||
|
print(f" ... Looking in {cwd}.")
|
||||||
|
session_path = os.path.join(cwd, ".session_debug")
|
||||||
|
session = json_load(session_path)
|
||||||
|
|
||||||
|
try:
|
||||||
|
auth_file = session["file"]
|
||||||
|
except (TypeError, KeyError):
|
||||||
|
print(" ... Please input location of auth file")
|
||||||
|
auth_file = input(" Must contain username and password: ")
|
||||||
|
save_session = True
|
||||||
|
|
||||||
|
data = json_load(auth_file)
|
||||||
|
if data is None:
|
||||||
|
print(f" ... Please fix file contents of {auth_file}.")
|
||||||
|
print(" ... Exiting.")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
try:
|
||||||
|
username = data["username"]
|
||||||
|
password = data["password"]
|
||||||
|
except KeyError:
|
||||||
|
print(f" ... File contents of {auth_file} incorrect.")
|
||||||
|
print(" ... Require username and password at minimum.")
|
||||||
|
print(" ... Exiting.")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
if save_session:
|
||||||
|
print(f" ... Saving session file to {session_path}.")
|
||||||
|
json_save({"file": auth_file}, session_path)
|
||||||
|
|
||||||
|
blink = Blink()
|
||||||
|
auth = Auth(data)
|
||||||
|
blink.auth = auth
|
||||||
|
|
||||||
|
print(" ... Starting Blink.")
|
||||||
|
print("")
|
||||||
|
blink.start()
|
||||||
|
print("")
|
||||||
|
print(" ... Printing login response.")
|
||||||
|
print("")
|
||||||
|
print(blink.auth.login_response)
|
||||||
|
print("")
|
||||||
|
print(" ... Printing login attributes.")
|
||||||
|
print("")
|
||||||
|
print(blink.auth.login_attributes)
|
||||||
|
print("")
|
||||||
|
input(" ... Press any key to continue: ")
|
||||||
|
print(" ... Deactivating auth token.")
|
||||||
|
blink.auth.token = "foobar"
|
||||||
|
print(f"\t - blink.auth.token = {blink.auth.token}")
|
||||||
|
|
||||||
|
print(" ... Attempting login.")
|
||||||
|
print("")
|
||||||
|
blink.start()
|
||||||
|
print("")
|
||||||
|
print(" ... Printing login response.")
|
||||||
|
print("")
|
||||||
|
print(blink.auth.login_response)
|
||||||
|
print("")
|
||||||
|
print(" ... Printing login attributes.")
|
||||||
|
print("")
|
||||||
|
print(blink.auth.login_attributes)
|
||||||
|
print("")
|
||||||
|
rint(" ... Done.")
|
||||||
|
print("")
|
||||||
+10
-10
@@ -1,14 +1,14 @@
|
|||||||
black==19.10b0
|
black==19.10b0
|
||||||
coverage==5.3
|
coverage==5.5
|
||||||
flake8==3.8.4
|
flake8==3.9.1
|
||||||
flake8-docstrings==1.5.0
|
flake8-docstrings==1.6.0
|
||||||
pre-commit==2.7.1
|
pre-commit==2.12.1
|
||||||
pylint==2.6.0
|
pylint==2.9.3
|
||||||
pydocstyle==5.1.1
|
pydocstyle==6.0.0
|
||||||
pytest==6.1.1
|
pytest==6.2.4
|
||||||
pytest-cov==2.10.1
|
pytest-cov==2.11.1
|
||||||
pytest-sugar==0.9.4
|
pytest-sugar==0.9.4
|
||||||
pytest-timeout==1.4.2
|
pytest-timeout==1.4.2
|
||||||
restructuredtext-lint==1.3.1
|
restructuredtext-lint==1.3.2
|
||||||
pygments==2.7.1
|
pygments==2.9.0
|
||||||
testtools>=2.4.0
|
testtools>=2.4.0
|
||||||
|
|||||||
+16
-9
@@ -42,7 +42,6 @@ class TestAuth(unittest.TestCase):
|
|||||||
"username": "foo",
|
"username": "foo",
|
||||||
"password": "bar",
|
"password": "bar",
|
||||||
"uid": 1234,
|
"uid": 1234,
|
||||||
"notification_key": 1234,
|
|
||||||
"device_id": const.DEVICE_ID,
|
"device_id": const.DEVICE_ID,
|
||||||
}
|
}
|
||||||
self.assertDictEqual(auth.data, expected_data)
|
self.assertDictEqual(auth.data, expected_data)
|
||||||
@@ -62,7 +61,6 @@ class TestAuth(unittest.TestCase):
|
|||||||
"username": "foo",
|
"username": "foo",
|
||||||
"password": "bar",
|
"password": "bar",
|
||||||
"uid": 1234,
|
"uid": 1234,
|
||||||
"notification_key": 1234,
|
|
||||||
"device_id": const.DEVICE_ID,
|
"device_id": const.DEVICE_ID,
|
||||||
}
|
}
|
||||||
self.assertDictEqual(auth.data, expected_data)
|
self.assertDictEqual(auth.data, expected_data)
|
||||||
@@ -128,7 +126,11 @@ class TestAuth(unittest.TestCase):
|
|||||||
def test_header(self):
|
def test_header(self):
|
||||||
"""Test header data."""
|
"""Test header data."""
|
||||||
self.auth.token = "bar"
|
self.auth.token = "bar"
|
||||||
expected_header = {"TOKEN_AUTH": "bar", "user-agent": const.DEFAULT_USER_AGENT}
|
expected_header = {
|
||||||
|
"TOKEN_AUTH": "bar",
|
||||||
|
"user-agent": const.DEFAULT_USER_AGENT,
|
||||||
|
"content-type": "application/json",
|
||||||
|
}
|
||||||
self.assertDictEqual(self.auth.header, expected_header)
|
self.assertDictEqual(self.auth.header, expected_header)
|
||||||
|
|
||||||
def test_header_no_token(self):
|
def test_header_no_token(self):
|
||||||
@@ -161,10 +163,8 @@ class TestAuth(unittest.TestCase):
|
|||||||
def test_refresh_token(self, mock_login):
|
def test_refresh_token(self, mock_login):
|
||||||
"""Test refresh token method."""
|
"""Test refresh token method."""
|
||||||
mock_login.return_value = {
|
mock_login.return_value = {
|
||||||
"region": {"tier": "test"},
|
"account": {"account_id": 5678, "client_id": 1234, "tier": "test"},
|
||||||
"authtoken": {"authtoken": "foobar"},
|
"auth": {"token": "foobar"},
|
||||||
"client": {"id": 1234},
|
|
||||||
"account": {"id": 5678},
|
|
||||||
}
|
}
|
||||||
self.assertTrue(self.auth.refresh_token())
|
self.assertTrue(self.auth.refresh_token())
|
||||||
self.assertEqual(self.auth.region_id, "test")
|
self.assertEqual(self.auth.region_id, "test")
|
||||||
@@ -186,12 +186,19 @@ class TestAuth(unittest.TestCase):
|
|||||||
self.auth.login_response = {}
|
self.auth.login_response = {}
|
||||||
self.assertFalse(self.auth.check_key_required())
|
self.assertFalse(self.auth.check_key_required())
|
||||||
|
|
||||||
self.auth.login_response = {"client": {"verification_required": False}}
|
self.auth.login_response = {"account": {"client_verification_required": False}}
|
||||||
self.assertFalse(self.auth.check_key_required())
|
self.assertFalse(self.auth.check_key_required())
|
||||||
|
|
||||||
self.auth.login_response = {"client": {"verification_required": True}}
|
self.auth.login_response = {"account": {"client_verification_required": True}}
|
||||||
self.assertTrue(self.auth.check_key_required())
|
self.assertTrue(self.auth.check_key_required())
|
||||||
|
|
||||||
|
@mock.patch("blinkpy.auth.api.request_logout")
|
||||||
|
def test_logout(self, mock_req):
|
||||||
|
"""Test logout method."""
|
||||||
|
mock_blink = MockBlink(None)
|
||||||
|
mock_req.return_value = True
|
||||||
|
self.assertTrue(self.auth.logout(mock_blink))
|
||||||
|
|
||||||
@mock.patch("blinkpy.auth.api.request_verify")
|
@mock.patch("blinkpy.auth.api.request_verify")
|
||||||
def test_send_auth_key(self, mock_req):
|
def test_send_auth_key(self, mock_req):
|
||||||
"""Check sending of auth key."""
|
"""Check sending of auth key."""
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
import unittest
|
import unittest
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
import logging
|
import logging
|
||||||
|
import time
|
||||||
|
|
||||||
from blinkpy import blinkpy
|
from blinkpy import blinkpy
|
||||||
from blinkpy.sync_module import BlinkSyncModule
|
from blinkpy.sync_module import BlinkSyncModule
|
||||||
@@ -88,9 +89,33 @@ class TestBlinkFunctions(unittest.TestCase):
|
|||||||
"DEBUG:blinkpy.blinkpy:foo: /bar.mp4 is marked as deleted.",
|
"DEBUG:blinkpy.blinkpy:foo: /bar.mp4 is marked as deleted.",
|
||||||
]
|
]
|
||||||
with self.assertLogs() as dl_log:
|
with self.assertLogs() as dl_log:
|
||||||
blink.download_videos("/tmp", stop=2)
|
blink.download_videos("/tmp", stop=2, delay=0)
|
||||||
self.assertEqual(dl_log.output, expected_log)
|
self.assertEqual(dl_log.output, expected_log)
|
||||||
|
|
||||||
|
@mock.patch("blinkpy.blinkpy.api.request_videos")
|
||||||
|
def test_parse_downloaded_throttle(self, mock_req):
|
||||||
|
"""Test ability to parse downloaded items list."""
|
||||||
|
generic_entry = {
|
||||||
|
"created_at": "1970",
|
||||||
|
"device_name": "foo",
|
||||||
|
"deleted": False,
|
||||||
|
"media": "/bar.mp4",
|
||||||
|
}
|
||||||
|
result = [generic_entry]
|
||||||
|
mock_req.return_value = {"media": result}
|
||||||
|
self.blink.last_refresh = 0
|
||||||
|
start = time.time()
|
||||||
|
self.blink.download_videos("/tmp", stop=2, delay=0, debug=True)
|
||||||
|
now = time.time()
|
||||||
|
delta = now - start
|
||||||
|
self.assertTrue(delta < 0.1)
|
||||||
|
|
||||||
|
start = time.time()
|
||||||
|
self.blink.download_videos("/tmp", stop=2, delay=0.1, debug=True)
|
||||||
|
now = time.time()
|
||||||
|
delta = now - start
|
||||||
|
self.assertTrue(delta >= 0.1)
|
||||||
|
|
||||||
@mock.patch("blinkpy.blinkpy.api.request_videos")
|
@mock.patch("blinkpy.blinkpy.api.request_videos")
|
||||||
def test_parse_camera_not_in_list(self, mock_req):
|
def test_parse_camera_not_in_list(self, mock_req):
|
||||||
"""Test ability to parse downloaded items list."""
|
"""Test ability to parse downloaded items list."""
|
||||||
@@ -113,7 +138,7 @@ class TestBlinkFunctions(unittest.TestCase):
|
|||||||
"DEBUG:blinkpy.blinkpy:Skipping videos for foo.",
|
"DEBUG:blinkpy.blinkpy:Skipping videos for foo.",
|
||||||
]
|
]
|
||||||
with self.assertLogs() as dl_log:
|
with self.assertLogs() as dl_log:
|
||||||
blink.download_videos("/tmp", camera="bar", stop=2)
|
blink.download_videos("/tmp", camera="bar", stop=2, delay=0)
|
||||||
self.assertEqual(dl_log.output, expected_log)
|
self.assertEqual(dl_log.output, expected_log)
|
||||||
|
|
||||||
@mock.patch("blinkpy.blinkpy.api.request_network_update")
|
@mock.patch("blinkpy.blinkpy.api.request_network_update")
|
||||||
|
|||||||
+17
-1
@@ -3,7 +3,7 @@
|
|||||||
import unittest
|
import unittest
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
import time
|
import time
|
||||||
from blinkpy.helpers.util import json_load, Throttle, time_to_seconds
|
from blinkpy.helpers.util import json_load, Throttle, time_to_seconds, gen_uid
|
||||||
|
|
||||||
|
|
||||||
class TestUtil(unittest.TestCase):
|
class TestUtil(unittest.TestCase):
|
||||||
@@ -132,3 +132,19 @@ class TestUtil(unittest.TestCase):
|
|||||||
self.assertEqual(json_load("fake.file"), None)
|
self.assertEqual(json_load("fake.file"), None)
|
||||||
with mock.patch("builtins.open", mock.mock_open(read_data="")):
|
with mock.patch("builtins.open", mock.mock_open(read_data="")):
|
||||||
self.assertEqual(json_load("fake.file"), None)
|
self.assertEqual(json_load("fake.file"), None)
|
||||||
|
|
||||||
|
def test_gen_uid(self):
|
||||||
|
"""Test gen_uid formatting."""
|
||||||
|
val1 = gen_uid(8)
|
||||||
|
val2 = gen_uid(8, uid_format=True)
|
||||||
|
|
||||||
|
self.assertEqual(len(val1), 16)
|
||||||
|
|
||||||
|
self.assertTrue(val2.startswith("BlinkCamera_"))
|
||||||
|
val2_cut = val2.split("_")
|
||||||
|
val2_split = val2_cut[1].split("-")
|
||||||
|
self.assertEqual(len(val2_split[0]), 8)
|
||||||
|
self.assertEqual(len(val2_split[1]), 4)
|
||||||
|
self.assertEqual(len(val2_split[2]), 4)
|
||||||
|
self.assertEqual(len(val2_split[3]), 4)
|
||||||
|
self.assertEqual(len(val2_split[4]), 12)
|
||||||
|
|||||||
Reference in New Issue
Block a user