<p>herlesupreeth has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/17520">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-read.py: Added card detection function like in pySim-prog.py<br><br>This function is introduced to make use of Card class/Card subclasses in pySim-read.py.<br>Also, an initial step towards refactoring of code.<br><br>Change-Id: I71f57c6403dc933bd9d54f90df3d3fe105b4f66f<br>---<br>M pySim-read.py<br>1 file changed, 22 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/20/17520/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index 55b43d7..1ee3c26 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -31,8 +31,27 @@</span><br><span> from pySim.ts_51_011 import EF, DF</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.cards import Card, _cards_classes</span><br><span> from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn, format_xplmn_w_act, dec_spn</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def card_detect(scc):</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        # Detect type if needed</span><br><span style="color: hsl(120, 100%, 40%);">+       card = None</span><br><span style="color: hsl(120, 100%, 40%);">+   ctypes = dict([(kls.name, kls) for kls in _cards_classes])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  for kls in _cards_classes:</span><br><span style="color: hsl(120, 100%, 40%);">+            card = kls.autodetect(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+            if card:</span><br><span style="color: hsl(120, 100%, 40%);">+                      print("Autodetected card type: %s" % card.name)</span><br><span style="color: hsl(120, 100%, 40%);">+                     card.reset()</span><br><span style="color: hsl(120, 100%, 40%);">+                  break</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       if card is None:</span><br><span style="color: hsl(120, 100%, 40%);">+              print("Autodetection failed")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     return card</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> def parse_options():</span><br><span> </span><br><span>@@ -94,6 +113,9 @@</span><br><span>   # Program the card</span><br><span>   print("Reading ...")</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    # Initialize Card object</span><br><span style="color: hsl(120, 100%, 40%);">+      card = card_detect(scc) or Card(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       # EF.ICCID</span><br><span>   (res, sw) = scc.read_binary(EF['ICCID'])</span><br><span>     if sw == '9000':</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/17520">change 17520</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/17520"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I71f57c6403dc933bd9d54f90df3d3fe105b4f66f </div>
<div style="display:none"> Gerrit-Change-Number: 17520 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>