Handle 'iPad Pro (12.9 inch) (C0F6C6F5-80EA-497C-86AD-02A5176E1D30) (…

…Shutdown)'
aharbick · Oct 8, 2016 · 37028f9 · 37028f9
1 parent 34426c7
commit 37028f9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/simctl-list-parser.js b/lib/simctl-list-parser.js
@@ -113,18 +113,18 @@ function parseDevice(line) {
     // the last capture group might not be there if available
 
     var available = false;
-    
-    var regExp = /(.*)\(([^)]+)\)\s\(([^)]+)\)\s\(([^)]+)\)/;
+
+    var regExp = /(.*)\(([A-Z0-9\-]+)\)\s\(([^)]+)\)\s\(([^)]+)\)/;
     var matches = regExp.exec(line);
     if (!matches) {
-        regExp = /(.*)\(([^)]+)\)\s\(([^)]+)\)/;
+        regExp = /(.*)\(([A-Z0-9\-]+)\)\s\(([^)]+)\)/;
         matches = regExp.exec(line);
         available = true;
     }
 
     if (matches) {
         var obj = {
-            'name' : matches[1].trim(),
+            'name' : matches[1].replace(/\-/g, ' ').trim(),
             'id' : matches[2].trim(),
             'state' : matches[3].trim(),
             'available' : available
@@ -162,7 +162,7 @@ function parseDeviceType(line) {
 
     if (matches) {
         var obj = {
-            'name' : matches[1].trim(),
+            'name' : matches[1].replace(/\-/g, ' ').trim(),
             'id' : matches[2].trim()
         };