diff --git a/pySim-prog.py b/pySim-prog.py index 760a6507..4467ec7b 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -44,6 +44,11 @@ from pySim.legacy.ts_51_011 import EF from pySim.card_handler import * from pySim.utils import * +from pathlib import Path +import logging +from pySim.log import PySimLogger + +log = PySimLogger.get(Path(__file__).stem) def parse_options(): @@ -185,6 +190,7 @@ def parse_options(): default=False, action="store_true") parser.add_argument("--card_handler", dest="card_handler_config", metavar="FILE", help="Use automatic card handling machine") + parser.add_argument("--verbose", help="Enable verbose logging", action='store_true', default=False) options = parser.parse_args() @@ -770,6 +776,15 @@ if __name__ == '__main__': # Parse options opts = parse_options() + # Setup logger + PySimLogger.setup(print, {logging.WARN: "\033[33m"}) + if (opts.verbose): + PySimLogger.set_verbose(True) + PySimLogger.set_level(logging.DEBUG) + else: + PySimLogger.set_verbose(False) + PySimLogger.set_level(logging.INFO) + # Init card reader driver sl = init_reader(opts) diff --git a/pySim-read.py b/pySim-read.py index 481e9da2..da3652dd 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -46,11 +46,17 @@ from pySim.utils import dec_imsi, dec_iccid from pySim.legacy.utils import format_xplmn_w_act, dec_st, dec_msisdn from pySim.ts_51_011 import EF_SMSP +from pathlib import Path +import logging +from pySim.log import PySimLogger + +log = PySimLogger.get(Path(__file__).stem) + option_parser = argparse.ArgumentParser(description='Legacy tool for reading some parts of a SIM card', formatter_class=argparse.ArgumentDefaultsHelpFormatter) +option_parser.add_argument("--verbose", help="Enable verbose logging", action='store_true', default=False) argparse_add_reader_args(option_parser) - def select_app(adf: str, card: SimCard): """Select application by its AID""" sw = 0 @@ -75,6 +81,15 @@ if __name__ == '__main__': # Parse options opts = option_parser.parse_args() + # Setup logger + PySimLogger.setup(print, {logging.WARN: "\033[33m"}) + if (opts.verbose): + PySimLogger.set_verbose(True) + PySimLogger.set_level(logging.DEBUG) + else: + PySimLogger.set_verbose(False) + PySimLogger.set_level(logging.INFO) + # Init card reader driver sl = init_reader(opts)