smokephil/extract_otp_secret_keys
1
0
Fork 0
mirror of https://github.com/scito/extract_otp_secret_keys.git synced 2025-12-12 17:46:36 +01:00
Code Issues Projects Releases Wiki Activity

use detect_and_decode since qrreader is fixed

Browse source
This commit is contained in:
scito 2022-12-31 17:30:24 +01:00
parent 5225af0621
commit 3558eba93b
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Pipfile.lock generated
View file

@ -187,10 +187,10 @@
}, },
"qreader": { "qreader": {
"hashes": [ "hashes": [
"sha256:fc75684088b4bef2b268eefda7006cb4b0276e53d6cdd678bc7d2bbb7d8fcd21" "sha256:f96d2879c9f47f9641da55dc3e1df765cd4d6f1cfbc8b7fa811b70c1e27d4fba"
], ],
"index": "pypi", "index": "pypi",
"version": "==1.3.1" "version": "==1.3.2"
} }
}, },
"develop": { "develop": {

11
src/extract_otp_secrets.py
View file

@ -412,15 +412,8 @@ def convert_img_to_otp_url(filename: str, args: Args) -> OtpUrls:
qr_mode = QRMode[args.qr] qr_mode = QRMode[args.qr]
otp_urls: OtpUrls = [] otp_urls: OtpUrls = []
if qr_mode == QRMode.QREADER: if qr_mode in [QRMode.QREADER, QRMode.DEEP_QREADER]:
# otp_url = QReader().detect_and_decode(img, False) # broken otp_url = QReader().detect_and_decode(img, qr_mode == QRMode.DEEP_QREADER)
qreader = QReader()
bbox, found = qreader.detect(img)
if found:
otp_url = qreader.decode(img, bbox)
otp_urls.append(otp_url)
elif qr_mode == QRMode.DEEP_QREADER:
otp_url = QReader().detect_and_decode(img, True)
otp_urls.append(otp_url) otp_urls.append(otp_url)
elif qr_mode == QRMode.CV2: elif qr_mode == QRMode.CV2:
otp_url, _, _ = cv2.QRCodeDetector().detectAndDecode(img) otp_url, _, _ = cv2.QRCodeDetector().detectAndDecode(img)

1
tests/extract_otp_secrets_test.py
View file

@ -362,6 +362,7 @@ def test_extract_verbose(capsys: pytest.CaptureFixture[str], relaxed: bool) -> N
if not qreader_available: if not qreader_available:
expected_stdout = expected_stdout.replace('QReader installed: True', 'QReader installed: False') expected_stdout = expected_stdout.replace('QReader installed: True', 'QReader installed: False')
expected_stdout = expected_stdout.replace('QR reading mode: ZBAR\n\n', '')
if relaxed or sys.implementation.name == 'pypy': if relaxed or sys.implementation.name == 'pypy':
print('\nRelaxed mode\n') print('\nRelaxed mode\n')