Rename uvcclient.py to nvr.py for clarity

tests/test_cli.py

@@ -2,7 +2,7 @@
 
 import mock
 
-from uvcclient import uvcclient
+from uvcclient import nvr
 
 
 class TestCliUtils(unittest.TestCase):
@@ -19,7 +19,7 @@ class TestCliUtils(unittest.TestCase):
     @mock.patch('os.getenv')
     def test_get_auth_combined(self, mock_getenv):
         mock_getenv.side_effect = self.FAKE_ENV1.get
-        host, port, key, path = uvcclient.get_auth_from_env()
+        host, port, key, path = nvr.get_auth_from_env()
         self.assertEqual('192.168.1.1', host)
         self.assertEqual(7080, port)
         self.assertEqual('foo', key)
@@ -28,7 +28,7 @@ def test_get_auth_combined(self, mock_getenv):
     @mock.patch('os.getenv')
     def test_get_separate(self, mock_getenv):
         mock_getenv.side_effect = self.FAKE_ENV2.get
-        host, port, key, path = uvcclient.get_auth_from_env()
+        host, port, key, path = nvr.get_auth_from_env()
         self.assertEqual('192.168.1.2', host)
         self.assertEqual(7443, port)
         self.assertEqual('myKey', key)

tests/test_client.py

@@ -9,7 +9,7 @@
 
 import mock
 
-from uvcclient import uvcclient
+from uvcclient import nvr
 
 
 class TestClientLowLevel(unittest.TestCase):
@@ -29,7 +29,7 @@ def cleanUp(self):
             i.stop()
 
     def test_uvc_request_get(self):
-        client = uvcclient.UVCRemote('foo', 7080, 'key')
+        client = nvr.UVCRemote('foo', 7080, 'key')
         conn = httplib.HTTPConnection.return_value
         resp = conn.getresponse.return_value
         resp.status = 200
@@ -44,7 +44,7 @@ def test_uvc_request_get(self):
                                              None, headers)
 
     def test_uvc_request_put(self):
-        client = uvcclient.UVCRemote('foo', 7080, 'key')
+        client = nvr.UVCRemote('foo', 7080, 'key')
         conn = httplib.HTTPConnection.return_value
         resp = conn.getresponse.return_value
         resp.status = 200
@@ -61,15 +61,15 @@ def test_uvc_request_put(self):
                                              'foobar', headers)
 
     def test_uvc_request_failed(self):
-        client = uvcclient.UVCRemote('foo', 7080, 'key')
+        client = nvr.UVCRemote('foo', 7080, 'key')
         conn = httplib.HTTPConnection.return_value
         resp = conn.getresponse.return_value
         resp.status = 404
         result = client._uvc_request('/bar', method='PUT', data='foobar')
         self.assertEqual(None, result)
 
     def test_uvc_request_deflated(self):
-        client = uvcclient.UVCRemote('foo', 7080, 'key')
+        client = nvr.UVCRemote('foo', 7080, 'key')
         conn = httplib.HTTPConnection.return_value
         resp = conn.getresponse.return_value
         resp.status = 200
@@ -104,7 +104,7 @@ def fake_req(path, method='GET', data=None):
                 self.assertEqual(json.dumps(fake_resp2['data'][0]), data)
                 return fake_resp2
 
-        client = uvcclient.UVCRemote('foo', 7080, 'key')
+        client = nvr.UVCRemote('foo', 7080, 'key')
         with mock.patch.object(client, '_uvc_request') as mock_r:
             mock_r.side_effect = fake_req
             client.set_recordmode('uuid', 'full', chan='medium')
@@ -123,7 +123,7 @@ def fake_req(path, method='GET', data=None):
     def test_get_picture_settings(self):
         fake_resp = {'data': [{'ispSettings': {'settingA': 1,
                                                'settingB': 'foo'}}]}
-        client = uvcclient.UVCRemote('foo', 7080, 'key')
+        client = nvr.UVCRemote('foo', 7080, 'key')
         with mock.patch.object(client, '_uvc_request') as mock_r:
             mock_r.return_value = fake_resp
             self.assertEqual({'settingA': 1, 'settingB': 'foo'},
@@ -132,7 +132,7 @@ def test_get_picture_settings(self):
     def test_set_picture_settings(self):
         fake_resp = {'data': [{'ispSettings': {'settingA': 1,
                                                'settingB': 'foo'}}]}
-        client = uvcclient.UVCRemote('foo', 7080, 'key')
+        client = nvr.UVCRemote('foo', 7080, 'key')
         newvals = {'settingA': 2, 'settingB': 'foo'}
         with mock.patch.object(client, '_uvc_request') as mock_r:
             mock_r.return_value = fake_resp
@@ -146,7 +146,7 @@ def test_set_picture_settings_coerces(self):
                                                'settingB': 'foo',
                                                'settingC': False,
                                            }}]}
-        client = uvcclient.UVCRemote('foo', 7080, 'key')
+        client = nvr.UVCRemote('foo', 7080, 'key')
         newvals = {'settingA': '2', 'settingB': False, 'settingC': 'foo'}
         newvals_expected = {'settingA': 2, 'settingB':
                             'False', 'settingC': True}

uvcclient/__init__.py

@@ -1 +0,0 @@
-from uvcclient import *

uvcclient/main.py

@@ -17,11 +17,11 @@
 import logging
 import optparse
 
-import uvcclient
+from uvcclient import nvr
 
 
 def main():
-    host, port, apikey, path = uvcclient.get_auth_from_env()
+    host, port, apikey, path = nvr.get_auth_from_env()
 
     parser = optparse.OptionParser()
     parser.add_option('-H', '--host', default=host,
@@ -58,7 +58,7 @@ def main():
         level = logging.WARNING
     logging.basicConfig(level=level)
 
-    client = uvcclient.UVCRemote(opts.host, opts.port, opts.apikey)
+    client = nvr.UVCRemote(opts.host, opts.port, opts.apikey)
 
     if opts.name:
         opts.uuid = client.name_to_uuid(opts.name)

uvcclient/uvcclient.py → uvcclient/nvr.py

@@ -160,6 +160,9 @@ def name_to_uuid(self, name):
         cams_by_name = {x['name']: x['uuid'] for x in cameras}
         return cams_by_name.get(name)
 
+    def get_camera(self, uuid):
+        return self._uvc_request('/api/2.0/camera/%s' % uuid)['data'][0]
+
 
 def get_auth_from_env():
     """Attempt to get UVC NVR connection information from the environment.