better error message handling

HipByte · Feb 22, 2015 · 83ce370 · 83ce370
1 parent 551cf7b
commit 83ce370
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/command/utils.rb b/command/utils.rb
@@ -73,16 +73,18 @@ def password
 
   def parse_nslog_message(message)
     messages = []
-    message.split("\n").each do |msg|
+    tmp = message.split("\n")
+    tmp.shift if tmp[0].end_with?("Error: (")
+    tmp.each do |msg|
       msg.strip!
       if m = msg.match(/(No errors.+)/)
         # success
         messages << m[1]
-      elsif m = msg.match(/^"Error Domain=[^"]+"(.+)\\" UserInfo=.+/)
+      elsif m = msg.match(/NSLocalizedDescription=(.+), NSLocalizedFailureReason=/)
         # error
         messages << m[1]
       elsif m = msg.match(/(Error:.+)/)
-        # other errors (password error...)
+        # other errors
         messages << m[1]
       end
     end