Merge pull request #136 from fronzbot/dev

0.11.1
Version bump
2019-01-02 09:19:08 -08:00 · 2019-01-02 11:59:27 -05:00 · 2019-01-02 08:53:08 -08:00 · 2019-01-02 08:52:56 -08:00 · 2019-01-02 11:45:48 -05:00 · 2019-01-02 11:35:40 -05:00
26 changed files with 1023 additions and 785 deletions
@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. 
+2. 
+3. 
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Home Assistant version (if applicable):** <HA Version Number>
+
+**`blinkpy` version (not needed if filling out Home Assistant version):**
+
+**Log Output/Additional Information**
+If using home-assistant, please paste the output of the log showing your error below.  If not, please include any additional useful information.
+
+```
+PASTE LOG OUTPUT HERE
+```
@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context about the feature request (such as API endpoint responses, etc).
@@ -5,5 +5,5 @@

 ## Checklist:
 - [ ] Local tests with `tox` run successfully **PR cannot be meged unless tests pass**
- [ ] If user-facing functionality changed, README.rst updated
- [ ] Tests added to verify new code works
+- [ ] Changes tested locally to ensure platform still works as intended
+- [ ] Tests added to verify new code works
@@ -10,3 +10,4 @@ dist/*
 .sh
 build/*
 docs/_build
+*.log
@@ -4,7 +4,7 @@ matrix:
  include:
    - python: "3.6"
      env: TOXENV=lint
-    - python: "3.5"
+    - python: "3.5.3"
      env: TOXENV=py35
    - python: "3.6"
      env: TOXENV=py36
@@ -13,6 +13,9 @@ matrix:
    - python: "3.7"
      env: TOXENV=py37
      dist: xenial
+    - python: "3.8-dev"
+      env: TOXENV=py38
+      dist: xenial

 install: pip install -U tox coveralls
 language: python
@@ -1,5 +1,5 @@
 # BlinkMonitorProtocol
-Unofficial documentation for the Client API of the Blink Wire-Free HD Home Monitoring and Alert System.
+Unofficial documentation for the Client API of the Blink Wire-Free HD Home Monitoring &amp; Alert System.

 Copied from https://github.com/MattTW/BlinkMonitorProtocol

@@ -7,9 +7,6 @@ I am not affiliated with the company in any way - this documentation is strictly

 The Client API is a straightforward REST API using JSON and HTTPS.

-## This Document
-The purpose here is to describe what is going on behind the scenes, and what commands we know are available to communicate with Blink servers.  This is NOT a description of the blinkpy module, but a description of the commands blinkpy relies on to effectively communicate.
-
 ## Login

 Client login to the Blink Servers.
@@ -19,20 +16,25 @@ Client login to the Blink Servers.
 >  "password" : "*your blink password*",
 >  "client_specifier" : "iPhone 9.2 | 2.2 | 222",
 >  "email" : "*your blink login/email*"
->}' --compressed https://prod.immedia-semi.com/login
+>}' --compressed https://rest.prod.immedia-semi.com/login

 **Response:**
->{"authtoken":{"authtoken":"*an auth token*","message":"auth"}}
+>{"authtoken":{"authtoken":"*an auth token*","message":"auth"},"networks":{"*network id*":{"name":"*name*","onboarded":true}},"region":{"*regioncode for endpoint*":"*region name"}}

 **Notes:**
 The authtoken value is passed in a header in future calls.
+The region code for endpoint is required to form the URL of the REST endpoint for future calls.
+Depending on the region you are registered you will need to change the REST endpoints below:
+- from `https://rest.prod.immedia-semi.com`
+- to `https://rest.prde.immedia-semi.com` if e.g. your device is registered in Germany
+Please note that at this moment it seems that all regions are not implemented equally: not all endpoints are available in all regions

-##Networks
+## Networks

 Obtain information about the Blink networks defined for the logged in user.

 **Request:**
->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/networks
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/networks

 **Response:**
 JSON response containing information including Network ID and Account ID.
@@ -46,7 +48,7 @@ Network ID is needed to issue arm/disarm calls
 Obtain information about the Blink Sync Modules on the given network.

 **Request:**
->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/network/*network_id_from_networks_call*/syncmodules
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/network/*network_id_from_networks_call*/syncmodules

 **Response:**
 JSON response containing information about the known state of the Sync module, most notably if it is online
@@ -56,11 +58,11 @@ Probably not strictly needed but checking result can verify that the sync module


 ## Arm
-
+ 
 Arm the given network (start recording/reporting motion events)

 **Request:**
->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://prod.immedia-semi.com/network/*network_id_from_networks_call*/arm
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://rest.prod.immedia-semi.com/network/*network_id_from_networks_call*/arm

 **Response:**
 JSON response containing information about the arm command request, including the command/request ID
@@ -73,7 +75,7 @@ When this call returns, it does not mean the arm request is complete,  the clien
 Disarm the given network (stop recording/reporting motion events)

 **Request:**
->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://prod.immedia-semi.com/network/*network_id_from_networks_call*/disarm
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://rest.prod.immedia-semi.com/network/*network_id_from_networks_call*/disarm

 **Response:**
 JSON response containing information about the disarm command request, including the command/request ID
@@ -87,7 +89,7 @@ When this call returns, it does not mean the disarm request is complete,  the cl
 Get status info on the given command

 **Request:**
->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/network/*network_id*/command/*command_id*
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/network/*network_id*/command/*command_id*

 **Response:**
 JSON response containing state information of the given command, most notably whether it has completed and was successful.
@@ -103,7 +105,7 @@ lv_relay, arm, disarm, thumbnail, clip
 Return information displayed on the home screen of the mobile client

 **Request:**
->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/homescreen
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/homescreen

 **Response:**
 JSON response containing information that the mobile client displays on the home page, including:  status, armed state, links to thumbnails for each camera, etc.
@@ -111,12 +113,12 @@ JSON response containing information that the mobile client displays on the home
 **Notes:**
 Not necessary to as part of issuing arm/disarm commands, but contains good summary info.

-##Events, thumbnails & video captures
+## Events, thumbnails & video captures

 **Request**
 Get events for a given network (sync module) -- Need network ID from home 

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/events/network/*network__id*
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/events/network/*network__id*

 **Response**
 A json list of evets incluing URL's.   Replace the "mp4" with "jpg" extension to get the thumbnail of each clip
@@ -144,7 +146,7 @@ Note that you replace the 'mp4' with a 'jpg' to get the thumbnail
 **Request**
 Captures a new thumbnail for a camera

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://prod.immedia-semi.com/network/*network_id*/camera/*camera_id*/thumbnail
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://rest.prod.immedia-semi.com/network/*network_id*/camera/*camera_id*/thumbnail

 **Response**
 Command information. 
@@ -152,17 +154,17 @@ Command information.
 **Request**
 Captures a new video for a camera

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://prod.immedia-semi.com/network/*network_id*/camera/*camera_id*/clip
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://rest.prod.immedia-semi.com/network/*network_id*/camera/*camera_id*/clip

 **Response**
 Command information.

-##Video Information
+## Video Information

 **Request**
 Get the total number of videos in the system

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/api/v2/videos/count
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/api/v2/videos/count

 **Response**
 JSON response containing the total video count.
@@ -170,7 +172,7 @@ JSON response containing the total video count.
 **Request**
 Gets a paginated set of video information

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/api/v2/videos/page/0
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/api/v2/videos/page/0

 **Response**
 JSON response containing a set of video information, including: camera name, creation time, thumbnail URI, size, length
@@ -178,7 +180,7 @@ JSON response containing a set of video information, including: camera name, cre
 **Request**
 Gets information for a specific video by ID

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/api/v2/video/*video_id*
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/api/v2/video/*video_id*

 **Response**
 JSON response containing video information
@@ -186,7 +188,7 @@ JSON response containing video information
 **Request**
 Gets a list of unwatched videos

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/api/v2/videos/unwatched
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/api/v2/videos/unwatched

 **Response**
 JSON response containing unwatched video information
@@ -194,7 +196,7 @@ JSON response containing unwatched video information
 **Request**
 Deletes a video

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://prod.immedia-semi.com/api/v2/video/*video_id*/delete
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://rest.prod.immedia-semi.com/api/v2/video/*video_id*/delete

 **Response**
 Unknown - not tested
@@ -202,7 +204,7 @@ Unknown - not tested
 **Request**
 Deletes all videos

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://prod.immedia-semi.com/api/v2/videos/deleteall
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --data-binary --compressed https://rest.prod.immedia-semi.com/api/v2/videos/deleteall

 **Response**
 Unknown - not tested
@@ -212,7 +214,7 @@ Unknown - not tested
 **Request**
 Gets a list of cameras

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/network/*network_id*/cameras
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/network/*network_id*/cameras

 **Response**
 JSON response containing camera information
@@ -220,7 +222,7 @@ JSON response containing camera information
 **Request**
 Gets information for one camera

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/network/*network_id*/camera/*camera_id*
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/network/*network_id*/camera/*camera_id*

 **Response**
 JSON response containing camera information
@@ -228,7 +230,7 @@ JSON response containing camera information
 **Request**
 Gets camera sensor information

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/network/*network_id*/camera/*camera_id*/signals
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/network/*network_id*/camera/*camera_id*/signals

 **Response**
 JSON response containing camera sensor information, such as wifi strength, temperature, and battery level
@@ -236,7 +238,7 @@ JSON response containing camera sensor information, such as wifi strength, tempe
 **Request**
 Enables motion detection for one camera

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: $auth_token" --data-binary --compressed https://prod.immedia-semi.com/network/*network_id*/camera/*camera_id*/enable
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: $auth_token" --data-binary --compressed https://rest.prod.immedia-semi.com/network/*network_id*/camera/*camera_id*/enable

 **Response**
 JSON response containing camera information
@@ -244,7 +246,7 @@ JSON response containing camera information
 **Request**
 Disables motion detection for one camera

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: $auth_token" --data-binary --compressed https://prod.immedia-semi.com/network/*network_id*/camera/*camera_id*/disable
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: $auth_token" --data-binary --compressed https://rest.prod.immedia-semi.com/network/*network_id*/camera/*camera_id*/disable

 **Response**
 JSON response containing camera information
@@ -257,7 +259,7 @@ JSON response containing camera information
 **Request**
 Gets information about devices that have connected to the blink service

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/account/clients
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/account/clients

 **Response**
 JSON response containing client information, including: type, name, connection time, user ID
@@ -265,7 +267,7 @@ JSON response containing client information, including: type, name, connection t
 **Request**
 Gets information about supported regions

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/regions
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/regions

 **Response**
 JSON response containing region information
@@ -273,7 +275,7 @@ JSON response containing region information
 **Request**
 Gets information about system health

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/health
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/health

 **Response**
 "all ports tested are open"
@@ -281,7 +283,7 @@ Gets information about system health
 **Request**
 Gets information about programs

->curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://prod.immedia-semi.com/api/v1/networks/*network_id*/programs
+>curl -H "Host: prod.immedia-semi.com" -H "TOKEN_AUTH: *authtoken from login*" --compressed https://rest.prod.immedia-semi.com/api/v1/networks/*network_id*/programs

 **Response**
 Unknown.
@@ -3,31 +3,96 @@ Changelog

 A list of changes between each release

-0.9.0.dev (Development Version)
+0.11.1 (2019-01-02)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Fixed incorrect backup login url
+- Added calibrated temperature property for cameras
+
+
+0.11.0 (2018-11-23)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Added support for multiple sync modules
+
+0.10.3 (2018-11-18)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Use networks endpoint rather than homecreen to retrieve arm/disarm status (`@md-reddevil <https://github.com/fronzbot/blinkpy/pull/119>`__)
+- Fix incorrect command status endpoint (`@md-reddevil <https://github.com/fronzbot/blinkpy/pull/118>`__)
+- Add extra debug logging
+- Remove error prior to re-authorization (only log error when re-auth failed)
+
+
+0.10.2 (2018-10-30)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Set minimum required version of the requests library to 2.20.0 due to vulnerability in earlier releases.
+- When multiple networks detected, changed log level to 'warning' from 'error' 
+
+
+0.10.1 (2018-10-18)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Fix re-authorization bug (fixes `#101 <https://github.com/fronzbot/blinkpy/issues/#101>`__)
+- Log an error if saving video that doesn't exist
+
+0.10.0 (2018-10-16)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Moved all API calls to own module for easier maintainability
+- Added network ids to sync module and cameras to allow for multi-network use
+- Removed dependency on video existance prior to camera setup (fixes `#93 <https://github.com/fronzbot/blinkpy/issues/#93>`__)
+- Camera wifi_strength now reported in wifi "bars" rather than dBm due to API endpoint change
+- Use homescreen thumbnail as fallback in case it's not in the camera endpoint
+- Removed "armed" and "status" attributes from camera (status of camera only reported by "motion_enabled" now)
+- Added serial number attributes to sync module and cameras
+- Check network_id from login response and verify that network is onboarded (fixes `#90 <https://github.com/fronzbot/#90>`__)
+- Check if retrieved clip is "None" prior to storing in cache
+
+0.9.0 (2018-09-27)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Complete code refactoring to enable future multi-sync module support
+- Add image and video caching to the cameras
+- Add internal throttling of system refresh
+- Use session for http requests
+
+**Breaking change:**
+- Cameras now accessed through sync module Blink.sync.cameras
+
+
+0.8.1 (2018-09-24)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Update requirements_test.txt
+- Update linter versions
+- Fix pylint warnings
+  - Remove object from class declarations
+  - Remove useless returns from functions
+- Fix pylint errors
+  - change if comparison to fix (consider-using-in)
+  - Disabled no else-if-return check
+- Fix useless-import-alias
+- Disable no-else-return
+- Fix motion detection
+  - Use an array of recent video clips to determine if motion has been detected.
+  - Reset the value every system refresh

 0.8.0 (2018-05-21)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- Added support for battery voltage level (fixes `#64 <https://github.com/fronzbot/blinkpy/issues/64>`_)
