catarrh/pysim
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/pysim.git synced 2026-03-16 18:38:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move init_reader() from utils.py to transport/__init__.py

Browse Source 
This avoids a circular dependency when introducing type annotations.

Change-Id: I168597ac14497fb188a15cb632f32452128bc1c6
This commit is contained in:
Harald Welte
2021-04-03 11:52:37 +02:00
parent 9d0f1f0cd5
commit 6e0458dda6
5 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pySim/transport/__init__.py
View File

@@ -3,6 +3,8 @@
""" pySim: PCSC reader transport link base
"""
from typing import Optional
from pySim.exceptions import *
from pySim.utils import sw_match
@@ -103,3 +105,30 @@ class LinkBase(object):
if not sw_match(rv[1], sw):
raise SwMatchError(rv[1], sw.lower())
return rv
def init_reader(opts) -> Optional[LinkBase]:
"""
Init card reader driver
"""
sl = None # type : :Optional[LinkBase]
try:
if opts.pcsc_dev is not None:
print("Using PC/SC reader interface")
from pySim.transport.pcsc import PcscSimLink
sl = PcscSimLink(opts.pcsc_dev)
elif opts.osmocon_sock is not None:
print("Using Calypso-based (OsmocomBB) reader interface")
from pySim.transport.calypso import CalypsoSimLink
sl = CalypsoSimLink(sock_path=opts.osmocon_sock)
elif opts.modem_dev is not None:
print("Using modem for Generic SIM Access (3GPP TS 27.007)")
from pySim.transport.modem_atcmd import ModemATCommandLink
sl = ModemATCommandLink(device=opts.modem_dev, baudrate=opts.modem_baud)
else: # Serial reader is default
print("Using serial reader interface")
from pySim.transport.serial import SerialSimLink
sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)
return sl
except Exception as e:
print("Card reader initialization failed with exception:\n" + str(e))
return None