mirrors/acsm-calibre-plugin
mirrors/acsm-calibre-plugin
1
0
Fork 0
mirror of https://github.com/Leseratte10/acsm-calibre-plugin.git synced 2024-12-22 09:19:55 +06:00
Code Issues Projects Releases Wiki Activity

More helpful error message if the license cert wasn't downloaded

Browse Source
This commit is contained in:
Florian Bach 2022-10-17 13:44:31 +02:00
parent 97a6b51cec
commit 6c6a313849
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calibre-plugin/__init__.py
View File

@ -48,6 +48,7 @@
# #
# v0.1.0: Continue work on renaming from "DeACSM" to "ACSM Input". # v0.1.0: Continue work on renaming from "DeACSM" to "ACSM Input".
# The big version number jump is to make that name change clearer. # The big version number jump is to make that name change clearer.
# Print useful warning if LicenseServiceCertificate download fails.

13
calibre-plugin/libadobeFulfill.py
View File

@ -305,9 +305,13 @@ def buildRights(license_token_node):
found = True found = True
break break
except: except:
return None pass
if not found: if not found:
print("Did not find the licenseService certificate in the activation data.")
print("This usually means it failed to download from the distributor's servers.")
print("Please try to download an ACSM book from the Adobe Sample Library, then if that was successful, ")
print("try your ACSM book file again.")
return None return None
ret += "</adept:licenseServiceInfo>\n" ret += "</adept:licenseServiceInfo>\n"
@ -476,6 +480,8 @@ def fulfill(acsm_file, do_notify = False):
success, response = fetchLicenseServiceCertificate(licenseURL, operatorURL) success, response = fetchLicenseServiceCertificate(licenseURL, operatorURL)
if success is False: if success is False:
print("Why did the license download fail?")
print("This is probably a temporary error on the distributor's server")
return False, response return False, response
return True, replyData return True, replyData
@ -863,7 +869,10 @@ def fetchLicenseServiceCertificate(licenseURL, operatorURL):
licenseServiceInfoReq = operatorURL + "/LicenseServiceInfo?licenseURL=" + licenseURL licenseServiceInfoReq = operatorURL + "/LicenseServiceInfo?licenseURL=" + licenseURL
response = sendHTTPRequest(licenseServiceInfoReq).decode("utf-8") try:
response = sendHTTPRequest(licenseServiceInfoReq).decode("utf-8")
except:
return False, "HTTP download for the licenseServiceInfo failed ... why?"
if "<error" in response: if "<error" in response:
return False, "Looks like that failed: %s" % response return False, "Looks like that failed: %s" % response