Merge branch 'master' into manufacturer-updates

Author: peternewman

.codespellignore

@@ -0,0 +1,2 @@
+(0x1BC0, "ALS Stanislaw Binkiewicz"),
+(0x030F, "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""),

.travis-ci.sh

@@ -35,6 +35,22 @@ elif [[ $TASK = 'spellintian' ]]; then
   else
     echo "Found $spellingerrors spelling errors"
   fi;
+elif [[ $TASK = 'codespell' ]]; then
+  # run codespell only if it is the requested task
+  spellingfiles=$(find ./ -type f -and ! \( \
+      -wholename "./.git/*" -or \
+      -wholename "./node_modules/*" \
+      \) | xargs)
+  # count the number of codespell errors
+  spellingerrors=$(zrun codespell --check-filenames --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignore $spellingfiles 2>&1 | wc -l)
+  if [[ $spellingerrors -ne 0 ]]; then
+    # print the output for info
+    zrun codespell --check-filenames --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignore $spellingfiles
+    echo "Found $spellingerrors spelling errors via codespell"
+    exit 1;
+  else
+    echo "Found $spellingerrors spelling errors via codespell"
+  fi;
 elif [[ $TASK = 'flake8' ]]; then
   flake8 --max-line-length 80 --exclude .git,__pycache --ignore E111,E114,E129 $(find ./ -name "*.py" | xargs)
   #,E121,E127

.travis.yml

@@ -20,6 +20,7 @@ install:
   - if [ "$TASK" = "flake8" ]; then pip install flake8; fi
 # If this causes SSL errors, then Sourceforge is probably in disaster recovery mode and needing Javascript. Could switch to a specific mirror, e.g. kent.dl.sourceforge.net
   - if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then pip install http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi
+  - if [ "$TASK" = "codespell" ]; then pip install git+https://github.com/lucasdemarchi/codespell.git; fi
 
 matrix:
   fast_finish: true
@@ -42,6 +43,15 @@ matrix:
         apt:
           packages:
             - moreutils
+    - os: linux
+      dist: trusty
+      # Short duration job, use the container/without sudo image as it boots faster
+      sudo: false
+      env: TASK='codespell'
+      addons:
+        apt:
+          packages:
+           - moreutils
     - os: linux
       dist: trusty
       env: TASK='flake8'

admin.py

@@ -655,14 +655,14 @@ def DiffProperty(self, name, key, left_dict, right_dict):
     left = left_dict.get(key)
     right = right_dict.get(key)
     if left and right:
-      left_formated, right_formatted = self._differ.Diff(str(left), str(right))
+      left_formatted, right_formatted = self._differ.Diff(str(left), str(right))
     else:
-      left_formated = left
+      left_formatted = left
       right_formatted = right
     return  {
       'name': name,
       'key': key,
-      'left': left_formated,
+      'left': left_formatted,
       'different': left != right,
       'prefer_left': left is not None and right is None,
       'prefer_right': right is not None and left is None,

common.py

@@ -74,12 +74,12 @@ def GetLatestSoftware(responder):
     A SoftwareVersion object or None.
   """
   max_version = None
-  version = None
+  max_version_info = None
   for version in responder.software_version_set:
     if max_version is None or version.version_id > max_version:
       max_version = version.version_id
-      version = version
-  return version
+      max_version_info = version
+  return max_version_info
 
 
 def LookupProductCategory(category_id):

data/controller_data.py

@@ -20,53 +20,69 @@
 CONTROLLER_DATA = {
   0x0808: [
     {'name': 'Frog 2',
-     'link': 'http://www.zero88.com/en/products/2/51',
+     'link': 'http://support.zero88.com/975204871/',
      'image_url': 'http://zero88.com/wp-content/uploads/2008/04/Frog-2-11.png',
      'tags': ['console']},
     {'name': 'LeapFrog 48',
-     'link': 'http://support.zero88.com/main/en/product/88',
+     'link': 'http://support.zero88.com/975530941/',
      'image_url': 'http://www.performing-musician.com/pm/jun08/images/SPGTLjune_01.jpg',
      'tags': ['console']},
     {'name': 'LeapFrog 96',
-     'link': 'http://support.zero88.com/main/en/product/88',
+     'link': 'http://support.zero88.com/975530941/',
      'image_url': 'http://www.stageservicesshop.com/shop/image.php?type=T&id=16585',
      'tags': ['console']},
     {'name': 'Solution',
-     'link': 'http://www.zero88.com/en/products/2/101',
+     'link': 'http://zero88.com/products/consoles/solution/',
      'image_url': 'http://www.stagesuperstore.co.uk/ekmps/shops/stagesuperstore/images/zero88-solution-series-lighting-desk-2699-p.jpg',
      'tags': ['console']},
     {'name': 'Solution XL',
-     'link': 'http://www.zero88.com/en/products/2/101',
+     'link': 'http://zero88.com/products/consoles/solutionxl/',
      'image_url': 'http://www.stagesuperstore.co.uk/ekmps/shops/stagesuperstore/images/zero88-solution-series-lighting-desk-[3]-2699-p.jpg',
      'tags': ['console']},
     {'name': 'ORB XF',
-     'link': 'http://www.zero88.com/en/products/2/100',
+     'link': 'http://zero88.com/products/consoles/orbxf/',
      'image_url': 'http://zero88.com/wp-content/uploads/2011/11/ORB-XF-22.png',
      'tags': ['console']},
     {'name': 'ORB',
-     'link': 'http://www.zero88.com/en/products/2/97',
+     'link': 'http://support.zero88.com/975362971/',
      'image_url': 'http://zero88.com/wp-content/uploads/2009/11/ORB-12.png',
      'tags': ['console']},
     {'name': 'Jester ML',
-     'link': 'http://www.zero88.com/en/products/2/89',
+     'link': 'http://support.zero88.com/975199911/',
      'image_url': 'http://zero88.com/wp-content/uploads/2011/11/Jester-ML24-1.png',
      'tags': ['console']},
     {'name': 'Jester ML24',
-     'link': 'http://www.zero88.com/en/products/2/89',
+     'link': 'http://support.zero88.com/975199911/',
      'image_url': 'http://www.musik-produktiv.co.uk/pic-100049983xl/light-stage-consoles-scan-console-17456-zero-88-jester-ml-24.jpg',
      'tags': ['console']},
     {'name': 'Jester ML48',
-     'link': 'http://www.zero88.com/en/products/2/89',
+     'link': 'http://support.zero88.com/975199911/',
      'image_url': 'http://zero88.com/wp-content/uploads/2012/03/Jester-ML48-1.png',
      'tags': ['console']},
     {'name': 'Jester TL',
-     'link': 'http://www.zero88.com/en/products/2/94',
+     'link': 'http://support.zero88.com/975200381/',
      'image_url': 'http://www.eventgear.co.uk/shop/image/cache/data/Lighting%20Control/jester%20TL%20Desk-500x500.jpg',
      'tags': ['console']},
     {'name': 'Jester TLXtra',
-     'link': 'http://www.zero88.com/en/products/2/94',
+     'link': 'http://support.zero88.com/975200381/',
      'image_url': 'http://zero88.com/wp-content/uploads/2011/11/Jester-TLXtra-11.png',
      'tags': ['console']},
+    {'name': 'FLX',
+     'link': 'http://zero88.com/products/consoles/flx/',
+     'image_url': 'http://zero88.com/images/product-pics-flx-1.jpg',
+     'tags': ['console']},
+    {'name': 'FLX S24',
+     'link': 'http://zero88.com/products/consoles/flxs/',
+     'image_url': 'http://zero88.com/images/product-pics-flx-s24.jpg',
+     'tags': ['console']},
+    {'name': 'FLX S48',
+     'link': 'http://zero88.com/products/consoles/flxs/',
+     'image_url': 'http://zero88.com/images/product-pics-flx-s48.jpg',
+     'tags': ['console']},
+    {'name': 'SCD Server Pro',
+     'link': 'http://zero88.com/products/consoles/scdserver/',
+     'image_url': 'http://zero88.com/images/product-pics-scd-server.jpg',
+     'tags': ['console']},
   ],
   0x22b9: [
     {'name': 'Etherlight-D1',

data/controller_test.py

@@ -0,0 +1,47 @@
+#!/usr/bin/python
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# controller_test.py
+# Copyright (C) 2017 Peter Newman
+
+import unittest
+
+class TestControllerData(unittest.TestCase):
+  """ Test the controller data files are valid."""
+  def setUp(self):
+    globals = {}
+    locals = {}
+    execfile("data/controller_data.py", globals, locals)
+    self.data = locals['CONTROLLER_DATA']
+
+  def test_ControllerData(self):
+    # Check the type
+    self.assertEqual(type(self.data), dict)
+
+    for esta_id in self.data:
+      self.assertEqual(int, type(esta_id))
+      self.assertEqual(list, type(self.data[esta_id]))
+
+      seen_names = set()
+
+      for controller in self.data[esta_id]:
+        name = controller['name']
+        self.assertNotIn(name, seen_names,
+                         "Name %s for ESTA ID 0x%04x is present twice" % (name, esta_id))
+        seen_names.add(name)
+
+
+if __name__ == '__main__':
+  unittest.main()

data/manufacturer_links.py

@@ -32,7 +32,8 @@
 (0x089D, "http://www.gobo.ws/"),
 (0x0987, "https://www.mathertel.de/"),
 (0x1AFA, "https://tmb.com/"),
-(0x15D0, "http://prolights.it/"),
+(0x15D0, "https://www.musiclights.it/"),
+#(0x15D0, "http://prolights.it/"), # This is one of their sub-brands
 (0x20B9, "https://www.arri.com/"),
 (0x21A4, "https://www.chauvetdj.com/"),
 (0x2122, "https://beglec.com/"),

data/model_test.py

@@ -0,0 +1,35 @@
+#!/usr/bin/python
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# model_test.py
+# Copyright (C) 2017 Peter Newman
+
+import unittest
+
+class TestDeviceModelData(unittest.TestCase):
+  """ Test the device model data files are valid."""
+  def setUp(self):
+    globals = {}
+    locals = {}
+    execfile("data/model_data.py", globals, locals)
+    self.data = locals['DEVICE_MODEL_DATA']
+
+  def test_DeviceModelData(self):
+    # Because there may not be model data present, we just check the type
+    self.assertEqual(type(self.data), dict)
+
+
+if __name__ == '__main__':
+  unittest.main()

data/node_data.py

@@ -13,9 +13,9 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# splitter_data.py
+# node_data.py
 # Copyright (C) 2012 Simon Newton
-# Data for the splitters & distribution units.
+# Data for the nodes.
 
 NODE_DATA = {
   0x414c: [