Revert "Added constants and error file to clean stuff up"

This reverts commit 69b7be7.

Author: fronzbot

blinkpy.py

@@ -5,20 +5,24 @@
 blinkpy by Kevin Fronczak - A Blink camera Python library
 https://github.com/fronzbot/blinkpy
 Original protocol hacking by MattTW : https://github.com/MattTW/BlinkMonitorProtocol
+
 Published under the MIT license - See LICENSE file for more details.
+
 "Blink Wire-Free HS Home Monitoring & Alert Systems" is a trademark owned by Immedia Inc., see www.blinkforhome.com for more information.
 I am in no way affiliated with Blink, nor Immedia Inc.
 '''
 
+import logging
 import requests
 import getpass
 import json
-import errors as ERROR
-from constants import (BLINK_URL, LOGIN_URL,
-                       BASE_URL, DEFAULT_URL,
-                       HOME_URL, EVENT_URL,
-                       NETWORK_URL, NETWORKS_URL,
-                       ONLINE)
+
+BLINK_URL = 'immedia-semi.com'
+LOGIN_URL = 'https://prod.' + BLINK_URL + '/login'
+BASE_URL = 'https://prod.' + BLINK_URL
+DEFAULT_URL = 'prod.' + BLINK_URL
+
+logger = logging.getLogger('blinkpy')
 
 
 def _request(url, data=None, headers=None, type='get', stream=False, json=True):
@@ -30,18 +34,18 @@ def _request(url, data=None, headers=None, type='get', stream=False, json=True):
     elif type is 'get' and not json:
         response = requests.get(url, headers=headers, stream=stream)
     else:
-        raise BlinkException(ERROR.REQUEST)
+        raise ValueError("Cannot perform requests of type " + type)
 
     if json and 'message' in response.keys():
-        raise BlinkAuthenticationException((response['code'], response['message']))
+        raise BlinkAuthenticationException(response['code'], response['message'])
 
     return response
 
 
 class BlinkException(Exception):
-    def __init__(self, errcode):
-        self.id = errcode[0]
-        self.message = errcode[1]
+    def __init__(self, id, message):
+        self.id = id
+        self.message = message
 
 
 class BlinkAuthenticationException(BlinkException):
@@ -181,7 +185,7 @@ def update(self, values):
         self._NOTIFICATIONS = values['notifications']
 
     def image_refresh(self):
-        url = HOME_URL
+        url = BASE_URL + '/homescreen'
         response = _request(url, headers=self._HEADER, type='get')['devices']
         for element in response:
             try:
@@ -254,17 +258,18 @@ def region_id(self):
     @property
     def events(self):
         """Gets all events on server"""
-        url = EVENT_URL + self._NETWORKID
+        url = BASE_URL + '/events/network/' + self._NETWORKID
         headers = self._AUTH_HEADER
         self._EVENTS = _request(url, headers=headers, type='get')['event']
         return self._EVENTS
 
     @property
     def online(self):
         """Returns True or False depending on if sync module is online/offline"""
-        url = NETWORK_URL + self._NETWORKID + '/syncmodules'
+        url = BASE_URL + 'network/' + self._NETWORKID + '/syncmodules'
         headers = self._AUTH_HEADER
-        return ONLINE[_request(url, headers=headers, type='get')['syncmodule']['status']]
+        online_dict = {'online': True, 'offline': False}
+        return online_dict[_request(url, headers=headers, type='get')['syncmodule']['status']]
 
     def last_motion(self):
         """Finds last motion of each camera"""
@@ -292,7 +297,7 @@ def arm(self, value):
             value_to_append = 'arm'
         else:
             value_to_append = 'disarm'
-        url = NETWORK_URL + self._NETWORKID + '/' + value_to_append
+        url = BASE_URL + '/network/' + self._NETWORKID + '/' + value_to_append
         _request(url, headers=self._AUTH_HEADER, type='post')
 
     def refresh(self):
@@ -313,7 +318,7 @@ def get_summary(self):
         headers = self._AUTH_HEADER
 
         if self._AUTH_HEADER is None:
-            raise BlinkException(ERROR.AUTH_TOKEN)
+            raise BlinkException(0, "Authentication header incorrect.  Are you sure you logged in and received your token?")
 
         return _request(url, headers=headers, type='get')
 
@@ -332,16 +337,16 @@ def get_cameras(self):
     def set_links(self):
         """Sets access links and required headers for each camera in system"""
         for name, camera in self._CAMERAS.items():
-            image_url = NETWORK_URL + self._NETWORKID + '/camera/' + camera.id + '/thumbnail'
-            arm_url = NETWORK_URL + self._NETWORKID + '/camera/' + camera.id + '/'
+            image_url = BASE_URL + '/network/' + self._NETWORKID + '/camera/' + camera.id + '/thumbnail'
+            arm_url = BASE_URL + '/network/' + self._NETWORKID + '/camera/' + camera.id + '/'
             camera.image_link = image_url
             camera.arm_link = arm_url
             camera.header = self._AUTH_HEADER
 
     def setup_system(self):
         """Method logs in and sets auth token and network ids for future requests"""
         if self._username is None or self._password is None:
-            raise BlinkAuthenticationException(ERROR.AUTHENTICATE)
+            raise BlinkAuthenticationException(3, "Cannot authenticate since either password or username has not been set")
 
         self.get_auth_token()
         self.get_ids()
@@ -356,9 +361,9 @@ def login(self):
     def get_auth_token(self):
         """Retrieves the authentication token from Blink"""
         if not isinstance(self._username, str):
-            raise BlinkAuthenticationException(ERROR.USERNAME)
+            raise BlinkAuthenticationException(0, "Username must be a string")
         if not isinstance(self._password, str):
-            raise BlinkAuthenticationException(ERROR.PASSWORD)
+            raise BlinkAuthenticationException(0, "Password must be a string")
 
         headers = {'Host': DEFAULT_URL,
                    'Content-Type': 'application/json'
@@ -378,11 +383,11 @@ def get_auth_token(self):
 
     def get_ids(self):
         """Sets the network ID and Account ID"""
-        url = NETWORKS_URL
+        url = BASE_URL + '/networks'
         headers = self._AUTH_HEADER
 
         if self._AUTH_HEADER is None:
-            raise BlinkException(ERROR.AUTH_TOKEN)
+            raise BlinkException(0, "Authentication header incorrect.  Are you sure you logged in and received your token?")
 
         response = _request(url, headers=headers, type='get')
         self._NETWORKID = str(response['networks'][0]['id'])

constants.py

@@ -1,24 +1,26 @@
 # -*- coding: utf-8 -*-
 
 from setuptools import setup
-from constants import (__version__, PROJECT_PACKAGE_NAME,
-                       PROJECT_LICENSE, PROJECT_URL,
-                       PROJECT_EMAIL, PROJECT_DESCRIPTION,
-                       PROJECT_CLASSIFIERS, PROJECT_AUTHOR,
-                       PROJECT_LONG_DESCRIPTION)
 
 setup(
-    name = PROJECT_PACKAGE_NAME,
-    version = __version__,
-    description = PROJECT_DESCRIPTION,
-    long_description = PROJECT_LONG_DESCRIPTION,
-    author = PROJECT_AUTHOR,
-    author_email = PROJECT_EMAIL,
-    license = PROJECT_LICENSE,
-    url = PROJECT_URL,
-    platforms = 'any',
-    py_modules = ['blinkpy'],
-    install_requires = ['requests>=2,<3'],
-    test_suite = 'tests',
-    classifiers = PROJECT_CLASSIFIERS
+    name = 'blinkpy',
+    version = '0.4.4',
+    description = 'A Blink camera Python library',
+    long_description='A library that communicates with Blink cameras',
+    author = 'Kevin Fronczak',
+    author_email = "kfronczak@gmail.com",
+    license='MIT',
+    url = 'https://github.com/fronzbot/blinkpy',
+    py_modules=['blinkpy'],
+    install_requires=['requests>=2,<3'],
+    classifiers=[
+      'Development Status :: 4 - Beta',
+      'Intended Audience :: Developers',
+      'License :: OSI Approved :: MIT License',
+      'Programming Language :: Python :: 3.4',
+      'Programming Language :: Python :: 3.5',
+      'Programming Language :: Python :: 3.6',
+      'Environment :: Plugins',
+      'Environment :: Web Environment'
+      ]
 )