diff --git a/.codespellignore b/.codespellignore index 2b565a90..980428db 100644 --- a/.codespellignore +++ b/.codespellignore @@ -9,6 +9,7 @@ (0x030F, "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""), (0x0440, "Guangzhou VAS Lighting Co., Ltd."), (0x067A, "Inster Co, Ltd"), + (0x096F, "Shenzhen showho technolgy co.,ltd"), (0x0931, "Cristal Controles"), (0x0946, "TBE Srl"), (0x1BC0, "ALS Stanislaw Binkiewicz"), diff --git a/data/manufacturer_data.py b/data/manufacturer_data.py index 5a009a3c..0b28b316 100644 --- a/data/manufacturer_data.py +++ b/data/manufacturer_data.py @@ -47,6 +47,8 @@ (0x001C, "Kindwin Technology (HK) Ltd."), (0x001D, "Luminator Technology Group"), (0x001E, "Shenzhen Lumi Lime Technology Limited"), + (0x0020, "Wattle IT"), + (0x0021, "Electric Foundry Ltd."), (0x0057, "Blackbezt Lighting Technology Co., Ltd."), (0x0058, "Big Dipper Laser Science and Technology Co.,Ltd."), (0x0059, "Laysion Lighting Technology Co., Ltd."), @@ -303,11 +305,14 @@ (0x039B, "Lightforce Lasertechnik"), (0x03A1, "INAREX INC."), (0x03A2, "licht.team"), + (0x03A8, "ARTFOX"), (0x03AA, "AIGA Electronic (GuangZhou) Co., Ltd."), (0x03D5, "eX Systems"), (0x03D6, "i-Lumen"), (0x03FA, "ART-DMX"), + (0x0402, "Exato"), (0x0404, "Luminxa"), + (0x0411, "SoundSwitch"), (0x041C, "IMLIGHT"), (0x0424, "FLUX ECLAIRAGE"), (0x0440, "Guangzhou VAS Lighting Co., Ltd."), @@ -353,6 +358,7 @@ (0x05E2, "KORRO PLUS"), (0x05EB, "GUANGZHOU BO WEI TE LIGHTING CO.LTD"), (0x05EF, "Guangzhou Chai Yi Light Co., Ltd."), + (0x05F2, "O'Light"), (0x05F7, "Immersive Design Studios Inc."), (0x0600, "TELMIC Neo"), (0x0602, "Guangzhou Jinhong Stage Lighting Equipment.Co.,ltd"), @@ -391,6 +397,7 @@ (0x06AE, "CANARA LIGHTING INDUSTRIES PVT LTD"), (0x06AF, "ZHEJIANG JINGRI TECHNOLOGY CO.,LTD"), (0x06B3, "NANOLUMENS, INC."), + (0x06B6, "GUANGDONG VSHINE LIGHTING TECHNOLOGY CO.,LTD"), (0x06B9, "GUANGZHOU DASEN LIGHTING CORPORATION LIMITED"), (0x06C4, "RHENAC Systems GmbH"), (0x06C7, "L&L Luce&Light"), @@ -399,6 +406,7 @@ (0x06D2, "LIGHTSTAR (BEIJING) ELECTRONIC CORPORATION"), (0x06E0, "SHENZHEN LONGRUN OPTOELECTRONIC CO., LTD"), (0x06E1, "Burck IT GmbH & Co. KG"), + (0x06E4, "Dydell B.V."), (0x06E6, "Equipson S.A."), (0x06EC, "SISTEMA Jsc"), (0x06F0, "CTG sp. z o.o."), @@ -434,10 +442,12 @@ (0x07AE, "A-LITE B.V."), (0x07B0, "ADDiCTiON BoX GbR"), (0x07B1, "TBF-PyroTec GmbH"), + (0x07B3, "Shenzhen Fabulux Technology Co., Ltd"), (0x07B5, "ARM Automation, Inc"), (0x07BE, "Sanko Device Co.Ltd."), (0x07C0, "Code Mercenaries GmbH"), (0x07C2, "BOOQlight BV"), + (0x07C8, "Sidus Link Ltd."), (0x07CC, "Griven S.r.l."), (0x07CF, "MH-Sound"), (0x07D1, "Made By Mouse LTD"), @@ -478,6 +488,7 @@ (0x0850, "Proland Group, LLC"), (0x0851, "Junction Inc. Ltd"), (0x0854, "Sharp NEC Display Solutions, Ltd."), + (0x0855, "GODOX Photo Equipment Co., Ltd."), (0x0858, "Juno Lighting Group"), (0x085A, "Guangzhou Ming Jing Stage Light Equipment Co., Ltd."), (0x085E, "MMS Distribution Ltd"), @@ -496,6 +507,7 @@ (0x0878, "OTTEC Technology GmbH"), (0x087D, "TPV Technology Group"), (0x0880, "GuangZhou LiDang Technology Inc."), + (0x0883, "CEE Lighting Equipment Co.Ltd"), (0x0884, "Bright Group"), (0x0885, "SIRS-E"), (0x0886, "KLIK Systems"), @@ -509,10 +521,12 @@ (0x0891, "Feiner Lichttechnik GMBH"), (0x0892, "DongGuan Ruishen Technology Co.,Ltd"), (0x0893, "Brighten LED Lighting Limited"), + (0x0894, "Dongguan HCP Technology Co., Ltd."), (0x089A, "ADL Electronics Ltd."), (0x089D, "gobo.ws"), (0x08A1, "Shenzhen Gloshine Technology Co., Ltd"), (0x08A2, "Guangzhou Gesida Light Equipment Co., Ltd."), + (0x08A3, "Redot Visual Effect Technologies (Shenzhen) Co., Ltd"), (0x08A4, "Adam Hall GmbH"), (0x08A7, "GuangZhou Deliya Opto-electronic Tech Co., Ltd"), (0x08AA, "PiXL Factory"), @@ -534,10 +548,12 @@ (0x08C1, "Project SSSHH Incorporated"), (0x08C3, "Guangzhou Spark Stage Equipment Co. Ltd"), (0x08C5, "EHRGEIZ Lichttechnik GmbH"), + (0x08C9, "LEDitgo Videowall Germany GmbH"), (0x08CA, "Foshan City Xuandao Optoelectronics Equipment Co., Ltd"), (0x08CC, "Guangzhou Santu Stage Lighting Equipment Co.Ltd"), (0x08D3, "SVI Public Company Limited"), (0x08D4, "Sensa-Lite Ltd."), + (0x08D5, "Sense Effects"), (0x08D6, "Guangzhou Precision Vision Intelligent Equipment Co, Ltd"), (0x08D7, "PatternAgents, LLC"), (0x08D8, "W.A. Benjamin Electric Co."), @@ -547,6 +563,7 @@ (0x08E0, "Red Arrow Controls"), (0x08E1, "Shenzhen CLT Electronics Co.,LTD"), (0x08E3, "Guangzhou JinZhiHui Electronic Technology Co.,Ltd."), + (0x08E4, "LMP Lichttechnik Vertriebsgesellschaft GmbH & Co KG"), (0x08E7, "3A Guangzhou Electronics Co., Ltd"), (0x08EC, "Marvin Nadrowski"), (0x08ED, "ShowLED"), @@ -561,6 +578,7 @@ (0x08F8, "Liberal Logic Inc."), (0x08F9, "ACS - Ackerman Computer Sciences"), (0x08FA, "Phaton Lighting Co., Ltd."), + (0x08FC, "Lights By Brian"), (0x08FE, "Zhuhai Shengchang Electronics Co., Ltd."), (0x0900, "nox multimedia GmbH"), (0x0901, "GermTec GmbH & Co. KG"), @@ -568,6 +586,7 @@ (0x0903, "Shenzhen INFiLED Electronics, Ltd."), (0x0904, "Bigbear Co., Ltd."), (0x0905, "Locimation Pty Ltd"), + (0x0906, "Crystal Technica Limited"), (0x0909, "Beijing Starlight Electronics Co., Ltd."), (0x090B, "StarLighting"), (0x090C, "GRE Alpha"), @@ -621,8 +640,10 @@ (0x095F, "Elaborated Networks GmbH"), (0x0960, "Fineline Solutions Ltd."), (0x0965, "Fontana Fountains"), + (0x0967, "Arcus Licht- und Praesentationstechnik GmbH"), (0x0968, "Guangzhou Beyond Lighting Co., Limited."), (0x096D, "Guangzhou Xin Yilong Stage Lighting Equipment Co., Limited"), + (0x096F, "Shenzhen showho technolgy co.,ltd"), (0x0973, "Guangzhou Eagle Wei Photoelectric Technology Co., Ltd."), (0x0974, "Marumo Electric Co., Ltd."), (0x0975, "KB Design"), @@ -640,8 +661,9 @@ (0x098B, "Glow Motion Technologies, LLC."), (0x098C, "Shenzhen Longrich Energy Sources Technology Co., Ltd."), (0x098D, "Batmink Ltd."), - (0x098E, "Ecosense Lighting Company Limited"), + (0x098E, "Ecosense Lighting Inc"), (0x098F, "Digital Sputnik Lighting"), + (0x0990, "Stagelight Holding"), (0x0996, "CCI Power Supplies, LLC"), (0x0997, "Star Iluminacao Computadorizada LTDA"), (0x099A, "Aixz International (S)"), @@ -652,14 +674,18 @@ (0x09A5, "Prolight Concepts Ltd."), (0x09AE, "Robert Juliat"), (0x09AF, "Autotech Co."), + (0x09B2, "Guangzhou Hedong Electronics Co., LTD"), (0x09B3, "Aquatique Show Int."), (0x09B4, "Brompton Technology Ltd."), + (0x09B5, "XBlack Visual Products"), (0x09B7, "inCon-trol water systems"), (0x09B8, "Prolites S.A.L."), + (0x09BD, "Shenzhen Zhongbo Photoelectric Co., Ltd"), (0x09C0, "Guangzhou Rainbow Lighting Equipment CO.,LTD"), (0x09C1, "Argetron Elektrik Elektronik Organizasyon Gida San. ve Dis Tic. Ltd. Sti."), (0x09C3, "Velleman nv"), (0x09C4, "Guangzhou XinHuang Industrial Co., Ltd."), + (0x09C6, "Photon Manufacturing"), (0x09C8, "Crystal Fountains Inc."), (0x09CC, "Motomuto Aps"), (0x09D1, "Environmental Lights"), @@ -684,6 +710,9 @@ (0x1205, "Carbon Lighting Limited"), (0x1206, "Hangel Technology Co., Ltd."), (0x1208, "Nuvolight GmbH & Co KG"), + (0x1209, "Philippe Bergeron Lights"), + (0x120A, "Bulldog Lighting and Events, Inc."), + (0x120B, "Brilliant Stages Ltd."), (0x1212, "HPL Light Company"), (0x1221, "SAGITTER - Proel"), (0x1222, "SM International"), @@ -713,6 +742,7 @@ (0x15D0, "Music & Lights S.r.l."), (0x161A, "techKnow Design Ltd."), (0x1626, "LEDsistem Teknolojileri Tic. Ltd. Sti."), + (0x1627, "Dynamic Visual Solutions LLC"), (0x162A, "Nerd's Meter"), (0x1690, "awaptec GmbH"), (0x16AE, "Electrone Americas Ltd. Co."), @@ -726,8 +756,10 @@ (0x1750, "Yuesheng International Limited"), (0x1808, "Guangzhou Jinye Electronic Technology Co., Ltd."), (0x1809, "Rotolight"), + (0x180A, "Guangdong Longjoin Optoelectronics Technology Co. Ltd."), (0x1871, "Smoke Factory GmbH"), (0x1872, "Super-Can Industry Growing Co. Ltd."), + (0x1873, "Zhongshan Wellmake Electronic Technology Co., Ltd."), (0x1888, "GUANZHOU KAVON STAGE EQUIPMENT CO., LTD."), (0x18A6, "Steadfast Technology"), (0x1900, "ADJ Products LLC"), @@ -844,6 +876,8 @@ (0x2C2A, "XTBA"), (0x2CE0, "Lighting Services Inc."), (0x2DC8, "Stellascapes"), + (0x2DDD, "Waylight"), + (0x2DDE, "Luminlite Electronics Co., Ltd."), (0x3000, "PushingPixels"), (0x3001, "Elemental LED, Inc."), (0x3002, "Siberian Lighting"), @@ -1045,7 +1079,11 @@ (0x5004, "Shanghai Sansi Electronic Engineering Co.,Ltd"), (0x5005, "MEDIAM Ltd. (Modus brand)"), (0x5006, "ENEDO Power SpA"), + (0x5007, "Alfalite"), (0x5008, "Chengdu Chengyu Electronic Technology Co., Ltd."), + (0x5009, "Izzro Optoelectronics Technology Co., Ltd."), + (0x500A, "AU Optronics Corporation (AUO)"), + (0x500B, "WebKat Eletronic's"), (0x5040, "Guangzhou Color Imagination LED Lighting Ltd."), (0x5041, "Philips Entertainment Lighting Asia"), (0x5043, "Pathway Connectivity Inc."), @@ -1065,6 +1103,9 @@ (0x5072, "ARRI Rental Deutschland GmbH"), (0x5075, "Pulsar Light of Cambridge Ltd."), (0x5099, "Altec Di Gregorio Andrea"), + (0x5100, "Luxibel"), + (0x5101, "LBT Electronics Pvt. Ltd."), + (0x5102, "INDATA d.o.o."), (0x512D, "DJPOWER ELECTRONIC STAGE LIGHTING FIXTURE FACTORY (GUANGZHOU)"), (0x5149, "JAP Optoelectronic Ltd."), (0x514D, "QMAXZ lighting"), @@ -1072,6 +1113,9 @@ (0x5168, "Shenzhen Sunricher Technology Co.,Ltd."), (0x516C, "Quicklights"), (0x51D7, "Innovative Dimmers LLC (Ratpac dimmers)"), + (0x51D8, "Amperor Electronics (Shenzhen) Co., Ltd."), + (0x5200, "Shenzhen Aotian Technology Co. , Ltd."), + (0x5201, "Crestron Electronics, Inc."), (0x5244, "Revolution Display"), (0x524C, "Radical Lighting Ltd."), (0x524D, "RUIZ TECH"), @@ -1136,7 +1180,9 @@ (0x5C40, "OXO"), (0x5D00, "L1 Inc."), (0x5D01, "MTS Medientechnik GmbH"), + (0x5D02, "Underwater Lights Limited"), (0x5DAC, "Mediatec Group"), + (0x5E5D, "Multisenses GmbH"), (0x6100, "Krobox Sdn Bhd"), (0x610A, "Visenge Pty. Ltd"), (0x6123, "CMYLight (S) Pte. Ltd."), @@ -1164,6 +1210,7 @@ (0x6542, "eBrain GmbH"), (0x6547, "euroGenie"), (0x6553, "EtherShow"), + (0x6555, "Shantea Controls"), (0x6565, "Stratus Systems LLC"), (0x656C, "ELC lighting"), (0x6573, "Environmental Lighting Solutions"), @@ -1194,6 +1241,7 @@ (0x6D61, "MAL Effekt-Technik GmbH"), (0x6D62, "MBN GmbH"), (0x6D63, "Sein & Schein GmbH"), + (0x6E00, "LEDeco solution, s.r.o."), (0x6F00, "Guangzhou Huaying Stage Lighting Equipment Co. Ltd."), (0x6F01, "DAVAI!JPL"), (0x6F02, "hazebase (Uta Raabe e.K.)"), @@ -1221,14 +1269,17 @@ (0x780E, "Mole-Richardson Co."), (0x783A, "Audiolux Devices LLC"), (0x786C, "XLN-t bvba"), + (0x7888, "Tontron Photoelectric Co., Limited"), (0x78B4, "LED Flex Limited"), (0x7900, "Leprecon / CAE, Inc."), (0x79BC, "DC Reactive"), (0x7A70, "Open Lighting"), (0x7AA0, "Anaren Inc."), (0x7AAA, "WEAD (Wagner Electronic and Design)"), + (0x7AAB, "Hyundai Fomex Co., Ltd."), (0x7B1B, "DimLight Ltd."), (0x7D61, "HMB|TEC GmbH"), + (0x7DE7, "Guangzhou ILightings Equipment Co., Ltd."), (0x7DE8, "Shenzhen LAMP Technology Co., Ltd."), (0x7DEE, "zencontrol Pty Ltd"), (0x7EE7, "Arthur Digital Solutions Kft"), diff --git a/data/manufacturer_links.py b/data/manufacturer_links.py index 2868dbcf..b74dde1d 100644 --- a/data/manufacturer_links.py +++ b/data/manufacturer_links.py @@ -19,6 +19,7 @@ MANUFACTURER_LINKS = [ (0x0000, "https://tsp.esta.org/tsp/working_groups/CP/cp.html"), + (0x0021, "https://electricfoundry.co.uk/"), (0x0089, "https://www.productionwarehouse.co.za/"), (0x00A1, "http://www.creativelighting.com.au/"), (0x00A2, "http://www.empdesigns.co.uk/"), @@ -38,7 +39,7 @@ (0x02EA, "https://www.disguise.one/"), (0x02EC, "https://www.lutron.com/en-US/Pages/default.aspx"), # Their redirects don't play nicely with Python # (0x02ED, "http://www.openlx.org.uk/"), # Website currently gone - (0x0305, "http://www.diconfiberoptics.com/"), + (0x0305, "https://www.diconfiberoptics.com/"), (0x0308, "http://imagecue.lighting/"), (0x0391, "https://alcorn.com/"), (0x044E, "http://benpeoples.com/"), @@ -49,6 +50,7 @@ (0x056B, "https://www.cosmolight.it/"), (0x056C, "https://lumascape.com/"), (0x0609, "https://www.diginet.net.au/"), + (0x06E4, "https://www.dydell.com/"), (0x0710, "https://dts-lighting.it/"), (0x074F, "https://www.panasonic.com/"), (0x0776, "http://lumenetix.com/"), @@ -64,6 +66,7 @@ (0x097A, "http://teamboyce.com/"), (0x097F, "https://raumzeitlabor.de/"), (0x0987, "https://www.mathertel.de/"), + (0x09B5, "https://www.xblackpro.com/"), (0x1234, "https://tsp.esta.org/tsp/working_groups/CP/cp.html"), (0x15D0, "https://www.musiclights.it/"), # (0x15D0, "http://prolights.it/"), # This is one of their sub-brands @@ -83,10 +86,11 @@ (0x29B4, "http://www.highlite.nl/"), (0x2C1A, "https://www.dmx4all.de/"), (0x2C2A, "http://www.xtba.co.uk/"), - # (0x2DC8, "http://www.stellascapes.com/"), # Website has gone + # (0x2DC8, "http://www.stellascapes.com/"), # Website has gone + (0x2DDE, "https://www.luminlite.com.tw/"), (0x3388, "https://www.macostar.com/"), (0x3434, "https://www.gds.uk.com/"), - (0x3638, "https://www.lumenpulse.com/"), + # (0x3638, "https://www.lumenpulse.com/"), # Website currently gone (0x3B10, "https://www.nxp.com/"), (0x4144, "https://www.adbstagelight.com/"), (0x414C, "https://www.artisticlicence.com/"), @@ -119,15 +123,17 @@ (0x5000, "http://www.orangepi-dmx.org"), (0x5041, "http://www.lighting.philips.com/"), (0x5075, "http://pulsarlight.com/"), + (0x5100, "https://www.luxibel.com/"), (0x514D, "http://www.qmaxz.com/"), (0x5168, "http://www.sunricher.com"), + (0x5201, "https://www.crestron.com/"), (0x5252, "http://www.rosco.com/"), (0x5253, "https://www.robe.cz/"), - (0x5343, "https://oceanoptics.com/"), + (0x5343, "https://www.oceaninsight.com/"), (0x5344, "https://www.stardraw.com/"), (0x5347, "http://sgmlight.com/"), (0x534C, "http://www.soundlight.de/"), - (0x5353, "https://www.theblacklabcoat.com/"), + # (0x5353, "https://www.theblacklabcoat.com/"), # Website has gone (0x5370, "http://www.chroma-q.com/"), (0x5377, "https://www.swisson.com/"), (0x5445, "http://www.tesielettronica.it/"), @@ -139,6 +145,7 @@ (0x6205, "http://www.ltechonline.com/"), (0x6364, "http://www.lanbox.com/"), (0x646F, "https://www.eldoled.com/"), + (0x6555, "https://shanteacontrols.com/"), (0x656C, "https://www.elclighting.com/"), (0x6574, "https://www.etcconnect.com/"), (0x676C, "https://www.glp.de/"), diff --git a/data/manufacturer_test.py b/data/manufacturer_test.py index 5e106de8..afb96474 100644 --- a/data/manufacturer_test.py +++ b/data/manufacturer_test.py @@ -20,6 +20,7 @@ import urllib2 import pprint from socket import error as SocketError +from urllib2 import HTTPError from urllib2 import URLError from ssl import SSLError @@ -85,7 +86,8 @@ def test_ManufacturerLinks(self): try: # Some web servers, and Cloudflare, block us unless we have a # non-python User Agent - ua = {'User-Agent': 'Mozilla/5.0 (KHTML, like Gecko)'} + ua = {'User-Agent': 'Mozilla/5.0 (KHTML, like Gecko)', + 'referer': 'http://example.com'} request = urllib2.Request(link, headers=ua) response = opener.open(request) @@ -95,16 +97,21 @@ def test_ManufacturerLinks(self): pprint.pprint(e.code) if hasattr(e, 'headers'): pprint.pprint(vars(e.headers)) - # TODO(Peter): Enttec URL fails SSL validation due to an incomplete - # chain, skip this error for now - if not (type(e.reason) is SSLError and - (link == 'https://www.arri.com/' or - link == 'https://www.enttec.com/' or - link == 'https://www.lutron.com/en-US/Pages/default.aspx')): - self.fail("Link %s failed due to %s" % (link, e.reason)) + # TODO(Peter): Various URLs fail SSL validation due to an incomplete + # chain, others just don't like our CI testing of valid pages, + # skip all these error for now + if not ((type(e.reason) is SSLError and + (link == 'https://www.arri.com/' or + link == 'https://www.diconfiberoptics.com/' or + link == 'https://www.enttec.com/')) or + (type(e) is HTTPError and + (link == 'http://www.compulite.com/' or + link == 'https://www.lutron.com/en-US/Pages/default.aspx' or + link == 'https://www.panasonic.com/'))): + self.fail("Link %s failed due to %s, reason type: %s" % (link, e.reason, type(e))) elif hasattr(e, 'code'): self.fail("The server couldn't fulfill the request for %s. Error " - "code: %s" % (link, e.code)) + "code: %s, reason type: %s" % (link, e.code, type(e.reason))) except SocketError as e: if hasattr(e, 'errno'): self.fail("Link %s failed due to socket error %s" % (link, e.errno))