diff options
| author | Nayil Mukhametshin <66028747+nlscc@users.noreply.github.com> | 2020-09-30 01:05:27 +0200 |
|---|---|---|
| committer | Nayil Mukhametshin <66028747+nlscc@users.noreply.github.com> | 2020-09-30 01:05:27 +0200 |
| commit | 6f8094c750a4b06dda31e969fec51c47cd1aca03 (patch) | |
| tree | fc9d3267760a3322528a76d9fa81bd06f4f03343 | |
| parent | change copyright (diff) | |
| download | samloader-6f8094c750a4b06dda31e969fec51c47cd1aca03.tar samloader-6f8094c750a4b06dda31e969fec51c47cd1aca03.tar.gz samloader-6f8094c750a4b06dda31e969fec51c47cd1aca03.tar.bz2 samloader-6f8094c750a4b06dda31e969fec51c47cd1aca03.tar.lz samloader-6f8094c750a4b06dda31e969fec51c47cd1aca03.tar.xz samloader-6f8094c750a4b06dda31e969fec51c47cd1aca03.tar.zst samloader-6f8094c750a4b06dda31e969fec51c47cd1aca03.zip | |
| -rw-r--r-- | samloader/main.py | 3 | ||||
| -rw-r--r-- | samloader/versionfetch.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/samloader/main.py b/samloader/main.py index 9088e45..f828208 100644 --- a/samloader/main.py +++ b/samloader/main.py @@ -16,6 +16,9 @@ def getbinaryfile(client, fw, region, model): req = request.binaryinform(fw, region, model, client.nonce) resp = client.makereq("NF_DownloadBinaryInform.do", req) root = ET.fromstring(resp) + status = root.find("./FUSBody/Results/Status").text + if status != 200: + raise Exception("DownloadBinaryInform returned {}, firmware could not be found?".format(status)) filename = root.find("./FUSBody/Put/BINARY_NAME/Data").text path = root.find("./FUSBody/Put/MODEL_PATH/Data").text return path, filename diff --git a/samloader/versionfetch.py b/samloader/versionfetch.py index 98200b8..d173486 100644 --- a/samloader/versionfetch.py +++ b/samloader/versionfetch.py @@ -11,6 +11,8 @@ def getlatestver(region, model): r.raise_for_status() root = ET.fromstring(r.text) vercode = root.find("./firmware/version/latest").text + if vercode is None: + raise Exception("No latest firmware found") vc = vercode.split("/") if len(vc) == 3: vc.append(vc[0]) |