From dba7b16b988a9dd3cbc48f1207a32481e3f26f72 Mon Sep 17 00:00:00 2001
From: Christina Quast <chrysh.ng+git@gmail.com>
Date: Tue, 10 Mar 2015 17:58:54 +0100
Subject: [PATCH] ccid.py should not stop when an error occurs

---
 usb_application/ccid.py | 92 +++++++++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 36 deletions(-)

diff --git a/usb_application/ccid.py b/usb_application/ccid.py
index d6b69dba..1f8cb56a 100755
--- a/usb_application/ccid.py
+++ b/usb_application/ccid.py
@@ -1,4 +1,5 @@
 import sys
+import traceback
 
 from pySim.commands import SimCardCommands
 from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid
@@ -19,55 +20,74 @@ def pySim_read():
     print("Reading ...")
 
     # EF.ICCID
-    (res, sw) = scc.read_binary(['3f00', '2fe2'])
-    if sw == '9000':
-            print("ICCID: %s" % (dec_iccid(res),))
-    else:
-            print("ICCID: Can't read, response code = %s" % (sw,))
+    try:
+        (res, sw) = scc.read_binary(['3f00', '2fe2'])
+        if sw == '9000':
+                print("ICCID: %s" % (dec_iccid(res),))
+        else:
+                print("ICCID: Can't read, response code = %s" % (sw,))
+    except:
+        print("Unexpected error:", sys.exc_info()[0])
+        print(traceback.format_exc())
 
     # EF.IMSI
-    (res, sw) = scc.read_binary(['3f00', '7f20', '6f07'])
-    if sw == '9000':
-            print("IMSI: %s" % (dec_imsi(res),))
-    else:
-            print("IMSI: Can't read, response code = %s" % (sw,))
+    try:
+        (res, sw) = scc.read_binary(['3f00', '7f20', '6f07'])
+        if sw == '9000':
+                print("IMSI: %s" % (dec_imsi(res),))
+        else:
+                print("IMSI: Can't read, response code = %s" % (sw,))
+    except:
+        print("Unexpected error:", sys.exc_info()[0])
+        print(traceback.format_exc())
 
     # EF.SMSP
-    (res, sw) = scc.read_record(['3f00', '7f10', '6f42'], 1)
-    if sw == '9000':
-            print("SMSP: %s" % (res,))
-    else:
-            print("SMSP: Can't read, response code = %s" % (sw,))
+    try:
+        (res, sw) = scc.read_record(['3f00', '7f10', '6f42'], 1)
+        if sw == '9000':
+                print("SMSP: %s" % (res,))
+        else:
+                print("SMSP: Can't read, response code = %s" % (sw,))
+    except:
+        print("Unexpected error:", sys.exc_info()[0])
+        print(traceback.format_exc())
 
     # EF.HPLMN
-#   (res, sw) = scc.read_binary(['3f00', '7f20', '6f30'])
-#   if sw == '9000':
-#           print("HPLMN: %s" % (res))
-#           print("HPLMN: %s" % (dec_hplmn(res),))
-#   else:
-#           print("HPLMN: Can't read, response code = %s" % (sw,))
-    # FIXME
+    try:
+        (res, sw) = scc.read_binary(['3f00', '7f20', '6f30'])
+        if sw == '9000':
+            print("HPLMN: %s" % (res))
+            print("HPLMN: %s" % (dec_hplmn(res),))
+        else:
+            print("HPLMN: Can't read, response code = %s" % (sw,))
+    except:
+        print("Unexpected error:", sys.exc_info()[0])
+        print(traceback.format_exc())
 
     # EF.ACC
-    (res, sw) = scc.read_binary(['3f00', '7f20', '6f78'])
-    if sw == '9000':
-            print("ACC: %s" % (res,))
-    else:
-            print("ACC: Can't read, response code = %s" % (sw,))
+    try: 
+        (res, sw) = scc.read_binary(['3f00', '7f20', '6f78'])
+        if sw == '9000':
+                print("ACC: %s" % (res,))
+        else:
+                print("ACC: Can't read, response code = %s" % (sw,))
+    except:
+        print("Unexpected error:", sys.exc_info()[0])
+        print(traceback.format_exc())
 
     # EF.MSISDN
     try:
     #       print(scc.record_size(['3f00', '7f10', '6f40']))
-            (res, sw) = scc.read_record(['3f00', '7f10', '6f40'], 1)
-            if sw == '9000':
-                    if res[1] != 'f':
-                            print("MSISDN: %s" % (res,))
-                    else:
-                            print("MSISDN: Not available")
+        (res, sw) = scc.read_record(['3f00', '7f10', '6f40'], 1)
+        if sw == '9000':
+            if res[1] != 'f':
+                print("MSISDN: %s" % (res,))
             else:
-                    print("MSISDN: Can't read, response code = %s" % (sw,))
+                print("MSISDN: Not available")
+        else:
+            print("MSISDN: Can't read, response code = %s" % (sw,))
     except:
-            prin#t("MSISDN: Can't read. Probably not existing file")
+        print("MSISDN: Can't read. Probably not existing file, error: ", sys.exc_info()[0])
+        print(traceback.format_exc())
 
-    # Done for this card and maybe for everything ?
     print("Done !\n")