+- Added support for battery voltage level (fixes `#64 <https://github.com/fronzbot/blinkpy/issues/64>`__)
 - Added motion detection per camera
 - Added fully accessible camera configuration dict
- Added celcius property to camera (fixes `#60 <https://github.com/fronzbot/blinkpy/issues/60>`_)
+- Added celcius property to camera (fixes `#60 <https://github.com/fronzbot/blinkpy/issues/60>`__)

 0.7.1 (2018-05-09)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- Fixed pip 10 import issue during setup (`@fronzbot <https://github.com/fronzbot/blinkpy/pull/61>`_)
+- Fixed pip 10 import issue during setup (`@fronzbot <https://github.com/fronzbot/blinkpy/pull/61>`__)

 0.7.0 (2018-02-08)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 - Fixed style errors for bumped pydocstring and pylint versions
- Changed Blink.cameras dictionary to be case-insensitive (fixes `#35 <https://github.com/fronzbot/blinkpy/issues/35>`_)
- Changed api endpoint for video extraction (fixes `#35 <https://github.com/fronzbot/blinkpy/issues/35>`_ and `#41 <https://github.com/fronzbot/blinkpy/issues/41>`_)
+- Changed Blink.cameras dictionary to be case-insensitive (fixes `#35 <https://github.com/fronzbot/blinkpy/issues/35>`__)
+- Changed api endpoint for video extraction (fixes `#35 <https://github.com/fronzbot/blinkpy/issues/35>`__ and `#41 <https://github.com/fronzbot/blinkpy/issues/41>`__)
 - Removed last_motion() function from Blink class
 - Refactored code for better organization
 - Moved some request calls out of @property methods (enables future CLI support)
 - Renamed get_summary() method to summary and changed to @property
 - Added ability to download most recent video clip
- Improved camera arm/disarm handling (`@b10m <https://github.com/fronzbot/blinkpy/pull/50>`_)
+- Improved camera arm/disarm handling (`@b10m <https://github.com/fronzbot/blinkpy/pull/50>`__)
 - Added authentication to ``login()`` function and deprecated ``setup_system()`` in favor of ``start()``
 - Added ``attributes`` dictionary to camera object

@@ -36,7 +101,7 @@ A list of changes between each release
 - Removed redundent properties that only called hidden variables
 - Revised request wrapper function to be more intelligent
 - Added tests to ensure exceptions are caught and handled (100% coverage!)
- Added auto-reauthorization (token refresh) when a request fails due to an expired token (`@tySwift93 <https://github.com/fronzbot/blinkpy/pull/24>`_)
+- Added auto-reauthorization (token refresh) when a request fails due to an expired token (`@tySwift93 <https://github.com/fronzbot/blinkpy/pull/24>`__)
 - Added battery level string to reduce confusion with the way Blink reports battery level as integer from 0 to 3

 0.5.2 (2017-03-12)
@@ -4,41 +4,55 @@ Everyone is welcome to contribute to blinkpy! The process to get started is desc

 ## Fork the Repository

-You can do this right in gituhb: just click the 'fork' button at the top right.
+You can do this right in github: just click the 'fork' button at the top right.

-## Setup Local Repository
+## Start Developing

-```shell
-$ git clone https://github.com/<YOUR_GIT_USERNAME>/blinkpy.git
-$ cd blinkpy
-$ git remote add upstream https://github.com/fronzbot/blinkpy.git
-```
+1. Setup Local Repository
+   ```shell
+   $ git clone https://github.com/<YOUR_GIT_USERNAME>/blinkpy.git
+   $ cd blinkpy
+   $ git remote add upstream https://github.com/fronzbot/blinkpy.git
+   ```

-## Create a Local Branch
+2. Create a Local Branch
+   
+   First, you will want to create a new branch to hold your changes:
+   ``git checkout -b <your-branch-name>``

-First, you will want to create a new branch to hold your changes:
-``git checkout -b <your-branch-name>``
-Next, you need to make sure you pull from the 'dev' branch:
-``git pull origin dev``

-## Make changes
+3. Make changes
+   
+   Now you can make changes to your code.  It is worthwhile to test your code as you progress (see the **Testing** section)

