From 59de784e9fcdcbd5074b23dc30c9069bab288c6d Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Mon, 21 Oct 2013 18:34:38 +0200 Subject: [PATCH] Trying to fix macosx system_profiler parser --- .../app/macosx/SystemProfilerParser.java | 9 +- .../app/macosx/SystemProfilerParserTest.java | 13 +- .../app/macosx/system_profiler_output6.txt | 158 ++++++++++++++++++ 3 files changed, 175 insertions(+), 5 deletions(-) create mode 100644 app/test/processing/app/macosx/system_profiler_output6.txt diff --git a/app/src/processing/app/macosx/SystemProfilerParser.java b/app/src/processing/app/macosx/SystemProfilerParser.java index 69482d317..82f62edde 100644 --- a/app/src/processing/app/macosx/SystemProfilerParser.java +++ b/app/src/processing/app/macosx/SystemProfilerParser.java @@ -51,7 +51,14 @@ public class SystemProfilerParser { if ((matcher = serialNumberRegex.matcher(line)).matches()) { device.put(SERIAL_NUMBER, matcher.group(1)); } else if ((matcher = locationRegex.matcher(line)).matches()) { - device.put(DEVICE_PATH, devicePrefix + matcher.group(1).substring(2, 6) + "1"); + String devicePath = devicePrefix; + String suffix = matcher.group(1).substring(2, 6); + try { + devicePath = devicePath + (Integer.parseInt(suffix) + 1); + } catch (NumberFormatException e) { + devicePath = devicePath + suffix + "1"; + } + device.put(DEVICE_PATH, devicePath); } else if ((matcher = pidRegex.matcher(line)).matches()) { device.put(PID, matcher.group(1)); } else if ((matcher = vidRegex.matcher(line)).matches()) { diff --git a/app/test/processing/app/macosx/SystemProfilerParserTest.java b/app/test/processing/app/macosx/SystemProfilerParserTest.java index 4791cc058..c16c52aaa 100644 --- a/app/test/processing/app/macosx/SystemProfilerParserTest.java +++ b/app/test/processing/app/macosx/SystemProfilerParserTest.java @@ -26,12 +26,17 @@ public class SystemProfilerParserTest { output = TestHelper.inputStreamToString(SystemProfilerParserTest.class.getResourceAsStream("system_profiler_output4.txt")); - assertEquals("0X2341_0X0041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbmodem04101")); - assertEquals("0X2341_0X0041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodem04101")); + assertEquals("0X2341_0X0041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbmodem411")); + assertEquals("0X2341_0X0041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodem411")); output = TestHelper.inputStreamToString(SystemProfilerParserTest.class.getResourceAsStream("system_profiler_output5.txt")); - assertEquals("0X2341_0X8041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbmodem06201")); - assertEquals("0X2341_0X8041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodem06201")); + assertEquals("0X2341_0X8041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbmodem621")); + assertEquals("0X2341_0X8041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodem621")); + + output = TestHelper.inputStreamToString(SystemProfilerParserTest.class.getResourceAsStream("system_profiler_output6.txt")); + + assertEquals("0X2341_0X8041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbmodem1421")); + assertEquals("0X2341_0X8041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodem1421")); } } diff --git a/app/test/processing/app/macosx/system_profiler_output6.txt b/app/test/processing/app/macosx/system_profiler_output6.txt new file mode 100644 index 000000000..f6d9ae179 --- /dev/null +++ b/app/test/processing/app/macosx/system_profiler_output6.txt @@ -0,0 +1,158 @@ +USB: + + USB 3.0 SuperSpeed Bus: + + Host Controller Location: Built-in USB + Host Controller Driver: AppleUSBXHCI + PCI Device ID: 0x1e31 + PCI Revision ID: 0x0004 + PCI Vendor ID: 0x8086 + Bus Number: 0x0a + + USB Hi-Speed Bus: + + Host Controller Location: Built-in USB + Host Controller Driver: AppleUSBEHCI + PCI Device ID: 0x1e2d + PCI Revision ID: 0x0004 + PCI Vendor ID: 0x8086 + Bus Number: 0x1a + + Hub: + + Product ID: 0x0024 + Vendor ID: 0x8087 (Intel Corporation) + Version: 0.00 + Speed: Up to 480 Mb/sec + Location ID: 0x1a100000 / 2 + Current Available (mA): 500 + Current Required (mA): 0 + + FaceTime HD Camera (Built-in): + + Product ID: 0x8510 + Vendor ID: 0x05ac (Apple Inc.) + Version: 80.25 + Serial Number: DJHC8MZ5E1DNYGE0 + Speed: Up to 480 Mb/sec + Manufacturer: Apple Inc. + Location ID: 0x1a110000 / 3 + Current Available (mA): 500 + Current Required (mA): 500 + + USB Hi-Speed Bus: + + Host Controller Location: Built-in USB + Host Controller Driver: AppleUSBEHCI + PCI Device ID: 0x1e26 + PCI Revision ID: 0x0004 + PCI Vendor ID: 0x8086 + Bus Number: 0x1d + + Hub: + + Product ID: 0x0024 + Vendor ID: 0x8087 (Intel Corporation) + Version: 0.00 + Speed: Up to 480 Mb/sec + Location ID: 0x1d100000 / 2 + Current Available (mA): 500 + Current Required (mA): 0 + + Keyboard Hub: + + Product ID: 0x1006 + Vendor ID: 0x05ac (Apple Inc.) + Version: 96.15 + Serial Number: 0 + Speed: Up to 480 Mb/sec + Manufacturer: Apple, Inc. + Location ID: 0x1d110000 / 6 + Current Available (mA): 500 + Current Required (mA): 300 + + Optical USB Mouse: + + Product ID: 0xc016 + Vendor ID: 0x046d (Logitech Inc.) + Version: 3.40 + Speed: Up to 1.5 Mb/sec + Manufacturer: Logitech + Location ID: 0x1d113000 / 9 + Current Available (mA): 100 + Current Required (mA): 100 + + Apple Keyboard: + + Product ID: 0x0250 + Vendor ID: 0x05ac (Apple Inc.) + Version: 0.74 + Speed: Up to 1.5 Mb/sec + Manufacturer: Apple Inc. + Location ID: 0x1d112000 / 7 + Current Available (mA): 100 + Current Required (mA): 20 + + Hub: + + Product ID: 0x2512 + Vendor ID: 0x0424 (SMSC) + Version: b.b3 + Speed: Up to 480 Mb/sec + Location ID: 0x1d180000 / 3 + Current Available (mA): 500 + Current Required (mA): 2 + + BRCM20702 Hub: + + Product ID: 0x4500 + Vendor ID: 0x0a5c (Broadcom Corp.) + Version: 1.00 + Speed: Up to 12 Mb/sec + Manufacturer: Apple Inc. + Location ID: 0x1d181000 / 5 + Current Available (mA): 500 + Current Required (mA): 94 + + Bluetooth USB Host Controller: + + Product ID: 0x8286 + Vendor ID: 0x05ac (Apple Inc.) + Version: 1.25 + Speed: Up to 12 Mb/sec + Manufacturer: Apple Inc. + Location ID: 0x1d181300 / 8 + Current Available (mA): 500 + Current Required (mA): 0 + + Apple Internal Keyboard / Trackpad: + + Product ID: 0x0262 + Vendor ID: 0x05ac (Apple Inc.) + Version: 2.22 + Speed: Up to 12 Mb/sec + Manufacturer: Apple Inc. + Location ID: 0x1d182000 / 4 + Current Available (mA): 500 + Current Required (mA): 40 + + USB 3.0 Hi-Speed Bus: + + Host Controller Location: Built-in USB + Host Controller Driver: AppleUSBXHCI + PCI Device ID: 0x1e31 + PCI Revision ID: 0x0004 + PCI Vendor ID: 0x8086 + Bus Number: 0x0a + + Arduino Yun: + + Product ID: 0x8041 + Vendor ID: 0x2341 + Version: 1.00 + Speed: Up to 12 Mb/sec + Manufacturer: Arduino LLC + Location ID: 0x14200000 / 12 + Current Available (mA): 500 + Current Required (mA): 500 +