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

Improve PassHash support

Browse Source
This commit is contained in:
Florian Bach 2021-10-26 09:10:01 +02:00
parent 55530d1d2d
commit 87c72be5d9
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
calibre-plugin/libadobeFulfill.py
View File

@ -512,23 +512,25 @@ def performFulfillmentNotification(fulfillmentResultToken, forceOptional = False
NSMAP = { "adept" : "http://ns.adobe.com/adept" } NSMAP = { "adept" : "http://ns.adobe.com/adept" }
adNS = lambda tag: '{%s}%s' % ('http://ns.adobe.com/adept', tag) adNS = lambda tag: '{%s}%s' % ('http://ns.adobe.com/adept', tag)
reset = False # Debug output for PassHash testing:
# print(etree.tostring(fulfillmentResultToken, encoding="utf-8", pretty_print=True, xml_declaration=False).decode("utf-8"))
try: try:
notifiers = fulfillmentResultToken.findall("./%s/%s" % (adNS("fulfillmentResult"), adNS("notify"))) notifiers = fulfillmentResultToken.findall("./%s/%s" % (adNS("fulfillmentResult"), adNS("notify")))
except: except:
reset = True pass
if len(notifiers) == 0: if len(notifiers) == 0:
try: try:
notifiers = fulfillmentResultToken.findall("./%s" % (adNS("notify"))) notifiers = fulfillmentResultToken.findall("./%s" % (adNS("notify")))
except: except:
reset = True pass
if len(notifiers) == 0: if len(notifiers) == 0:
try: try:
notifiers = fulfillmentResultToken.findall("./%s/%s" % (adNS("envelope"), adNS("notify"))) notifiers = fulfillmentResultToken.findall("./%s/%s" % (adNS("envelope"), adNS("notify")))
except: except:
reset = True pass
if len(notifiers) == 0: if len(notifiers) == 0:
print("<notify> tag not found. Guess nobody wants to be notified.") print("<notify> tag not found. Guess nobody wants to be notified.")
@ -554,10 +556,29 @@ def performFulfillmentNotification(fulfillmentResultToken, forceOptional = False
if (user is None): if (user is None):
user = fulfillmentResultToken.find("./%s/%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("licenseToken"), adNS("user"))).text try:
# "Normal" Adobe fulfillment
user = fulfillmentResultToken.find("./%s/%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("licenseToken"), adNS("user"))).text
except AttributeError:
# B&N Adobe PassHash fulfillment
user = body.find("./%s" % (adNS("user"))).text
if (device is None): if (device is None):
device = fulfillmentResultToken.find("./%s/%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("licenseToken"), adNS("device"))).text try:
# "Normal" Adobe fulfillment
device = fulfillmentResultToken.find("./%s/%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("licenseToken"), adNS("device"))).text
except:
# B&N Adobe PassHash fulfillment without device ID.
# Not sure what to do in this case.
# PassHash books aren't linked to a particular device, so there's no ID to send to Adobe.
# If I leave this out, I get E_ADEPT_MISSING_ELEMENT
# If I use the one from the ADE activation, I get E_LIC_USER_UNKNOWN
# Adobe documentation seems to imply that PassHash books don't support notifications,
# so lets just skip if that's the case.
print("Skipping notify due to passHash")
continue
full_text = "<adept:notification xmlns:adept=\"http://ns.adobe.com/adept\">" full_text = "<adept:notification xmlns:adept=\"http://ns.adobe.com/adept\">"