-Now you can make changes to your code.  It is worthwhile to test your code as you progress (see the **Testing** section)
+4. Commit Your Changes
+   
+   To commit changes to your branch, simply add the files you want and the commit them to the branch.  After that, you can push to your fork on GitHub:
+   ```shell
+   $ git add .
+   $ git commit -m "Put your commit text here.  Please be concise, but descriptive."
+   $ git push origin HEAD
+   ```
+   
+5. Submit your pull request on GitHub
+   
+   - On GitHub, navigate to the [blinkpy](https://github.com/fronzbot/blinkpy) repository.
+   - In the "Branch" menu, choose the branch that contains your commits (from your fork).
+   - To the right of the Branch menu, click New pull request.
+   - The base branch dropdown menu should read `dev`. Use the compare branch drop-down menu to choose the branch you made your changes        in.
+   - Type a title and complete the provided description for your pull request.
+   - Click Create pull request.
+   - More detailed instructions can be found here: [Creating a Pull Request](https://help.github.com/articles/creating-a-pull-request/)
+   
+6. Prior to merge approval
+   
+   Finally, the `blinkpy` repository uses continuous integration tools to run tests prior to merging. If there are any problems, you      will see a red 'X' next to your pull request. To see what's wrong, you can find your pull request [here](https://travis-       ci.org/fronzbot/blinkpy/pull_requests) and click on the failing test to see the logs.  Those logs will indicate, as best as they can, what is causing that test to fail.

-## Commit Your Changes
-
-To commit changes to your branch, simply add the files you want and the commit them to the branch.  After that, you can push to your fork on GitHub:
-
-```shell
-$ git add .
-$ git commit -m "Put your commit text here.  Please be concise, but descriptive."
-$ git push origin HEAD
-```

 ## Testing

 It is important to test the code to make sure your changes don't break anything major and that they pass PEP8 style conventions.
-FIrst, you need to locally install ``tox``
+First, you need to locally install ``tox``

 ```shell
 $ pip3 install tox
@@ -52,11 +66,11 @@ $ tox

 ### Tips

-If you only want to see if you can pass the local tests, you can run ``tox -e py34``.  If you just want to check for style violations, you can run ``tox -e lint``.  Regardless, when you submit a pull request, your code MUST pass both the unit tests, and the linters.
+If you only want to see if you can pass the local tests, you can run `tox -e py35` (or whatever python version you have installed.  Only `py35`, `py36`, and `py37` will be accepted).  If you just want to check for style violations, you can run `tox -e lint`.  Regardless, when you submit a pull request, your code MUST pass both the unit tests, and the linters.

-If you need to change anything in ``requirements.txt`` for any reason, you'll want to regenerate the virtual envrionments used by ``tox`` by running with the ``-r`` flag: ``tox -r``
+If you need to change anything in `requirements.txt` for any reason, you'll want to regenerate the virtual envrionments used by `tox` by running with the `-r` flag: `tox -r`

-Please do not locally disable any linter warnings within the ``blinkpy.py`` module itself (it's ok to do this in any of the ``test_*.py`` files)
+If you want to run a single test (perhaps you only changed a small thing in one file) you can run `tox -e py35 -- tests/<testname>.py -x`.  This will run the test `<testname>.py` and stop testing upon the first failure, making it easier to figure out why a particular test might be failing.  The test structure mimics the library structure, so if you changed something in `sync_module.py`, the associated test file would be in `test_sync_module.py` (ie. the filename is prepended with `test_`.

 # Catching Up With Reality

@@ -73,11 +87,3 @@ If rebase detects conflicts, repeat the following process until all changes have
 2. Add the modified file: ``git add <file>`` or ``git add .``.
 3. Continue rebase: ``git rebase --continue``.
 4. Repeat until all conflicts resolved.
-
-# Creating a Pull Request
-
-Please follow these steps to create a pull request against the ``dev`` branch: [Creating a Pull Request](https://help.github.com/articles/creating-a-pull-request/)
-
-# Monitor Build Status
-
-Once you create your PR, you can monitor the status of your build [here](https://travis-ci.org/fronzbot/blinkpy),  Your code will be tested to ensure it passes and won't cause any problems after merging.
@@ -1,7 +1,6 @@
-blinkpy |Build Status| |Coverage Status| |Docs|  |PyPi Version|
-================================================================
+blinkpy |Build Status| |Coverage Status| |Docs| |PyPi Version| |Python Version|
+================================================================================
 A Python library for the Blink Camera system
-Only compatible with Python 3+

 Disclaimer:
 ~~~~~~~~~~~~~~~
@@ -32,12 +31,16 @@ To install the current development version, perform the following steps.  Note t
    $ pip3 install --upgrade dist/*.whl


+If you'd like to contribute to this library, please read the `contributing instructions <https://github.com/fronzbot/blinkpy/blob/dev/CONTRIBUTING.md>`__.
+
+For more information on how to use this library, please `read the docs <https://blinkpy.readthedocs.io/en/latest/>`__.
+
 Purpose
 ===========
-This library was built with the intention of allowing easy communication with Blink camera systems, specifically so I can add a module into homeassistant https://home-assistant.io
+This library was built with the intention of allowing easy communication with Blink camera systems, specifically to support the `Blink component <https://home-assistant.io/components/blink>`__ in `homeassistant <https://home-assistant.io/>`__.

-Usage
-=========
+Quick Start
+=============
 The simplest way to use this package from a terminal is to call ``Blink.start()`` which will prompt for your Blink username and password and then log you in.  Alternatively, you can instantiate the Blink class with a username and password, and call ``Blink.start()`` to login and setup without prompt, as shown below.  In addition, http requests are throttled internally via use of the ``Blink.refresh_rate`` variable, which can be set at initialization and defaults to 30 seconds.

 .. code:: python
@@ -48,7 +51,7 @@ The simplest way to use this package from a terminal is to call ``Blink.start()`

 If you would like to log in without setting up the cameras or system, you can simply call the ``Blink.login()`` function which will prompt for a username and password and then authenticate with the server.  This is useful if you want to avoid use of the ``start()`` function which simply acts as a wrapper for more targeted API methods.

-Cameras are instantiated as individual ``BlinkCamera`` classes within a ``BlinkSyncModule`` instance.  Note: currently the API only supports one sync module, but multiple sync modules are planned to be supported in the future.
+Cameras are instantiated as individual ``BlinkCamera`` classes within a ``BlinkSyncModule`` instance.  All of your sync modules are stored within the ``Blink.sync`` dictionary and can be accessed using the name of the sync module as the key (this is the name of your sync module in the Blink App).

 The below code will display cameras and their available attributes:

@@ -59,15 +62,15 @@ The below code will display cameras and their available attributes:
    blink = blinkpy.Blink(username='YOUR USER NAME', password='YOUR PASSWORD')
    blink.start()

-    for name, camera in blink.sync.cameras.items():
-        print(name)                   # Name of the camera
-        print(camera.attributes)      # Print available attributes of camera
+    for name, camera in blink.cameras.items():
+      print(name)                   # Name of the camera
+      print(camera.attributes)      # Print available attributes of camera

 The most recent images and videos can be accessed as a bytes-object via internal variables.  These can be updated with calls to ``Blink.refresh()`` but will only make a request if motion has been detected or other changes have been found.  This can be overridden with the ``force_cache`` flag, but this should be used for debugging only since it overrides the internal request throttling.

 .. code:: python
    
-    camera = blink.sync.camera['SOME CAMERA NAME']
+    camera = blink.cameras['SOME CAMERA NAME']
    blink.refresh(force_cache=True)  # force a cache update USE WITH CAUTION
    camera.image_from_cache.raw  # bytes-like image object (jpg)
    camera.video_from_cache.raw  # bytes-like video object (mp4)
@@ -76,7 +79,7 @@ The ``blinkpy`` api also allows for saving images and videos to a file and snapp

 .. code:: python

-    camera = blink.sync.camera['SOME CAMERA NAME']
+    camera = blink.cameras['SOME CAMERA NAME']
    camera.snap_picture()       # Take a new picture with the camera
    blink.refresh()             # Get new information from server
    camera.image_to_file('/local/path/for/image.jpg')
@@ -90,3 +93,5 @@ The ``blinkpy`` api also allows for saving images and videos to a file and snapp
    :target: https://pypi.python.org/pypi/blinkpy
 .. |Docs| image:: https://readthedocs.org/projects/blinkpy/badge/?version=latest
   :target: http://blinkpy.readthedocs.io/en/latest/?badge=latest
+.. |Python Version| image:: https://img.shields.io/pypi/pyversions/blinkpy.svg
+   :target: https://img.shields.io/pypi/pyversions/blinkpy.svg
@@ -0,0 +1,167 @@
+"""Implements known blink API calls."""
+
+import logging
+from json import dumps
+import blinkpy.helpers.errors as ERROR
+from blinkpy.helpers.util import http_req, BlinkException
+from blinkpy.helpers.constants import DEFAULT_URL
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def request_login(blink, url, username, password):
+    """Login request."""
+    headers = {
+        'Host': DEFAULT_URL,
+        'Content-Type': 'application/json'
+    }
+    data = dumps({
+        'email': username,
+        'password': password,
+        'client_specifier': 'iPhone 9.2 | 2.2 | 222'
+    })
+    return http_req(blink, url=url, headers=headers, data=data,
+                    json_resp=False, reqtype='post')
+
+
+def request_networks(blink):
+    """Request all networks information."""
+    url = "{}/networks".format(blink.urls.base_url)
+    return http_get(blink, url)
+
+
+def request_network_status(blink, network):
+    """Request network information."""
+    url = "{}/network/{}".format(blink.urls.base_url, network)
+    return http_get(blink, url)
+
+
+def request_syncmodule(blink, network):
+    """Request sync module info."""
+    url = "{}/network/{}/syncmodules".format(blink.urls.base_url, network)
+    return http_get(blink, url)
+
+
+def request_system_arm(blink, network):
+    """Arm system."""
+    url = "{}/network/{}/arm".format(blink.urls.base_url, network)
+    return http_post(blink, url)
+
+
+def request_system_disarm(blink, network):
+    """Disarm system."""
+    url = "{}/network/{}/disarm".format(blink.urls.base_url, network)
+    return http_post(blink, url)
+
+
+def request_command_status(blink, network, command_id):
+    """Request command status."""
+    url = "{}/network/{}/command/{}".format(blink.urls.base_url,
+                                            network,
+                                            command_id)
+    return http_get(blink, url)
+
+
+def request_homescreen(blink):
+    """Request homescreen info."""
+    url = "{}/homescreen".format(blink.urls.base_url)
+    return http_get(blink, url)
+
+
+def request_sync_events(blink, network):
+    """Request events from sync module."""
+    url = "{}/events/network/{}".format(blink.urls.base_url, network)
+    return http_get(blink, url)
+
+
+def request_new_image(blink, network, camera_id):
+    """Request to capture new thumbnail for camera."""
+    url = "{}/network/{}/camera/{}/thumbnail".format(blink.urls.base_url,
+                                                     network,
+                                                     camera_id)
+    return http_post(blink, url)
+
+
+def request_new_video(blink, network, camera_id):
+    """Request to capture new video clip."""
+    url = "{}/network/{}/camera/{}/clip".format(blink.urls.base_url,
+                                                network,
+                                                camera_id)
+    return http_post(blink, url)
+
+
+def request_video_count(blink, headers):
+    """Request total video count."""
+    url = "{}/api/v2/videos/count".format(blink.urls.base_url)
+    return http_get(blink, url)
+
+
+def request_videos(blink, page=0):
+    """Perform a request for videos."""
+    url = "{}/api/v2/videos/page/{}".format(blink.urls.base_url, page)
+    return http_get(blink, url)
+
+
+def request_cameras(blink, network):
+    """Request all camera information."""
+    url = "{}/network/{}/cameras".format(blink.urls.base_url, network)
+    return http_get(blink, url)
+
+
+def request_camera_info(blink, network, camera_id):
+    """Request camera info for one camera."""
+    url = "{}/network/{}/camera/{}".format(blink.urls.base_url,
+                                           network,
+                                           camera_id)
+    return http_get(blink, url)
+
+
+def request_camera_sensors(blink, network, camera_id):
+    """Request camera sensor info for one camera."""
+    url = "{}/network/{}/camera/{}/signals".format(blink.urls.base_url,
+                                                   network,
+                                                   camera_id)
+    return http_get(blink, url)
+
+
+def request_motion_detection_enable(blink, network, camera_id):
+    """Enable motion detection for a camera."""
+    url = "{}/network/{}/camera/{}/enable".format(blink.urls.base_url,
+                                                  network,
+                                                  camera_id)
+    return http_post(blink, url)
+
+
+def request_motion_detection_disable(blink, network, camera_id):
+    """Disable motion detection for a camera."""
+    url = "{}/network/{}/camera/{}/disable".format(blink.urls.base_url,
+                                                   network,
+                                                   camera_id)
+    return http_post(blink, url)
+
+
+def http_get(blink, url, stream=False, json=True):
+    """
+    Perform an http get request.
+
+    :param url: URL to perform get request.
+    :param stream: Stream response? True/FALSE
+    :param json: Return json response? TRUE/False
+    """
+    if blink.auth_header is None:
+        raise BlinkException(ERROR.AUTH_TOKEN)
+    _LOGGER.debug("Making GET request to %s", url)
+    return http_req(blink, url=url, headers=blink.auth_header,
+                    reqtype='get', stream=stream, json_resp=json)
+
+
+def http_post(blink, url):
+    """
+    Perform an http post request.
+
+    :param url: URL to perfom post request.
+    """
+    if blink.auth_header is None:
+        raise BlinkException(ERROR.AUTH_TOKEN)
+    _LOGGER.debug("Making POST request to %s", url)
+    return http_req(blink, url=url, headers=blink.auth_header, reqtype='post')
@@ -1,4 +1,3 @@
-
 # -*- coding: utf-8 -*-
 """
 blinkpy by Kevin Fronczak - A Blink camera Python library.
@@ -13,16 +12,17 @@ I am in no way affiliated with Blink, nor Immedia Inc.
 """

 import time
-import json
 import getpass
 import logging
+from requests.structures import CaseInsensitiveDict
 import blinkpy.helpers.errors as ERROR
+from blinkpy import api
 from blinkpy.sync_module import BlinkSyncModule
 from blinkpy.helpers.util import (
-    http_req, create_session, BlinkURLHandler,
-    BlinkException, BlinkAuthenticationException)
+    create_session, merge_dicts, BlinkURLHandler,
+    BlinkAuthenticationException)
 from blinkpy.helpers.constants import (
-    DEFAULT_URL, BLINK_URL, LOGIN_URL, LOGIN_BACKUP_URL)
+    BLINK_URL, LOGIN_URL, LOGIN_BACKUP_URL)

 REFRESH_RATE = 30

@@ -47,24 +47,23 @@ class Blink():
        self._token = None
        self._auth_header = None
        self._host = None
-        self._events = []
-        self._last_summary = None
-        self._last_events = None
-        self.network_id = None
        self.account_id = None
+        self.network_ids = []
        self.urls = None
-        self.sync = None
+        self.sync = CaseInsensitiveDict({})
        self.region = None
        self.region_id = None
        self.last_refresh = None
        self.refresh_rate = refresh_rate
        self.session = None
+        self.networks = []
+        self.cameras = CaseInsensitiveDict({})
        self._login_url = LOGIN_URL

    @property
-    def events(self):
-        """Get all events on server."""
-        return self._events
+    def auth_header(self):
+        """Return the authentication header."""
+        return self._auth_header

    def start(self):
        """
@@ -78,13 +77,12 @@ class Blink():
        else:
            self.get_auth_token()

-        self.get_ids()
-        self.sync = BlinkSyncModule(self, self._auth_header)
-        self.sync.get_videos()
-        if self.sync.video_count > 0:
-            self.sync.get_cameras()
-        self.sync.set_links()
-        self._events = self.events_request()
+        networks = self.get_ids()
+        for network_name, network_id in networks.items():
+            sync_module = BlinkSyncModule(self, network_name, network_id)
+            sync_module.start()
+            self.sync[network_name] = sync_module
+        self.cameras = self.merge_cameras()

    def login(self):
        """Prompt user for username and password."""
@@ -103,16 +101,13 @@ class Blink():
        if not isinstance(self._password, str):
            raise BlinkAuthenticationException(ERROR.PASSWORD)

-        headers = {'Host': DEFAULT_URL,
-                   'Content-Type': 'application/json'}
-        data = json.dumps({
-            "email": self._username,
-            "password": self._password,
-            "client_specifier": "iPhone 9.2 | 2.2 | 222"
-        })
+        login_url = LOGIN_URL
        self.session = create_session()
-        response = http_req(self, url=self._login_url, headers=headers,
-                            data=data, json_resp=False, reqtype='post')
+        response = api.request_login(self,
+                                     login_url,
+                                     self._username,
+                                     self._password)
+
        if response.status_code == 200:
            response = response.json()
            (self.region_id, self.region), = response['region'].items()
@@ -122,56 +117,44 @@ class Blink():
                 "when authenticating, "
                 "trying new url"), response.status_code
            )
-            self._login_url = LOGIN_BACKUP_URL
-            response = http_req(self, url=self._login_url, headers=headers,
-                                data=data, reqtype='post')
+            login_url = LOGIN_BACKUP_URL
+            response = api.request_login(self,
+                                         login_url,
+                                         self._username,
+                                         self._password)
            self.region_id = 'piri'
            self.region = "UNKNOWN"

        self._host = "{}.{}".format(self.region_id, BLINK_URL)
        self._token = response['authtoken']['authtoken']
-
        self._auth_header = {'Host': self._host,
                             'TOKEN_AUTH': self._token}
-
+        self.networks = response['networks']
        self.urls = BlinkURLHandler(self.region_id)
+        self._login_url = login_url

        return self._auth_header

    def get_ids(self):
        """Set the network ID and Account ID."""
-        response = self._network_request()
-        self.network_id = str(response['networks'][0]['id'])
-        self.account_id = str(response['networks'][0]['account_id'])
+        response = api.request_networks(self)
+        # Look for only onboarded network, flag warning if multiple
+        # since it's unexpected
+        all_networks = []
+        network_dict = {}
+        for network, status in self.networks.items():
+            if status['onboarded']:
+                all_networks.append('{}'.format(network))
+                network_dict[status['name']] = network

-    def _network_request(self):
-        """Get network and account information."""
-        url = self.urls.networks_url
-        headers = self._auth_header
-        if headers is None:
-            raise BlinkException(ERROR.AUTH_TOKEN)
-        return http_req(self, url=url, headers=headers, reqtype='get')
+        # For the first onboarded network we find, grab the account id
+        for resp in response['networks']:
+            if str(resp['id']) in all_networks:
+                self.account_id = resp['account_id']
+                break

-    def events_request(self, skip_throttle=False):
-        """Get events on server."""
-        url = "{}/{}".format(self.urls.event_url, self.network_id)
-        headers = self._auth_header
-        if self.check_if_ok_to_update() or skip_throttle:
-            self._last_events = http_req(self, url=url,
-                                         headers=headers,
-                                         reqtype='get')
-        return self._last_events
-
-    def summary_request(self, skip_throttle=False):
-        """Get blink summary."""
-        url = self.urls.home_url
-        headers = self._auth_header
-        if headers is None:
-            raise BlinkException(ERROR.AUTH_TOKEN)
-        if self.check_if_ok_to_update() or skip_throttle:
-            self._last_summary = http_req(
-                self, url=url, headers=headers, reqtype='get')
-        return self._last_summary
+        self.network_ids = all_networks
+        return network_dict

    def refresh(self, force_cache=False):
        """
@@ -180,10 +163,9 @@ class Blink():
        :param force_cache: Force an update of the camera cache
        """
        if self.check_if_ok_to_update() or force_cache:
-            _LOGGER.debug("Attempting refresh of cameras.")
-            self._last_events = self.events_request(skip_throttle=True)
-            self._last_summary = self.summary_request(skip_throttle=True)
-            self.sync.refresh(force_cache=force_cache)
+            for sync_name, sync_module in self.sync.items():
+                _LOGGER.debug("Attempting refresh of sync %s", sync_name)
+                sync_module.refresh(force_cache=force_cache)

    def check_if_ok_to_update(self):
        """Check if it is ok to perform an http request."""
@@ -195,3 +177,10 @@ class Blink():
            self.last_refresh = current_time
            return True
        return False
+
+    def merge_cameras(self):
+        """Merge all sync camera dicts into one."""
+        combined = CaseInsensitiveDict({})
+        for sync in self.sync:
+            combined = merge_dicts(combined, self.sync[sync].cameras)
+        return combined
@@ -2,7 +2,7 @@

 from shutil import copyfileobj
 import logging
-from requests.exceptions import RequestException
+from blinkpy import api

 _LOGGER = logging.getLogger(__name__)

@@ -12,30 +12,23 @@ MAX_CLIPS = 5
 class BlinkCamera():
    """Class to initialize individual camera."""

-    def __init__(self, config, sync):
+    def __init__(self, sync):
        """Initiailize BlinkCamera."""
        self.sync = sync
-        self.urls = self.sync.urls
-        self.id = str(config['device_id'])  # pylint: disable=invalid-name
-        self.name = config['name']
-        self._status = config['active']
-        self.thumbnail = "{}{}.jpg".format(self.urls.base_url,
-                                           config['thumbnail'])
-        self.clip = "{}{}".format(self.urls.base_url, config['video'])
-        self.temperature = config['temp']
-        self._battery_string = config['battery']
-        self.notifications = config['notifications']
-        self.motion = dict()
-        self.header = None
-        self.image_link = None
-        self.arm_link = None
-        self.region_id = config['region_id']
-        self.battery_voltage = -180
+        self.name = None
+        self.camera_id = None
+        self.network_id = None
+        self.thumbnail = None
+        self.serial = None
+        self.motion_enabled = None
+        self.battery_voltage = None
+        self.clip = None
+        self.temperature = None
+        self.temperature_calibrated = None
+        self.battery_state = None
        self.motion_detected = None
        self.wifi_strength = None
-        self.camera_config = dict()
-        self.motion_enabled = None
-        self.last_record = list()
+        self.last_record = []
        self._cached_image = None
        self._cached_video = None

@@ -44,48 +37,28 @@ class BlinkCamera():
        """Return dictionary of all camera attributes."""
        attributes = {
            'name': self.name,
-            'device_id': self.id,
-            'status': self._status,
-            'armed': self.armed,
+            'camera_id': self.camera_id,
+            'serial': self.serial,
            'temperature': self.temperature,
            'temperature_c': self.temperature_c,
+            'temperature_calibrated': self.temperature_calibrated,
            'battery': self.battery,
            'thumbnail': self.thumbnail,
            'video': self.clip,
            'motion_enabled': self.motion_enabled,
-            'notifications': self.notifications,
            'motion_detected': self.motion_detected,
            'wifi_strength': self.wifi_strength,
            'network_id': self.sync.network_id,
+            'sync_module': self.sync.name,
            'last_record': self.last_record
        }
        return attributes

-    @property
-    def status(self):
-        """Return camera status."""
-        return self._status
-
-    @property
-    def armed(self):
-        """Return camera arm status."""
-        return True if self._status == 'armed' else False
-
    @property
    def battery(self):
        """Return battery level as percentage."""
        return round(self.battery_voltage / 180 * 100)

-    @property
-    def battery_string(self):
-        """Return string indicating battery status."""
-        status = "Unknown"
-        if self._battery_string > 1 and self._battery_string <= 3:
-            status = "OK"
-        elif self._battery_string >= 0:
-            status = "Low"
-        return status
-
    @property
    def temperature_c(self):
        """Return temperature in celcius."""
@@ -107,50 +80,86 @@ class BlinkCamera():

    def snap_picture(self):
        """Take a picture with camera to create a new thumbnail."""
-        self.sync.http_post(self.image_link)
+        return api.request_new_image(self.sync.blink,
+                                     self.network_id,
+                                     self.camera_id)

    def set_motion_detect(self, enable):
        """Set motion detection."""
-        url = self.arm_link
        if enable:
-            self.sync.http_post("{}{}".format(url, 'enable'))
+            return api.request_motion_detection_enable(self.sync.blink,
+                                                       self.network_id,
+                                                       self.camera_id)
+        return api.request_motion_detection_disable(self.sync.blink,
+                                                    self.network_id,
+                                                    self.camera_id)
+
+    def update(self, config, force_cache=False):
+        """Update camera info."""
+        self.name = config['name']
+        self.camera_id = str(config['camera_id'])
+        self.network_id = str(config['network_id'])
+        self.serial = config['serial']
+        self.motion_enabled = config['enabled']
+        self.battery_voltage = config['battery_voltage']
+        self.battery_state = config['battery_state']
+        self.temperature = config['temperature']
+        self.wifi_strength = config['wifi_strength']
+
+        # Retrieve calibrated temperature from special endpoint
+        resp = api.request_camera_sensors(self.sync.blink,
+                                          self.network_id,
+                                          self.camera_id)
+        try:
+            self.temperature_calibrated = resp['temp']
+        except KeyError:
+            _LOGGER.error("Could not retrieve calibrated temperature.")
+
+        # Check if thumbnail exists in config, if not try to
+        # get it from the homescreen info in teh sync module
+        # otherwise set it to None and log an error
+        new_thumbnail = None
+        if config['thumbnail']:
+            thumb_addr = config['thumbnail']
        else:
-            self.sync.http_post("{}{}".format(url, 'disable'))
+            thumb_addr = self.get_thumb_from_homescreen()

-    def update(self, values, force_cache=False, skip_cache=False):
-        """Update camera information."""
-        self.name = values['name']
-        self._status = values['active']
-        self.clip = "{}{}".format(
-            self.urls.base_url, values['video'])
-        new_thumbnail = "{}{}.jpg".format(
-            self.urls.base_url, values['thumbnail'])
-        self._battery_string = values['battery']
-        self.notifications = values['notifications']
+        if thumb_addr is not None:
+            new_thumbnail = "{}{}.jpg".format(self.sync.urls.base_url,
+                                              thumb_addr)

+        # Check if a new motion clip has been recorded
+        # check_for_motion_method sets motion_detected variable
+        self.check_for_motion()
+        clip_addr = None
+        if self.last_record:
+            clip_addr = self.sync.all_clips[self.name][self.last_record[0]]
+            self.clip = "{}{}".format(self.sync.urls.base_url,
+                                      clip_addr)
+
+        # If the thumbnail or clip have changed, update the cache
        update_cached_image = False
        if new_thumbnail != self.thumbnail or self._cached_image is None:
            update_cached_image = True
        self.thumbnail = new_thumbnail
-        try:
-            cfg = self.sync.camera_config_request(self.id)
-            self.camera_config = cfg
-        except RequestException as err:
-            _LOGGER.warning("Could not get config for %s with id %s",
-                            self.name, self.id)
-            _LOGGER.warning("Exception raised: %s", err)

-        try:
-            self.battery_voltage = cfg['camera'][0]['battery_voltage']
-            self.motion_enabled = cfg['camera'][0]['motion_alert']
-            self.wifi_strength = cfg['camera'][0]['wifi_strength']
-            self.temperature = cfg['camera'][0]['temperature']
-        except KeyError:
-            _LOGGER.warning("Problem extracting config for camera %s",
-                            self.name)
+        update_cached_video = False
+        if self._cached_video is None or self.motion_detected:
+            update_cached_video = True

-        # Check if the most recent clip is included in the last_record list
-        # and that the last_record list is populated
+        if new_thumbnail is not None and (update_cached_image or force_cache):
+            self._cached_image = api.http_get(self.sync.blink,
+                                              url=self.thumbnail,
+                                              stream=True,
+                                              json=False)
+        if clip_addr is not None and (update_cached_video or force_cache):
+            self._cached_video = api.http_get(self.sync.blink,
+                                              url=self.clip,
+                                              stream=True,
+                                              json=False)
+
+    def check_for_motion(self):
+        """Check if motion detected.."""
        try:
            records = sorted(self.sync.record_dates[self.name])
            new_clip = records.pop()
@@ -165,32 +174,8 @@ class BlinkCamera():
            else:
                self.motion_detected = False
        except KeyError:
-            _LOGGER.warning("Could not extract clip info from camera %s",
-                            self.name)
-
-        if not skip_cache:
-            if update_cached_image or force_cache:
-                self._cached_image = self.sync.http_get(
-                    self.image_refresh(), stream=True, json=False)
-            if (self.clip is None) or self.motion_detected or force_cache:
-                self._cached_video = self.sync.http_get(
-                    self.clip, stream=True, json=False)
-
-    def image_refresh(self):
-        """Refresh current thumbnail."""
-        url = self.urls.home_url
-        response = self.sync.http_get(url)['devices']
-        for element in response:
-            try:
-                if str(element['device_id']) == self.id:
-                    self.thumbnail = (
-                        "{}{}.jpg".format(
-                            self.urls.base_url, element['thumbnail'])
-                    )
-                    return self.thumbnail
-            except KeyError:
-                pass
-        return None
+            _LOGGER.info("Could not extract clip info from camera %s",
+                         self.name)

    def image_to_file(self, path):
        """
@@ -214,5 +199,22 @@ class BlinkCamera():
        """
        _LOGGER.debug("Writing video from %s to %s", self.name, path)
        response = self._cached_video
+        if response is None:
+            _LOGGER.error("No saved video exist for %s.", self.name)
+            return
        with open(path, 'wb') as vidfile:
            copyfileobj(response.raw, vidfile)
+
+    def get_thumb_from_homescreen(self):
+        """Retrieve thumbnail from homescreen."""
+        for device in self.sync.homescreen['devices']:
+            try:
+                device_type = device['device_type']
+                device_name = device['name']
+                device_thumb = device['thumbnail']
+                if device_type == 'camera' and device_name == self.name:
+                    return device_thumb
+            except KeyError:
+                pass
+        _LOGGER.error("Could not find thumbnail for camera %s", self.name)
+        return None
@@ -3,12 +3,12 @@
 import os

 MAJOR_VERSION = 0
-MINOR_VERSION = 9
-PATCH_VERSION = 0
+MINOR_VERSION = 11
+PATCH_VERSION = 1

 __version__ = '{}.{}.{}'.format(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)

-REQUIRED_PYTHON_VER = (3, 4, 2)
+REQUIRED_PYTHON_VER = (3, 5, 3)

 PROJECT_NAME = 'blinkpy'
 PROJECT_PACKAGE_NAME = 'blinkpy'
@@ -30,7 +30,9 @@ PROJECT_CLASSIFIERS = [
    'Intended Audience :: Developers',
    'License :: OSI Approved :: MIT License',
    'Operating System :: OS Independent',
-    'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
    'Topic :: Home Automation'
 ]

@@ -43,10 +45,10 @@ PYPI_URL = 'https://pypi.python.org/pypi/{}'.format(PROJECT_PACKAGE_NAME)
 URLS
 '''
 BLINK_URL = 'immedia-semi.com'
-LOGIN_URL = 'https://prod.' + BLINK_URL + '/login'
-LOGIN_BACKUP_URL = 'https://rest.piri/' + BLINK_URL + '/login'
-BASE_URL = 'https://prod.' + BLINK_URL
-DEFAULT_URL = 'prod.' + BLINK_URL
+DEFAULT_URL = "{}.{}".format('prod', BLINK_URL)
+BASE_URL = "https://{}".format(DEFAULT_URL)
+LOGIN_URL = "{}/login".format(BASE_URL)
+LOGIN_BACKUP_URL = "https://{}.{}/login".format('rest.piri', BLINK_URL)

 '''
 Dictionaries
@@ -1,14 +1,23 @@
 """Useful functions for blinkpy."""

 import logging
-from requests import Request, Session
-import blinkpy.helpers.errors as ERROR
+from requests import Request, Session, exceptions
 from blinkpy.helpers.constants import BLINK_URL
+import blinkpy.helpers.errors as ERROR


 _LOGGER = logging.getLogger(__name__)


+def merge_dicts(dict_a, dict_b):
+    """Merge two dictionaries into one."""
+    duplicates = [val for val in dict_a if val in dict_b]
+    if duplicates:
+        _LOGGER.warning(("Duplicates found during merge: %s. "
+                         "Renaming is recommended."), duplicates)
+    return {**dict_a, **dict_b}
+
+
 def create_session():
    """Create a session for blink communication."""
    sess = Session()
@@ -17,9 +26,8 @@ def create_session():

 def attempt_reauthorization(blink):
    """Attempt to refresh auth token and links."""
-    _LOGGER.debug("Auth token expired, attempting reauthorization.")
+    _LOGGER.info("Auth token expired, attempting reauthorization.")
    headers = blink.get_auth_token()
-    blink.sync.set_links()
    return headers


@@ -42,20 +50,32 @@ def http_req(blink, url='http://example.com', data=None, headers=None,
    elif reqtype == 'get':
        req = Request('GET', url, headers=headers)
    else:
+        _LOGGER.error("Invalid request type: %s", reqtype)
        raise BlinkException(ERROR.REQUEST)

    prepped = req.prepare()
-    response = blink.session.send(prepped, stream=stream)

-    if json_resp and 'code' in response.json():
-        if is_retry:
-            raise BlinkAuthenticationException(
-                (response.json()['code'], response.json()['message']))
-        else:
+    try:
+        response = blink.session.send(prepped, stream=stream)
+        if json_resp and 'code' in response.json():
+            if is_retry:
+                _LOGGER.error("Cannot obtain new token for server auth.")
+                return None
+            else:
+                headers = attempt_reauthorization(blink)
+                return http_req(blink, url=url, data=data, headers=headers,
+                                reqtype=reqtype, stream=stream,
+                                json_resp=json_resp, is_retry=True)
+    except (exceptions.ConnectionError, exceptions.Timeout):
+        _LOGGER.info("Cannot connect to server with url %s.", url)
+        if not is_retry:
            headers = attempt_reauthorization(blink)
            return http_req(blink, url=url, data=data, headers=headers,
                            reqtype=reqtype, stream=stream,
                            json_resp=json_resp, is_retry=True)
+        _LOGGER.error("Endpoint %s failed. Possible issue with Blink servers.",
+                      url)
+        return None

    if json_resp:
        return response.json()
@@ -3,8 +3,8 @@
 import logging

 from requests.structures import CaseInsensitiveDict
+from blinkpy import api
 from blinkpy.camera import BlinkCamera
-from blinkpy.helpers.util import http_req
 from blinkpy.helpers.constants import ONLINE

 _LOGGER = logging.getLogger(__name__)
@@ -13,117 +13,116 @@ _LOGGER = logging.getLogger(__name__)
 class BlinkSyncModule():
    """Class to initialize sync module."""

-    def __init__(self, blink, header, urls=None):
+    def __init__(self, blink, network_name, network_id):
        """
        Initialize Blink sync module.

        :param blink: Blink class instantiation
-        :param header: Blink authentication header
-        :param urls: URL Handler instantiation (deprecated)
        """
        self.blink = blink
-        self._auth_header = header
+        self._auth_header = blink.auth_header
+        self.network_id = network_id
+        self.region = blink.region
+        self.region_id = blink.region_id
+        self.name = network_name
+        self.serial = None
+        self.status = None
        self.sync_id = None
-        self.region = None
-        self.region_id = None
-        self._host = None
-        self._events = []
+        self.host = None
+        self.summary = None
+        self.homescreen = None
+        self.network_info = None
+        self.record_dates = {}
+        self.videos = {}
+        self.events = []
        self.cameras = CaseInsensitiveDict({})
-        self._idlookup = {}
-        self._video_count = 0
-        self._all_videos = {}
-        self._summary = None
-        self.record_dates = dict()
-        self.first_init = True
+        self.all_clips = {}
+
+    @property
+    def attributes(self):
+        """Return sync attributes."""
+        attr = {
+            'name': self.name,
+            'id': self.sync_id,
+            'network_id': self.network_id,
+            'serial': self.serial,
+            'status': self.status,
+            'region': self.region,
+            'region_id': self.region_id,
+        }
+        return attr

    @property
    def urls(self):
        """Return device urls."""
        return self.blink.urls

-    @property
-    def network_id(self):
-        """Return the network id."""
-        return self.blink.network_id
-
-    @property
-    def camera_thumbs(self):
-        """Return camera thumbnails."""
-        self.blink.refresh()
-        data = {}
-        for name, camera in self.cameras.items():
-            data[name] = camera.thumbnail
-
-        return data
-
-    @property
-    def id_table(self):
-        """Return id/camera pairs."""
-        return self._idlookup
-
-    @property
-    def video_count(self):
-        """Return number of videos on server."""
-        url = "{}/count".format(self.urls.video_url)
-        self._video_count = self.http_get(url)['count']
-        return self._video_count
-
-    @property
-    def events(self):
-        """Get all events on server."""
-        return self._events
-
    @property
    def online(self):
        """Return boolean system online status."""
-        return ONLINE[self._status_request()['syncmodule']['status']]
-
-    @property
-    def videos(self):
-        """Return video list."""
-        return self._all_videos
-
-    @property
-    def summary(self):
-        """Get a full summary of device information."""
-        return self._summary
+        return ONLINE[self.status]

    @property
    def arm(self):
        """Return status of sync module: armed/disarmed."""
-        return self._summary['network']['armed']
+        return self.network_info['network']['armed']

    @arm.setter
    def arm(self, value):
        """Arm or disarm system."""
        if value:
-            value_to_append = 'arm'
-        else:
-            value_to_append = 'disarm'
-        url = "{}/{}/{}".format(self.urls.network_url,
-                                self.network_id,
-                                value_to_append)
-        self.http_post(url)
+            return api.request_system_arm(self.blink, self.network_id)
+
+        return api.request_system_disarm(self.blink, self.network_id)
+
+    def start(self):
+        """Initialize the system."""
+        response = api.request_syncmodule(self.blink, self.network_id)
+        self.summary = response['syncmodule']
+        self.sync_id = self.summary['id']
+        self.network_id = self.summary['network_id']
+        self.serial = self.summary['serial']
+        self.status = self.summary['status']
+
+        self.events = self.get_events()
+
+        self.homescreen = api.request_homescreen(self.blink)
+
+        self.network_info = api.request_network_status(self.blink,
+                                                       self.network_id)
+
+        camera_info = self.get_camera_info()
+        for camera_config in camera_info:
+            name = camera_config['name']
+            self.cameras[name] = BlinkCamera(self)
+
+        self.videos = self.get_videos()
+        for camera_config in camera_info:
+            name = camera_config['name']
+            if name in self.cameras:
+                self.cameras[name].update(camera_config, force_cache=True)
+
+    def get_events(self):
+        """Retrieve events from server."""
+        response = api.request_sync_events(self.blink, self.network_id)
+        return response['event']
+
+    def get_camera_info(self):
+        """Retrieve camera information."""
+        response = api.request_cameras(self.blink, self.network_id)
+        return response['devicestatus']

    def refresh(self, force_cache=False):
        """Get all blink cameras and pulls their most recent status."""
-        summary = self._summary_request()
-        events = self._events_request()
-        response = summary['devices']
-        self.get_videos()
-        for name in self.cameras:
-            camera = self.cameras[name]
-            for element in response:
-                try:
-                    if str(element['device_id']) == camera.id:
-                        element['video'] = self.videos[name][0]['clip']
-                        thumb = self.videos[name][0]['thumb']
-                        element['thumbnail'] = thumb
-                        camera.update(element, force_cache=force_cache)
-                except KeyError:
-                    pass
-        self._summary = summary
-        self._events = events
+        self.events = self.get_events()
+        self.videos = self.get_videos()
+        self.homescreen = api.request_homescreen(self.blink)
+        self.network_info = api.request_network_status(self.blink,
+                                                       self.network_id)
+        camera_info = self.get_camera_info()
+        for camera_config in camera_info:
+            name = camera_config['name']
+            self.cameras[name].update(camera_config, force_cache=force_cache)

    def get_videos(self, start_page=0, end_page=1):
        """
@@ -135,14 +134,16 @@ class BlinkSyncModule():
        """
        videos = list()
        all_dates = dict()
+
        for page_num in range(start_page, end_page + 1):
-            this_page = self._video_request(page_num)
+            this_page = api.request_videos(self.blink, page=page_num)
            if not this_page:
                break
            videos.append(this_page)
-
+        _LOGGER.debug("Getting videos from page %s through %s",
+                      start_page,
+                      end_page)
        for page in videos:
-            _LOGGER.debug("Retrieved video page %s", page)
            for entry in page:
                camera_name = entry['camera_name']
                clip_addr = entry['address']
@@ -150,102 +151,28 @@ class BlinkSyncModule():
                clip_date = clip_addr.split('_')[-6:]
                clip_date = '_'.join(clip_date)
                clip_date = clip_date.split('.')[0]
+                try:
+                    self.all_clips[camera_name][clip_date] = clip_addr
+                except KeyError:
+                    self.all_clips[camera_name] = {clip_date: clip_addr}
+
                if camera_name not in all_dates:
                    all_dates[camera_name] = list()
                all_dates[camera_name].append(clip_date)
                try:
-                    self._all_videos[camera_name].append(
+                    self.videos[camera_name].append(
                        {
                            'clip': clip_addr,
                            'thumb': thumb_addr,
                        }
                    )
                except KeyError:
-                    self._all_videos[camera_name] = [
+                    self.videos[camera_name] = [
                        {
                            'clip': clip_addr,
                            'thumb': thumb_addr,
                        }
                    ]
        self.record_dates = all_dates
-
-    def get_cameras(self):
-        """Find and creates cameras."""
-        self._summary = self._summary_request()
-        response = self._summary['devices']
-        for element in response:
-            if ('device_type' in element and
-                    element['device_type'] == 'camera'):
-                # Add region to config
-                element['region_id'] = self.region_id
-                try:
-                    name = element['name']
-                    element['video'] = self.videos[name][0]['clip']
-                    element['thumbnail'] = self.videos[name][0]['thumb']
-                except KeyError:
-                    element['video'] = None
-                    element['thumbnail'] = None
-                device = BlinkCamera(element, self)
-                self.cameras[device.name] = device
-                self._idlookup[device.id] = device.name
-        self.blink.refresh(force_cache=self.first_init)
-        self.first_init = False
-
-    def set_links(self):
-        """Set access links and required headers for each camera in system."""
-        for name in self.cameras:
-            camera = self.cameras[name]
-            network_id_url = "{}/{}".format(self.urls.network_url,
-                                            self.network_id)
-            image_url = "{}/camera/{}/thumbnail".format(network_id_url,
-                                                        camera.id)
-            arm_url = "{}/camera/{}/".format(network_id_url,
-                                             camera.id)
-            camera.image_link = image_url
-            camera.arm_link = arm_url
-            camera.header = self._auth_header
-
-    def _summary_request(self):
-        """Request a summary from blink."""
-        return self.blink.summary_request()
-
-    def _events_request(self):
-        """Request a list of events from blink."""
-        return self.blink.events_request()
-
-    def _video_request(self, page=0):
-        """Perform a request for videos."""
-        url = "{}/page/{}".format(self.urls.video_url, page)
-        return self.http_get(url)
-
-    def _status_request(self):
-        """Get syncmodule status."""
-        url = "{}/{}/syncmodules".format(self.urls.network_url,
-                                         self.network_id)
-        return self.http_get(url)
-
-    def camera_config_request(self, camera_id):
-        """Retrieve more info about Blink config."""
-        url = "{}/network/{}/camera/{}/config".format(self.urls.base_url,
-                                                      self.network_id,
-                                                      str(camera_id))
-        return self.http_get(url)
-
-    def http_get(self, url, stream=False, json=True):
-        """
-        Perform an http get request.
-
-        :param url: URL to perform get request
-        :param stream: Stream response? True/FALSE
-        :param json: Return json response? TRUE/False
-        """
-        return http_req(self.blink, url=url, headers=self._auth_header,
-                        reqtype='get', stream=stream, json_resp=json)
-
-    def http_post(self, url):
-        """Perform a post request.
-
-        :param url: URL to perform post request
-        """
-        return http_req(self.blink, url=url, headers=self._auth_header,
-                        reqtype='post')
+        _LOGGER.debug("Retrieved a total of %s records", len(all_dates))
+        return self.videos
@@ -1,30 +1,17 @@
 .. _core_module:

-:mod:`blinkpy`
+Blinkpy
 ----------------------

 .. automodule:: blinkpy.blinkpy
+    :members:

 .. automodule:: blinkpy.sync_module
+    :members:

 .. automodule:: blinkpy.camera
+    :members:

 .. automodule:: blinkpy.helpers.util
-
-.. autoclass:: blinkpy.blinkpy.Blink
    :members:

-.. autoclass:: blinkpy.sync_module.BlinkSyncModule
-    :members:
-
-.. autoclass:: blinkpy.camera.BlinkCamera
-    :members:
-
-.. autoclass:: blinkpy.helpers.util.BlinkURLHandler
-    :members:
-
-.. autofunction:: blinkpy.helpers.util.create_session
-
-.. autofunction:: blinkpy.helpers.util.http_req
-
-.. autofunction:: blinkpy.helpers.util.attempt_reauthorization
@@ -0,0 +1,6 @@
+API Reference
+----------------------
+
+.. automodule:: blinkpy.api
+    :members:
+
@@ -1,2 +1,2 @@
-requests>=2.12.4
-testtools
+requests>=2.20.0
+testtools==2.3.0
@@ -7,4 +7,4 @@ pytest-cov>=2.3.1
 pytest-sugar>=0.9.0
 pytest-timeout>=1.0.0
 restructuredtext-lint>=1.0.1
-pygments>=2.2.0
+pygments>=2.2.0
@@ -6,15 +6,7 @@ import blinkpy.helpers.constants as const
 LOGIN_RESPONSE = {
    'region': {'mock': 'Test'},
    'networks': {
-        'summary': {'name': 'TestNetwork'},
-        'networks': [{
-            'name': 'TestNetwork',
-            'account_id': 1111,
-            'id': 2222,
-            'active': 'armed',
-            'armed': True,
-            'arm_string': 'Armed'
-        }]
+        '1234': {'name': 'test', 'onboarded': True}
    },
    'authtoken': {'authtoken': 'foobar123', 'message': 'auth'}
 }
@@ -0,0 +1,42 @@
+"""Test various api functions."""
+
+import unittest
+from unittest import mock
+from blinkpy import api
+from blinkpy.blinkpy import Blink
+from blinkpy.helpers.util import create_session
+
+
+class TestBlinkAPI(unittest.TestCase):
+    """Test the blink api module."""
+
+    def setUp(self):
+        """Initialize the blink module."""
+        self.blink = Blink()
+        self.blink.session = create_session()
+        # pylint: disable=protected-access
+        self.blink._auth_header = {}
+
+    def tearDown(self):
+        """Tear down blink module."""
+        self.blink = None
+
+    @mock.patch('blinkpy.blinkpy.Blink.get_auth_token')
+    def test_http_req_connect_error(self, mock_auth):
+        """Test http_get error condition."""
+        mock_auth.return_value = {'foo': 'bar'}
+        firstlog = ("INFO:blinkpy.helpers.util:"
+                    "Cannot connect to server with url {}.").format(
+                        'http://notreal.fake')
+        nextlog = ("INFO:blinkpy.helpers.util:"
+                   "Auth token expired, attempting reauthorization.")
+        lastlog = ("ERROR:blinkpy.helpers.util:"
+                   "Endpoint {} failed. Possible issue with "
+                   "Blink servers.").format('http://notreal.fake')
+        expected = [firstlog, nextlog, firstlog, lastlog]
+        with self.assertLogs() as getlog:
+            api.http_get(self.blink, 'http://notreal.fake')
+        with self.assertLogs() as postlog:
+            api.http_post(self.blink, 'http://notreal.fake')
+        self.assertEqual(getlog.output, expected)
+        self.assertEqual(postlog.output, expected)
@@ -6,9 +6,7 @@ from requests import Request

 from blinkpy import blinkpy
 from blinkpy.sync_module import BlinkSyncModule
-from blinkpy.camera import BlinkCamera
 from blinkpy.helpers.util import create_session
-from blinkpy.helpers.constants import BLINK_URL
 import tests.mock_responses as mresp

 USERNAME = 'foobar'
@@ -52,88 +50,35 @@ class TestBlinkFunctions(unittest.TestCase):
            'TOKEN_AUTH': 'foobar123'
        }
        self.blink.urls = blinkpy.BlinkURLHandler('test')
-        self.config = {
-            'device_id': 1111,
-            'name': 'foobar',
-            'armed': False,
-            'active': 'disabled',
-            'thumbnail': '/test',
-            'video': '/test.mp4',
-            'temp': 80,
-            'battery': 3,
-            'notifications': 2,
-            'region_id': 'test',
-            'device_type': 'camera'
-        }
-        self.blink.sync = MockSyncModule(
-            self.blink, self.blink._auth_header)
        self.blink.session = create_session()
-        self.camera = BlinkCamera(self.config, self.blink.sync)

    def tearDown(self):
        """Clean up after test."""
        self.blink = None
-        self.config = {}
-        self.camera = None

-    def test_image_refresh(self, mock_sess):
-        """Test image refresh function."""
-        self.blink.sync.return_value = {'devices': [self.config]}
-        image = self.camera.image_refresh()
-        self.assertEqual(image,
-                         'https://rest.test.{}/test.jpg'.format(BLINK_URL))
-
-    @mock.patch('blinkpy.sync_module.BlinkSyncModule.camera_config_request')
-    @mock.patch('blinkpy.sync_module.BlinkSyncModule._video_request')
-    def test_refresh(self, vid_req, req, mock_sess):
-        """Test blinkpy refresh function."""
-        req.return_value = {'foo': 'bar'}
-        self.blink.sync.cameras = {'foobar': self.camera}
-        self.blink.sync.return_value = {'devices': [{'foo': 'bar'}]}
-        # pylint: disable=protected-access
-        summary = {'devices': [self.config]}
-        # pylint: disable=protected-access
-        events = {'foo': 'bar'}
-        vid_req.return_value = [
-            {
-                'camera_name': 'foobar',
-                'address': '/new.mp4',
-                'thumbnail': '/new',
-            }
-        ]
-        with mock.patch('blinkpy.blinkpy.Blink.summary_request',
-                        return_value=summary):
-            with mock.patch('blinkpy.blinkpy.Blink.events_request',
-                            return_value=events):
-                self.blink.refresh_rate = 0
-                self.blink.refresh()
-        test_camera = self.blink.sync.cameras['foobar']
-        self.assertEqual(test_camera.clip,
-                         'https://rest.test.{}/new.mp4'.format(BLINK_URL))
-        self.assertEqual(test_camera.thumbnail,
-                         'https://rest.test.{}/new.jpg'.format(BLINK_URL))
-
-    def test_set_links(self, mock_sess):
-        """Test the link set method."""
-        self.blink.sync.cameras = {'foobar': self.camera}
-        self.blink.network_id = 9999
-        self.blink.sync.set_links()
-        net_url = "{}/{}".format(self.blink.urls.network_url, 9999)
-        self.assertEqual(self.camera.image_link,
-                         "{}/camera/1111/thumbnail".format(net_url))
-        self.assertEqual(self.camera.arm_link,
-                         "{}/camera/1111/".format(net_url))
-
-    @mock.patch('blinkpy.blinkpy.http_req')
+    @mock.patch('blinkpy.blinkpy.api.http_req')
    def test_backup_url(self, req, mock_sess):
        """Test backup login method."""
        fake_req = Request('POST', 'http://wrong.url').prepare()
        req.side_effect = [
            mresp.mocked_session_send(fake_req),
-            {'authtoken': {'authtoken': 'foobar123'}}
+            {'authtoken': {'authtoken': 'foobar123'},
+             'networks': {'1234': {'name': 'foobar', 'onboarded': True}}}
        ]
        self.blink.get_auth_token()
        self.assertEqual(self.blink.region_id, 'piri')
        self.assertEqual(self.blink.region, 'UNKNOWN')
        # pylint: disable=protected-access
        self.assertEqual(self.blink._token, 'foobar123')
+
+    def test_merge_cameras(self, mock_sess):
+        """Test merge camera functionality."""
+        first_dict = {'foo': 'bar', 'test': 123}
+        next_dict = {'foobar': 456, 'bar': 'foo'}
+        self.blink.sync['foo'] = BlinkSyncModule(self.blink, 'foo', 1)
+        self.blink.sync['bar'] = BlinkSyncModule(self.blink, 'bar', 2)
+        self.blink.sync['foo'].cameras = first_dict
+        self.blink.sync['bar'].cameras = next_dict
+        result = self.blink.merge_cameras()
+        expected = {'foo': 'bar', 'test': 123, 'foobar': 456, 'bar': 'foo'}
+        self.assertEqual(expected, result)
@@ -8,7 +8,8 @@ any communication related errors at startup.

 import unittest
 from unittest import mock
-from blinkpy import blinkpy
+from blinkpy import api
+from blinkpy.blinkpy import Blink
 from blinkpy.sync_module import BlinkSyncModule
 from blinkpy.helpers.util import (
    http_req, create_session, BlinkAuthenticationException,
@@ -26,10 +27,12 @@ class TestBlinkSetup(unittest.TestCase):

    def setUp(self):
        """Set up Blink module."""
-        self.blink_no_cred = blinkpy.Blink()
-        self.blink = blinkpy.Blink(username=USERNAME,
-                                   password=PASSWORD)
-        self.blink.sync = BlinkSyncModule(self.blink, dict(), self.blink.urls)
+        self.blink_no_cred = Blink()
+        self.blink = Blink(username=USERNAME,
+                           password=PASSWORD)
+        self.blink.sync['test'] = BlinkSyncModule(self.blink, 'test', '1234')
+        self.blink.urls = BlinkURLHandler('test')
+        self.blink.session = create_session()

    def tearDown(self):
        """Clean up after test."""
@@ -59,8 +62,6 @@ class TestBlinkSetup(unittest.TestCase):
        self.blink.urls = BlinkURLHandler(region_id)
        with self.assertRaises(BlinkException):
            self.blink.get_ids()
-        with self.assertRaises(BlinkException):
-            self.blink.summary_request()

    @mock.patch('blinkpy.blinkpy.getpass.getpass')
    def test_manual_login(self, getpwd, mock_sess):
@@ -76,11 +77,14 @@ class TestBlinkSetup(unittest.TestCase):
    def test_bad_request(self, mock_sess):
        """Check that we raise an Exception with a bad request."""
        self.blink.session = create_session()
+        explog = ("ERROR:blinkpy.helpers.util:"
+                  "Cannot obtain new token for server auth.")
        with self.assertRaises(BlinkException):
            http_req(self.blink, reqtype='bad')

-        with self.assertRaises(BlinkAuthenticationException):
+        with self.assertLogs() as logrecord:
            http_req(self.blink, reqtype='post', is_retry=True)
+        self.assertEqual(logrecord.output, [explog])

    def test_authentication(self, mock_sess):
        """Check that we can authenticate Blink up properly."""
@@ -95,8 +99,52 @@ class TestBlinkSetup(unittest.TestCase):
        bad_header = {'Host': self.blink._host, 'TOKEN_AUTH': 'BADTOKEN'}
        # pylint: disable=protected-access
        self.blink._auth_header = bad_header
-        # pylint: disable=protected-access
-        self.assertEqual(self.blink._auth_header, bad_header)
-        self.blink.summary_request()
-        # pylint: disable=protected-access
-        self.assertEqual(self.blink._auth_header, original_header)
+        self.assertEqual(self.blink.auth_header, bad_header)
+        api.request_homescreen(self.blink)
+        self.assertEqual(self.blink.auth_header, original_header)
+
+    @mock.patch('blinkpy.api.request_networks')
+    def test_multiple_networks(self, mock_net, mock_sess):
+        """Check that we handle multiple networks appropriately."""
+        mock_net.return_value = {
+            'networks': [{'id': 1234, 'account_id': 1111},
+                         {'id': 5678, 'account_id': 2222}]
+        }
+        self.blink.networks = {'0000': {'onboarded': False, 'name': 'foo'},
+                               '5678': {'onboarded': True, 'name': 'bar'},
+                               '1234': {'onboarded': False, 'name': 'test'}}
+        self.blink.get_ids()
+        self.assertTrue('5678' in self.blink.network_ids)
+        self.assertEqual(self.blink.account_id, 2222)
+
+    @mock.patch('blinkpy.api.request_networks')
+    def test_multiple_onboarded_networks(self, mock_net, mock_sess):
+        """Check that we handle multiple networks appropriately."""
+        mock_net.return_value = {
+            'networks': [{'id': 0000, 'account_id': 2222},
+                         {'id': 5678, 'account_id': 1111}]
+        }
+        self.blink.networks = {'0000': {'onboarded': False, 'name': 'foo'},
+                               '5678': {'onboarded': True, 'name': 'bar'},
+                               '1234': {'onboarded': True, 'name': 'test'}}
+        self.blink.get_ids()
+        self.assertTrue('5678' in self.blink.network_ids)
+        self.assertTrue('1234' in self.blink.network_ids)
+        self.assertEqual(self.blink.account_id, 1111)
+
+    @mock.patch('blinkpy.blinkpy.time.time')
+    def test_throttle(self, mock_time, mock_sess):
+        """Check throttling functionality."""
+        now = self.blink.refresh_rate + 1
+        mock_time.return_value = now
+        self.assertEqual(self.blink.last_refresh, None)
+        result = self.blink.check_if_ok_to_update()
+        self.assertEqual(self.blink.last_refresh, now)
+        self.assertEqual(result, True)
+        self.assertEqual(self.blink.check_if_ok_to_update(), False)
+        self.assertEqual(self.blink.last_refresh, now)
+
+    def test_sync_case_insensitive_dict(self, mock_sess):
+        """Check that we can access sync modules ignoring case."""
+        self.assertEqual(self.blink.sync['test'].name, 'test')
+        self.assertEqual(self.blink.sync['TEST'].name, 'test')
@@ -11,8 +11,7 @@ from unittest import mock
 from blinkpy import blinkpy
 from blinkpy.helpers.util import create_session, BlinkURLHandler
 from blinkpy.sync_module import BlinkSyncModule
-from blinkpy.camera import BlinkCamera
-from blinkpy.helpers.constants import BLINK_URL
+from blinkpy.camera import BlinkCamera, MAX_CLIPS
 import tests.mock_responses as mresp

 USERNAME = 'foobar'
@@ -39,177 +38,171 @@ class TestBlinkCameraSetup(unittest.TestCase):
        """Set up Blink module."""
        self.blink = blinkpy.Blink(username=USERNAME,
                                   password=PASSWORD)
-        self.camera_config = {
-            'device_id': 1111,
-            'name': 'foobar',
-            'armed': False,
-            'active': 'disarmed',
-            'thumbnail': '/test/image',
-            'video': '/test/clip/clip.mp4',
-            'temp': 70,
-            'battery': 3,
-            'notifications': 2,
-            'region_id': 'test'
-        }
-
        header = {
            'Host': 'abc.zxc',
            'TOKEN_AUTH': mresp.LOGIN_RESPONSE['authtoken']['authtoken']
        }
+        # pylint: disable=protected-access
+        self.blink._auth_header = header
        self.blink.session = create_session()
        self.blink.urls = BlinkURLHandler('test')
-        self.blink.network_id = '0000'
-        self.sync = BlinkSyncModule(self.blink, header, self.blink.urls)
+        self.blink.sync['test'] = BlinkSyncModule(self.blink, 'test', 1234)
+        self.camera = BlinkCamera(self.blink.sync['test'])
+        self.camera.name = 'foobar'
+        self.blink.sync['test'].cameras['foobar'] = self.camera

    def tearDown(self):
        """Clean up after test."""
        self.blink = None

-    @mock.patch('blinkpy.sync_module.BlinkSyncModule.camera_config_request',
-                return_value=CAMERA_CFG)
-    def test_camera_properties(self, mock_cfg, mock_sess):
-        """Tests all property set/recall."""
-        self.blink.urls = BlinkURLHandler('test')
+    def test_check_for_motion(self, mock_sess):
+        """Test check for motion function."""
+        self.assertEqual(self.camera.last_record, [])
+        self.assertEqual(self.camera.motion_detected, None)
+        self.camera.sync.record_dates = {'foobar': [1, 3, 2, 4]}
+        self.camera.check_for_motion()
+        self.assertEqual(self.camera.last_record, [4])
+        self.assertEqual(self.camera.motion_detected, False)
+        self.camera.sync.record_dates = {'foobar': [7, 1, 3, 4]}
+        self.camera.check_for_motion()
+        self.assertEqual(self.camera.last_record, [7, 4])
+        self.assertEqual(self.camera.motion_detected, True)
+        self.camera.check_for_motion()
+        self.assertEqual(self.camera.last_record, [7, 4])
+        self.assertEqual(self.camera.motion_detected, False)

-        self.sync.cameras = {
-            'foobar': BlinkCamera(self.camera_config, self.sync)
+    def test_max_motion_clips(self, mock_sess):
+        """Test that we only maintain certain number of records."""
+        for i in range(0, MAX_CLIPS):
+            self.camera.last_record.append(i)
+        self.camera.sync.record_dates['foobar'] = [MAX_CLIPS+2]
+        self.assertEqual(len(self.camera.last_record), MAX_CLIPS)
+        self.camera.check_for_motion()
+        self.assertEqual(self.camera.motion_detected, True)
+        self.assertEqual(len(self.camera.last_record), MAX_CLIPS)
+
+    def test_camera_update(self, mock_sess):
+        """Test that we can properly update camera properties."""
+        config = {
+            'name': 'new',
+            'camera_id': 1234,
+            'network_id': 5678,
+            'serial': '12345678',
+            'enabled': False,
+            'battery_voltage': 90,
+            'battery_state': 'ok',
+            'temperature': 68,
+            'wifi_strength': 4,
+            'thumbnail': '/thumb',
        }
+        self.camera.last_record = ['1']
+        self.camera.sync.all_clips = {'new': {'1': '/test.mp4'}}
+        mock_sess.side_effect = [
+            mresp.MockResponse({'temp': 71}, 200),
+            'test',
+            'foobar'
+        ]
+        self.camera.update(config)
+        self.assertEqual(self.camera.name, 'new')
+        self.assertEqual(self.camera.camera_id, '1234')
+        self.assertEqual(self.camera.network_id, '5678')
+        self.assertEqual(self.camera.serial, '12345678')
+        self.assertEqual(self.camera.motion_enabled, False)
+        self.assertEqual(self.camera.battery, 50)
+        self.assertEqual(self.camera.temperature, 68)
+        self.assertEqual(self.camera.temperature_c, 20)
+        self.assertEqual(self.camera.temperature_calibrated, 71)
+        self.assertEqual(self.camera.wifi_strength, 4)
+        self.assertEqual(self.camera.thumbnail,
+                         'https://rest.test.immedia-semi.com/thumb.jpg')
+        self.assertEqual(self.camera.clip,
+                         'https://rest.test.immedia-semi.com/test.mp4')
+        self.assertEqual(self.camera.image_from_cache, 'test')
+        self.assertEqual(self.camera.video_from_cache, 'foobar')

-        for name in self.sync.cameras:
-            camera = self.sync.cameras[name]
-            camera.update(self.camera_config, skip_cache=True)
-            self.assertEqual(camera.id, '1111')
-            self.assertEqual(camera.name, 'foobar')
-            self.assertEqual(camera.armed, False)
-            self.assertEqual(
-                camera.thumbnail,
-                "https://rest.test.{}/test/image.jpg".format(BLINK_URL)
-            )
-            self.assertEqual(
-                camera.clip,
-                "https://rest.test.{}/test/clip/clip.mp4".format(BLINK_URL)
-            )
-            self.assertEqual(camera.temperature, 68)
-            self.assertEqual(camera.temperature_c, 20.0)
-            self.assertEqual(camera.battery, 50)
-            self.assertEqual(camera.battery_string, "OK")
-            self.assertEqual(camera.notifications, 2)
-            self.assertEqual(camera.region_id, 'test')
-            self.assertEqual(camera.motion_enabled, True)
-            self.assertEqual(camera.wifi_strength, -30)
-
-        camera_config = self.camera_config
-        camera_config['active'] = 'armed'
-        camera_config['thumbnail'] = '/test2/image'
-        camera_config['video'] = '/test2/clip.mp4'
-        camera_config['temp'] = 60
-        camera_config['battery'] = 0
-        camera_config['notifications'] = 4
-        for name in self.sync.cameras:
-            camera = self.sync.cameras[name]
-            camera.update(camera_config, skip_cache=True)
-            self.assertEqual(camera.armed, True)
-            self.assertEqual(
-                camera.thumbnail,
-                "https://rest.test.{}/test2/image.jpg".format(BLINK_URL)
-            )
-            self.assertEqual(
-                camera.clip,
-                "https://rest.test.{}/test2/clip.mp4".format(BLINK_URL)
-            )
-            self.assertEqual(camera.temperature, 68)
-            self.assertEqual(camera.battery, 50)
-            self.assertEqual(camera.battery_string, "Low")
-            self.assertEqual(camera.notifications, 4)
-            camera_config['battery'] = -10
-            camera.update(camera_config, skip_cache=True)
-            self.assertEqual(camera.battery_string, "Unknown")
-
-    def test_camera_case(self, mock_sess):
-        """Tests camera case sensitivity."""
-        camera_object = BlinkCamera(self.camera_config, self.sync)
-        self.sync.cameras['foobar'] = camera_object
-        self.assertEqual(camera_object, self.sync.cameras['fOoBaR'])
-
-    @mock.patch('blinkpy.sync_module.BlinkSyncModule.camera_config_request',
-                return_value=CAMERA_CFG)
-    def test_camera_attributes(self, mock_cfg, mock_sess):
-        """Tests camera attributes."""
-        self.blink.urls = BlinkURLHandler('test')
-
-        self.sync.cameras = {
-            'foobar': BlinkCamera(self.camera_config, self.sync)
+    def test_thumbnail_not_in_info(self, mock_sess):
+        """Test that we grab thumbanil if not in camera_info."""
+        mock_sess.side_effect = [
+            mresp.MockResponse({'temp': 71}, 200),
+            'foobar',
+            'barfoo'
+        ]
+        self.camera.last_record = ['1']
+        self.camera.sync.record_dates['new'] = ['1']
+        self.camera.sync.all_clips = {'new': {'1': '/test.mp4'}}
+        config = {
+            'name': 'new',
+            'camera_id': 1234,
+            'network_id': 5678,
+            'serial': '12345678',
+            'enabled': False,
+            'battery_voltage': 90,
+            'battery_state': 'ok',
+            'temperature': 68,
+            'wifi_strength': 4,
+            'thumbnail': '',
        }
-
-        for name in self.sync.cameras:
-            camera = self.sync.cameras[name]
-            camera.update(self.camera_config, skip_cache=True)
-            camera_attr = camera.attributes
-            self.assertEqual(camera_attr['device_id'], '1111')
-            self.assertEqual(camera_attr['name'], 'foobar')
-            self.assertEqual(camera_attr['armed'], False)
-            self.assertEqual(
-                camera_attr['thumbnail'],
-                "https://rest.test.{}/test/image.jpg".format(BLINK_URL)
-            )
-            self.assertEqual(
-                camera_attr['video'],
-                "https://rest.test.{}/test/clip/clip.mp4".format(BLINK_URL)
-            )
-            self.assertEqual(camera_attr['temperature'], 68)
-            self.assertEqual(camera_attr['temperature_c'], 20.0)
-            self.assertEqual(camera_attr['battery'], 50)
-            self.assertEqual(camera_attr['notifications'], 2)
-            self.assertEqual(camera_attr['network_id'], '0000')
-            self.assertEqual(camera_attr['motion_enabled'], True)
-            self.assertEqual(camera_attr['wifi_strength'], -30)
-
-    @mock.patch('blinkpy.camera.BlinkCamera.image_refresh',
-                return_value='https://fake.url')
-    def test_camera_cache(self, img_refresh, mock_sess):
-        """Tests camera cache."""
-        update_vals = {
-            'name': 'foobar',
-            'active': 'disabled',
-            'video': '/clip.mp4',
-            'thumbnail': '/image',
-            'battery': 3,
-            'notifications': 1,
+        self.camera.sync.homescreen = {
+            'devices': [
+                {'foo': 'bar'},
+                {'device_type': 'foobar'},
+                {'device_type': 'camera',
+                 'name': 'new',
+                 'thumbnail': '/new/thumb'}
+            ]
        }
-        self.sync.cameras = {
-            'foobar': BlinkCamera(self.camera_config, self.sync)
+        self.camera.update(config)
+        self.assertEqual(self.camera.thumbnail,
+                         'https://rest.test.immedia-semi.com/new/thumb.jpg')
+
+    def test_no_thumbnails(self, mock_sess):
+        """Tests that thumbnail is 'None' if none found."""
+        mock_sess.return_value = 'foobar'
+        self.camera.last_record = ['1']
+        self.camera.sync.record_dates['new'] = ['1']
+        self.camera.sync.all_clips = {'new': {'1': '/test.mp4'}}
+        config = {
+            'name': 'new',
+            'camera_id': 1234,
+            'network_id': 5678,
+            'serial': '12345678',
+            'enabled': False,
+            'battery_voltage': 90,
+            'battery_state': 'ok',
+            'temperature': 68,
+            'wifi_strength': 4,
+            'thumbnail': '',
        }
+        self.camera.sync.homescreen = {
+            'devices': []
+        }
+        with self.assertLogs() as logrecord:
+            self.camera.update(config)
+        self.assertEqual(self.camera.thumbnail, None)
+        self.assertEqual(
+            logrecord.output,
+            ["ERROR:blinkpy.camera:Could not retrieve calibrated temperature.",
+             "ERROR:blinkpy.camera:Could not find thumbnail for camera new"]
+        )

-        test_image = 'https://rest.test.immedia-semi.com/image.jpg'
-        test_clip = 'https://rest.test.immedia-semi.com/clip.mp4'
-
-        for name, camera in self.sync.cameras.items():
-            # Check that no cache returns None
-            self.assertEqual(camera.name, name)
-            self.assertEqual(camera.image_from_cache, None)
-            self.assertEqual(camera.video_from_cache, None)
-
-            # Now, call an update with a new thumbnail to see if we update
-            self.sync.records = []
-            # pylint: disable=protected-access
-            camera.update(update_vals)
-            self.assertEqual(camera.thumbnail, test_image)
-            self.assertEqual(camera.image_from_cache.status_code, 200)
-
-            # Now update the clip
-            self.sync.record_dates = {camera.name: ['7', '1', '4', '3']}
-            self.assertEqual(camera.last_record, list())
-            camera.update(update_vals)
-            self.assertEqual(camera.clip, test_clip)
-            self.assertEqual(camera.last_record, list('7'))
-            # First update should be false
-            self.assertEqual(camera.motion_detected, False)
-            self.sync.record_dates[camera.name].append('88')
-            camera.update(update_vals)
-            self.assertEqual(camera.last_record, ['88', '7'])
-            self.assertEqual(camera.motion_detected, True)
-            self.assertEqual(camera.video_from_cache.status_code, 200)
-            # Next update shouldn't change records, and motion_dected=False
-            camera.update(update_vals)
-            self.assertEqual(camera.motion_detected, False)
-            self.assertEqual(camera.video_from_cache.status_code, 200)
+    def test_no_video_clips(self, mock_sess):
+        """Tests that we still proceed with camera setup with no videos."""
+        mock_sess.return_value = 'foobar'
+        config = {
+            'name': 'new',
+            'camera_id': 1234,
+            'network_id': 5678,
+            'serial': '12345678',
+            'enabled': False,
+            'battery_voltage': 90,
+            'battery_state': 'ok',
+            'temperature': 68,
+            'wifi_strength': 4,
+            'thumbnail': '/foobar',
+        }
+        self.camera.sync.homescreen = {
+            'devices': []
+        }
+        self.camera.update(config, force_cache=True)
+        self.assertEqual(self.camera.clip, None)
+        self.assertEqual(self.camera.video_from_cache, None)
@@ -10,28 +10,7 @@ USERNAME = 'foobar'
 PASSWORD = 'deadbeef'


-class MockSyncModule(BlinkSyncModule):
-    """Mock http requests from sync module."""
-
-    def __init__(self, blink, header):
-        """Create mock sync module instance."""
-        super().__init__(blink, header)
-        self.blink = blink
-        self.header = header
-        self.return_value = None
-        self.return_value2 = None
-
-    def http_get(self, url, stream=False, json=True):
-        """Mock get request."""
-        if stream and self.return_value2 is not None:
-            return self.return_value2
-        return self.return_value
-
-    def http_post(self, url):
-        """Mock post request."""
-        return self.return_value
-
-
+@mock.patch('blinkpy.api.http_req')
 class TestBlinkSyncModule(unittest.TestCase):
    """Test BlinkSyncModule functions in blinkpy."""

@@ -45,63 +24,77 @@ class TestBlinkSyncModule(unittest.TestCase):
            'TOKEN_AUTH': 'foobar123'
        }
        self.blink.urls = blinkpy.BlinkURLHandler('test')
-        self.config = {
-            'device_id': 1111,
-            'name': 'foobar',
-            'armed': False,
-            'active': 'disabled',
-            'thumbnail': '/test',
-            'video': '/test.mp4',
-            'temp': 80,
-            'battery': 3,
-            'notifications': 2,
-            'region_id': 'test',
-            'device_type': 'camera'
-        }
-        self.blink.sync = MockSyncModule(
-            self.blink, self.blink._auth_header)
-
-        self.camera = BlinkCamera(self.config, self.blink.sync)
+        self.blink.sync['test'] = BlinkSyncModule(self.blink, 'test', '1234')
+        self.camera = BlinkCamera(self.blink.sync)

    def tearDown(self):
        """Clean up after test."""
        self.blink = None
-        self.config = {}
        self.camera = None

-    def test_get_videos(self):
+    def test_get_events(self, mock_resp):
+        """Test get events function."""
+        mock_resp.return_value = {'event': True}
+        self.assertEqual(self.blink.sync['test'].get_events(), True)
+
+    def test_get_camera_info(self, mock_resp):
+        """Test get camera info function."""
+        mock_resp.return_value = {'devicestatus': True}
+        self.assertEqual(self.blink.sync['test'].get_camera_info(), True)
+
+    def test_get_videos_one_page(self, mock_resp):
        """Test video access."""
-        self.blink.sync.return_value = [
+        mock_resp.return_value = [
            {
                'camera_name': 'foobar',
-                'address': '/new/test.mp4',
+                'address': '/test/clip_1900_01_01_12_00_00AM.mp4',
                'thumbnail': '/test/thumb'
            }
        ]
-        self.blink.sync.get_videos()
-        self.assertEqual(self.blink.sync.videos['foobar'][0]['clip'],
-                         '/new/test.mp4')
-        self.assertEqual(self.blink.sync.videos['foobar'][0]['thumb'],
-                         '/test/thumb')
+        expected_videos = {'foobar': [
+            {'clip': '/test/clip_1900_01_01_12_00_00AM.mp4',
+             'thumb': '/test/thumb'}]}
+        expected_recs = {'foobar': ['1900_01_01_12_00_00AM']}
+        expected_clips = {'foobar': {
+            '1900_01_01_12_00_00AM': '/test/clip_1900_01_01_12_00_00AM.mp4'}}
+        self.blink.sync['test'].get_videos(start_page=0, end_page=0)
+        self.assertEqual(self.blink.sync['test'].videos, expected_videos)
+        self.assertEqual(self.blink.sync['test'].record_dates, expected_recs)
+        self.assertEqual(self.blink.sync['test'].all_clips, expected_clips)

-    @mock.patch('blinkpy.blinkpy.Blink.refresh')
-    @mock.patch('blinkpy.sync_module.BlinkSyncModule._summary_request')
-    @mock.patch('blinkpy.sync_module.BlinkSyncModule._video_request')
-    def test_get_cameras(self, vid_req, req, refresh):
-        """Test camera extraction."""
-        refresh.return_value = True
-        req.return_value = {'devices': [self.config]}
-        vid_req.return_value = [
+    def test_get_videos_multi_page(self, mock_resp):
+        """Test video access with multiple pages."""
+        mock_resp.return_value = [
            {
-                'camera_name': 'foobar',
-                'address': '/new.mp4',
-                'thumbnail': '/new'
+                'camera_name': 'test',
+                'address': '/foo/bar_1900_01_01_12_00_00AM.mp4',
+                'thumbnail': '/foobar'
            }
        ]
-        self.blink.sync.get_cameras()
-        self.assertTrue('foobar' in self.blink.sync.cameras)
+        self.blink.sync['test'].get_videos()
+        self.assertEqual(mock_resp.call_count, 2)
+        mock_resp.reset_mock()
+        self.blink.sync['test'].get_videos(start_page=0, end_page=9)
+        self.assertEqual(mock_resp.call_count, 10)

-    def test_video_count(self):
-        """Test video count function."""
-        self.blink.sync.return_value = {'count': 1}
-        self.assertEqual(self.blink.sync.video_count, 1)
+    def test_sync_start(self, mock_resp):
+        """Test sync start function."""
+        mock_resp.side_effect = [
+            {'syncmodule': {
+                'id': 1234,
+                'network_id': 5678,
+                'serial': '12345678',
+                'status': 'foobar'}},
+            {'event': True},
+            {},
+            {},
+            {'devicestatus': {}},
+            None,
+            None
+        ]
+        self.blink.sync['test'].start()
+        self.assertEqual(self.blink.sync['test'].name, 'test')
+        self.assertEqual(self.blink.sync['test'].sync_id, 1234)
+        self.assertEqual(self.blink.sync['test'].network_id, 5678)
+        self.assertEqual(self.blink.sync['test'].serial, '12345678')
+        self.assertEqual(self.blink.sync['test'].status, 'foobar')
@@ -1,5 +1,5 @@
 [tox]
-envlist = build, py34, py35, py36, py37, lint
+envlist = build, py35, py36, py37, py38, lint
 skip_missing_interpreters = True
 skipsdist = True
Author	SHA1	Message	Date
Kevin FronczakandGitHub	853ccbce79	Merge pull request #136 from fronzbot/dev 0.11.1	2019-01-02 09:19:08 -08:00
Kevin Fronczak	8153fab887	Version bump	2019-01-02 11:59:27 -05:00
Kevin FronczakandGitHub	216541288e	Merge pull request #135 from fronzbot/link-fix Fixed link formatting	2019-01-02 08:53:08 -08:00
Kevin FronczakandGitHub	a855cceb05	Merge pull request #134 from fronzbot/calibrated-temperature Add calibrated temperature property (fixes #133)	2019-01-02 08:52:56 -08:00
Kevin Fronczak	d9991d5acd	Fixed link formatting (fixes #132 )	2019-01-02 11:45:48 -05:00
Kevin Fronczak	2ee2ae7d4e	Add calibrated temperature property (fixes #133 )	2019-01-02 11:35:40 -05:00
Kevin FronczakandGitHub	04c2be9087	Add changes from source repo	2018-11-29 15:23:28 -05:00
Kevin Fronczak	34fc9bc527	dev version bump	2018-11-23 20:32:12 -05:00
Kevin FronczakandGitHub	1a24e1896f	Merge pull request #129 from fronzbot/dev 0.11.0	2018-11-23 20:27:40 -05:00
Kevin Fronczak	1d67764dc8	version bump	2018-11-23 20:09:46 -05:00
Kevin Fronczak	8f250d204f	Fixed docs for real	2018-11-23 20:08:21 -05:00
Kevin Fronczak	643ae8c387	trying again	2018-11-23 19:44:25 -05:00
Kevin Fronczak	f9615a2d90	fix docs again	2018-11-23 19:39:23 -05:00
Kevin Fronczak	f7a3b1d0ef	Update docs	2018-11-23 19:37:38 -05:00
Kevin FronczakandGitHub	94aed43d2e	Merge pull request #128 from fronzbot/fix-sync-refresh Fix broken sync refresh	2018-11-23 19:25:39 -05:00
Kevin Fronczak	90f30deea8	Fix broken sync refresh	2018-11-23 19:20:18 -05:00
Kevin FronczakandGitHub	1bbc71ef17	Merge pull request #125 from fronzbot/multi-sync-support Support for Multiple Sync Modules	2018-11-23 18:23:03 -05:00
Kevin Fronczak	c84a0deb5f	Add sync parent to attributes	2018-11-23 18:08:58 -05:00
Kevin Fronczak	ece65a9158	Fix linting errors	2018-11-23 17:52:12 -05:00
Kevin Fronczak	5a8af75a5b	Added cameras dict to blink to keep track of ALL cameras	2018-11-23 17:47:44 -05:00
Kevin Fronczak	84f987d29c	Updated to reflect multi-sync unit support	2018-11-23 16:46:20 -05:00
Kevin Fronczak	ed25745deb	Added case insesnitive dict, changed sync module name to network name (to mimic app)	2018-11-23 16:36:17 -05:00
Kevin Fronczak	a1fd05735e	Initial support for multiple sync modules	2018-11-23 14:22:54 -05:00
Kevin FronczakandGitHub	5a9f8f6dfc	Merge pull request #124 from fronzbot/improve-contribution-doc Improve contribution instructions	2018-11-21 10:08:31 -05:00
Kevin FronczakandGitHub	2639055372	Merge pull request #123 from fronzbot/update-readme Update README.rst	2018-11-21 10:03:18 -05:00
Kevin FronczakandGitHub	c53b2bd777	Improve contribution instructions	2018-11-21 10:02:12 -05:00
Kevin FronczakandGitHub	db29bae140	Broke out blink home assistant links	2018-11-21 09:38:23 -05:00
Kevin FronczakandGitHub	52f1fde47a	Bad link format	2018-11-21 09:37:27 -05:00
Kevin FronczakandGitHub	e705fbd403	Update README.rst	2018-11-21 09:36:36 -05:00
Kevin FronczakandGitHub	2d437b4462	Merge pull request #122 from fronzbot/dev-bump Dev version bump	2018-11-20 21:53:09 -05:00
Kevin FronczakandGitHub	ae946dbb53	Merge pull request #121 from fronzbot/dev 0.10.3	2018-11-20 21:47:42 -05:00
Kevin Fronczak	ea2b22dbf0	Dev version bump	2018-11-20 21:46:38 -05:00
Kevin Fronczak	7ee57b2c6b	Version bump	2018-11-20 21:40:18 -05:00
Kevin FronczakandGitHub	ccd393a533	Merge pull request #120 from fronzbot/fix-bad-logging Logging fixes	2018-11-20 21:26:32 -05:00
Kevin Fronczak	1b571c7d4b	Fix logging string format	2018-11-20 21:21:42 -05:00
Kevin Fronczak	4b91fcb615	Improved video page debug logging	2018-11-20 21:20:35 -05:00
Kevin Fronczak	1e0d069dcd	Fix linting errors	2018-11-20 21:16:41 -05:00
Kevin Fronczak	92088779e0	Added debug logging	2018-11-20 21:15:01 -05:00
Kevin Fronczak	a6e02433b6	Fix #113	2018-11-20 21:12:12 -05:00
Kevin FronczakandGitHub	1aa5dc1c71	Merge pull request #119 from md-reddevil/dev Use network_status instead of homescreen	2018-11-19 12:49:47 -05:00
Kevin Fronczak	3c78923853	Fix linting error (line was too long)	2018-11-19 12:46:01 -05:00
Kevin Fronczak	d17183a152	Fixed broken sync module test	2018-11-19 12:42:54 -05:00
Kevin Fronczak GitHub md-reddevil	2e5e343913	Update blinkpy/sync_module.py fix linting Co-Authored-By: md-reddevil <16707502+md-reddevil@users.noreply.github.com>	2018-11-18 14:06:21 +02:00
md-reddevilandGitHub	cec6035d23	fix tests after API changes	2018-11-18 14:01:22 +02:00
md-reddevil	bdc760608e	fix indentation	2018-11-17 18:20:28 +02:00
md-reddevil	4f41899338	fix indentation	2018-11-17 18:18:57 +02:00
md-reddevil	557f21b637	Use network_status instead of homescreen Use network_status to check if System is armed or disarmed	2018-11-17 18:12:26 +02:00
Kevin FronczakandGitHub	4241b50002	Merge pull request #118 from md-reddevil/dev API: Fix Command Status method add a new method to manage correctly the System status	2018-11-14 09:01:10 -05:00
md-reddevilandGitHub	8b0507f1a7	fix indentation for method request_command_status	2018-11-14 15:57:46 +02:00
md-reddevilandGitHub	d62429189e	Fix formatting issue in api.py	2018-11-14 11:04:40 +02:00
md-reddevilandGitHub	c83b173a17	update description of the networks method	2018-11-14 09:55:17 +02:00
md-reddevilandGitHub	9c1974c227	Add method to request the Network/System status Home screen method returns just the information about last added System(network). The method "request_network_status", should replace the homescreen method in order to obtain all the information about a system.	2018-11-14 09:39:44 +02:00
md-reddevilandGitHub	c621ba3150	fix check command status	2018-11-14 09:34:25 +02:00
Kevin FronczakandGitHub	7710e3f972	Errant whitespace	2018-10-30 21:08:43 -04:00
Kevin Fronczak	a4f65c1102	dev version bump	2018-10-30 20:24:39 -04:00
Kevin FronczakandGitHub	80c6444c2e	Merge pull request #112 from fronzbot/dev 0.10.2	2018-10-30 20:22:08 -04:00
Kevin Fronczak	2022b80f9d	Version bump	2018-10-30 20:16:37 -04:00
Kevin FronczakandGitHub	7e9900c5f5	Merge pull request #111 from fronzbot/fix-typo Reformatted log message when multiple networks detected.	2018-10-30 20:07:03 -04:00
Kevin Fronczak	132df9e8c4	Fixed wrong string format	2018-10-30 19:58:13 -04:00
Kevin Fronczak	07e3549306	Reformatted log message when multiple networks detected.	2018-10-30 19:48:08 -04:00
Kevin FronczakandGitHub	e0fa0a0cde	Merge pull request #110 from fronzbot/upgrade-requests Upgraded requests due to security issue prior to 2.20.0	2018-10-30 19:47:38 -04:00
Kevin Fronczak	31771ca87d	Upgraded requests due to security issue prior to 2.20.0	2018-10-30 19:42:35 -04:00
Kevin FronczakandGitHub	1b898398a7	Fix rst lint error	2018-10-26 11:09:43 -04:00
Kevin FronczakandGitHub	d8fcb679cd	Add python versioning badge	2018-10-26 11:05:00 -04:00
Kevin Fronczak	72a5ccb769	dev version bump	2018-10-18 13:20:34 -04:00
Kevin FronczakandGitHub	e872fc9ce5	Merge pull request #105 from fronzbot/dev 0.10.1	2018-10-18 13:19:49 -04:00
Kevin Fronczak	51961474b6	Version bump	2018-10-18 13:10:42 -04:00
Kevin FronczakandGitHub	8be35dab30	Merge pull request #104 from fronzbot/fix-warning Changed 'warning' to 'info' in camera	2018-10-18 13:05:17 -04:00
Kevin FronczakandGitHub	0ab17aede8	Merge pull request #103 from fronzbot/reauth-bug-fix Reauth bug fix	2018-10-18 13:01:52 -04:00
Kevin Fronczak	6db8a151f8	Changed 'warning' to 'info' and added an error if trying to save video that doesn't exist	2018-10-18 12:58:43 -04:00
Kevin Fronczak	1a12eb367f	Added additional re-auth attempt in try/except	2018-10-18 12:49:18 -04:00
Kevin Fronczak	f61f68a5c2	Fix reauthorization bug	2018-10-18 12:23:23 -04:00
Kevin FronczakandGitHub	0781d79ca7	Update bug_report.md	2018-10-17 11:18:29 -04:00
Kevin FronczakandGitHub	4ffdf499c9	Update PULL_REQUEST_TEMPLATE.md	2018-10-17 10:28:40 -04:00
Kevin FronczakandGitHub	f8f318c203	Update bug_report.md	2018-10-17 10:26:28 -04:00
Kevin Fronczak	59540818f9	Add feature request template	2018-10-17 10:24:52 -04:00
Kevin Fronczak	b2b531ad3c	Add issue template	2018-10-17 10:22:59 -04:00
Kevin FronczakandGitHub	4e6957a772	Merge pull request #100 from fronzbot/dev Release 0.10.0	2018-10-16 17:43:21 -04:00
Kevin FronczakandGitHub	e747fb1010	Merge branch 'master' into dev	2018-10-16 17:28:34 -04:00
Kevin FronczakandGitHub	9d110cdd72	Merge pull request #99 from fronzbot/0.10.0 Version bump	2018-10-16 16:53:51 -04:00
Kevin Fronczak	6fa0eacff3	Fix trailing whitespace	2018-10-16 16:26:47 -04:00
Kevin Fronczak	7ce924f52e	Version bump	2018-10-16 16:24:39 -04:00
Kevin FronczakandGitHub	91b3c2a64b	Merge pull request #98 from fronzbot/update-travis Added py38 to tox and travis	2018-10-16 16:19:11 -04:00
Kevin FronczakandGitHub	97579400b1	Merge pull request #97 from fronzbot/multi-network-support Adds multi-network handling (Thanks @dgomes and @dib0 )	2018-10-16 16:17:48 -04:00
Kevin Fronczak	63b01dde14	Removed condition on py38-dev	2018-10-16 15:43:02 -04:00
Kevin Fronczak	d9b996ab02	Added py38	2018-10-16 15:41:12 -04:00
Kevin Fronczak	3af105edf5	Check for 'None' clip before saving to cache	2018-10-16 15:26:15 -04:00
Kevin Fronczak	5057592b0d	Fix blink_functions test	2018-10-16 13:52:09 -04:00
Kevin Fronczak	13bb819e07	Added network checking	2018-10-16 13:28:44 -04:00
Kevin Fronczak	eefa9252e5	[WIP] Adding in network checking	2018-10-16 12:27:57 -04:00
Kevin FronczakandGitHub	c5b84ac357	Merge pull request #96 from fronzbot/update-changes-rst Add changes from PR #94	2018-10-16 11:42:12 -04:00
Kevin Fronczak	787256ce66	Fixed bad linkwq	2018-10-16 11:28:18 -04:00
Kevin Fronczak	2f1877267f	Add changes from PR #94	2018-10-16 11:23:31 -04:00
Kevin FronczakandGitHub	9c34fc9281	Merge pull request #94 from fronzbot/breakout-api-calls Improve API calls	2018-10-16 11:18:52 -04:00
Kevin Fronczak	1b9bba7c3d	Modified tests, added homescreen thumbnail backup Fixes #93	2018-10-15 20:52:05 -04:00
Kevin FronczakandGitHub	123867ecd8	Merge pull request #95 from fronzbot/update-changes Updated CHANGES to reflect recent releases	2018-10-14 08:54:01 -04:00
Kevin Fronczak	26d900897b	Updated CHANGES to reflect recent releases	2018-10-14 00:27:59 -04:00
Kevin Fronczak	f7a5b5cc03	Tests now working - Simplified tests a bit	2018-10-14 00:12:44 -04:00
Kevin Fronczak	7fd822caf2	Removed old api calls, using new api module - Tests currently broken - wifi_strength is now a number of bars rather than dBm level - camera no longer has armed or status attributes - added serial numbers for sync and cameras	2018-10-13 20:38:01 -04:00
Kevin Fronczak	01c6f0b12b	Add all requests to single api file	2018-10-13 16:49:31 -04:00
Kevin FronczakandGitHub	62c89a925e	Dev version bump	2018-09-28 15:00:51 -04:00