From e48ca49ffac8f867e7dd6b7f5d754494087b0f3f Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 29 Oct 2017 15:11:55 +0200
Subject: [PATCH] mmal: minor cosmetic changes

---
 motioneye/config.py         | 2 +-
 motioneye/handlers.py       | 8 +++++---
 motioneye/static/js/main.js | 6 +++---
 motioneye/utils.py          | 3 +++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/motioneye/config.py b/motioneye/config.py
index f915a97..5100c95 100644
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@ -543,7 +543,7 @@ def add_camera(device_details):
     while camera_id in camera_ids:
         camera_id += 1
 
-    logging.info('adding new %(prt)s camera with id %(id)s...' % {'prt': proto, 'id': camera_id})
+    logging.info('adding new %(proto)s camera with id %(id)s...' % {'proto': proto, 'id': camera_id})
 
     # prepare a default camera config
     camera_config = {'@enabled': True}
diff --git a/motioneye/handlers.py b/motioneye/handlers.py
index fb1c93e..2622d5a 100644
--- a/motioneye/handlers.py
+++ b/motioneye/handlers.py
@@ -647,7 +647,7 @@ class ConfigHandler(BaseHandler):
                     configured_devices.add(data['videodevice'])
 
             cameras = [{'id': d[1], 'name': d[2]} for d in v4l2ctl.list_devices()
-                    if (d[0] not in configured_devices) and (d[1] not in configured_devices)]
+                       if (d[0] not in configured_devices) and (d[1] not in configured_devices)]
             
             self.finish_json({'cameras': cameras})
 
@@ -660,9 +660,10 @@ class ConfigHandler(BaseHandler):
 
             if "vc.ril.camera" not in configured_devices:
                 cameras = [{'id': "vc.ril.camera", 'name': "VideoCore Camera (vc.ril.camera)"}]
+
             else:
-				cameras = []
-            
+                cameras = []
+
             self.finish_json({'cameras': cameras})
 
         else:  # assuming local motionEye camera listing
@@ -679,6 +680,7 @@ class ConfigHandler(BaseHandler):
                     self.finish_json({'cameras': cameras})
                     
             def on_response_builder(camera_id, local_config):
+
                 def on_response(remote_ui_config=None, error=None):
                     if error:
                         cameras.append({
diff --git a/motioneye/static/js/main.js b/motioneye/static/js/main.js
index 3438c9c..e11ff16 100644
--- a/motioneye/static/js/main.js
+++ b/motioneye/static/js/main.js
@@ -3569,7 +3569,7 @@ function runAddCameraDialog() {
                 '<tr>' +
                     '<td class="dialog-item-label"><span class="dialog-item-label">Camera Type</span></td>' +
                     '<td class="dialog-item-value"><select class="styled" id="typeSelect">' +
-                        (hasLocalCamSupport ? '<option value="v4l2">Local Camera</option>' : '') +
+                        (hasLocalCamSupport ? '<option value="v4l2">Local V4L2 Camera</option>' : '') +
                         (hasLocalCamSupport ? '<option value="mmal">Local MMAL Camera</option>' : '') +
                         (hasNetCamSupport ? '<option value="netcam">Network Camera</option>' : '') +
                         '<option value="motioneye">Remote motionEye Camera</option>' +
@@ -3675,8 +3675,8 @@ function runAddCameraDialog() {
         else { /* assuming v4l2 */
             content.find('tr.v4l2').css('display', 'table-row');
             addCameraInfo.html(
-                    'Local cameras are camera devices that are connected directly to your motionEye system. ' +
-                    'These are usually USB webcams or board-specific cameras.');
+                    'Local V4L2 cameras are camera devices that are connected directly to your motionEye system, ' +
+                    'usually via USB.');
         }
         
         updateModalDialogPosition();
diff --git a/motioneye/utils.py b/motioneye/utils.py
index 34f0dff..afab32c 100644
--- a/motioneye/utils.py
+++ b/motioneye/utils.py
@@ -347,6 +347,7 @@ def is_local_motion_camera(config):
     """Tells if a camera is managed by the local motion instance."""
     return bool(config.get('videodevice') or config.get('netcam_url') or config.get('mmalcam_name'))
 
+
 def is_remote_camera(config):
     """Tells if a camera is managed by a remote motionEye server."""
     return config.get('@proto') == 'motioneye'
@@ -356,10 +357,12 @@ def is_v4l2_camera(config):
     """Tells if a camera is a v4l2 device managed by the local motion instance."""
     return bool(config.get('videodevice'))
 
+
 def is_mmal_camera(config):
     '''Tells if a camera is mmal device managed by the local motion instance.'''
     return bool(config.get('mmalcam_name'))
 
+
 def is_net_camera(config):
     """Tells if a camera is a network camera managed by the local motion instance."""
     return bool(config.get('netcam_url'))
-- 
2.39.5