mirrors/acsm-calibre-plugin
mirrors
/
acsm-calibre-plugin
mirror of https://github.com/Leseratte10/acsm-calibre-plugin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update some error messages

This commit is contained in:
Florian Bach 2022-07-31 10:20:16 +02:00
parent 76f67a2048
commit 53cbe88c8b
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calibre-plugin/__init__.py
View File

@ -283,7 +283,8 @@ class DeACSM(FileTypePlugin):
download_url = adobe_fulfill_response.find("./%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("src"))).text download_url = adobe_fulfill_response.find("./%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("src"))).text
except: except:
print("{0} v{1}: FulfillmentResult does not contain the <src> tag. This may be an ACSM with download type 'auth'?".format(PLUGIN_NAME, PLUGIN_VERSION)) print("{0} v{1}: FulfillmentResult does not contain the <src> tag. This may be an ACSM with download type 'auth'?".format(PLUGIN_NAME, PLUGIN_VERSION))
print("{0} v{1}: Please open a bug report and attach the ACSM file if you see this message.".format(PLUGIN_NAME, PLUGIN_VERSION)) print("{0} v{1}: Please download the book through ADE (so the ACSM file is 'used').".format(PLUGIN_NAME, PLUGIN_VERSION))
print("{0} v{1}: After that, please open a bug report and attach the ACSM file.".format(PLUGIN_NAME, PLUGIN_VERSION))
return None return None
license_token_node = adobe_fulfill_response.find("./%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("licenseToken"))) license_token_node = adobe_fulfill_response.find("./%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("licenseToken")))

16
calibre-plugin/config.py
View File

@ -925,8 +925,8 @@ class ConfigWidget(QWidget):
msg = "You are currently using " + ADE_version + "\n" msg = "You are currently using " + ADE_version + "\n"
msg += "You can switch to a different ADE version by using the selection box below.\n" msg += "You can switch to a different ADE version by using the selection box below.\n"
msg += "- ADE 1.7.2 is for debugging only. Do not use this setting, it might get your account banned\n" msg += "- ADE 1.7.2 is for debugging only. Do not use this setting, it might get your account banned\n"
msg += "- ADE 2.0.1 works with most books, and will always get you the old, removable DRM. Select this if you're unsure\n" msg += "- ADE 2.0.1 works with most books, and will always get you the old DRM. Select this if you're unsure\n"
msg += "- ADE 3.0.1 works with all books, but may give you unremovable DRM for some retailers\n" msg += "- ADE 3.0.1 works with all books, but may give you newer DRM that requires newer tools to remove\n"
msg += "- ADE 4.0.3 and ADE 4.5.11 are available, but aren't really needed for anything\n" msg += "- ADE 4.0.3 and ADE 4.5.11 are available, but aren't really needed for anything\n"
msg += "Select ADE 2.0.1 if you are unsure\n\n" msg += "Select ADE 2.0.1 if you are unsure\n\n"
msg += "Which ADE version do you want to emulate?" msg += "Which ADE version do you want to emulate?"
@ -966,9 +966,7 @@ class ConfigWidget(QWidget):
msg = "You are about to create an anonymous authorization.\n" msg = "You are about to create an anonymous authorization.\n"
msg += "If you lose access to this authorization, all books linked to it will be lost / inaccessible. " msg += "If you lose access to this authorization, all books linked to it will be lost / inaccessible. "
msg += "Make sure to create backups of the authorization data! " msg += "Make sure to create backups of the authorization data!"
msg += "Also, if you do end up emulating ADE3 or newer, and you receive an eBook with the new DRM, "
msg += "you might not be able to read / access that book at all."
warning_dialog(None, "Warning", msg, show=True, show_copy_button=False) warning_dialog(None, "Warning", msg, show=True, show_copy_button=False)
@ -985,8 +983,8 @@ class ConfigWidget(QWidget):
msg = "Which ADE version do you want to emulate?\n" msg = "Which ADE version do you want to emulate?\n"
msg += "- ADE 2.0.1 works with most but not all books, but will always give you the old, removable DRM.\n" msg += "- ADE 2.0.1 works with most but not all books, but will always give you the old DRM.\n"
msg += "- ADE 3.0.1 works with all books, but may give you unremovable DRM for some retailers.\n" msg += "- ADE 3.0.1 works with all books, but may give you newer DRM for some retailers.\n"
msg += "- ADE 4.0.3 and 4.5.11 are only provided for completeness sake, but aren't usually needed.\n" msg += "- ADE 4.0.3 and 4.5.11 are only provided for completeness sake, but aren't usually needed.\n"
msg += "Select ADE 2.0 if you are unsure." msg += "Select ADE 2.0 if you are unsure."
item, ok = QInputDialog.getItem(self, "Authorizing ADE account", msg, allowed_strings, item, ok = QInputDialog.getItem(self, "Authorizing ADE account", msg, allowed_strings,
@ -1161,8 +1159,8 @@ class ConfigWidget(QWidget):
msg = "Which ADE version do you want to emulate?\n" msg = "Which ADE version do you want to emulate?\n"
msg += "- ADE 2.0.1 works with most but not all books, but will always give you the old, removable DRM.\n" msg += "- ADE 2.0.1 works with most but not all books, but will always give you the old DRM.\n"
msg += "- ADE 3.0.1 works with all books, but may give you unremovable DRM for some retailers.\n" msg += "- ADE 3.0.1 works with all books, but may give you newer DRM for some retailers.\n"
msg += "- ADE 4.0.3 and 4.5.11 are only provided for completeness sake, but aren't usually needed.\n" msg += "- ADE 4.0.3 and 4.5.11 are only provided for completeness sake, but aren't usually needed.\n"
msg += "Select ADE 2.0 if you are unsure." msg += "Select ADE 2.0 if you are unsure."
item, ok = QInputDialog.getItem(self, "Authorizing ADE account", msg, allowed_strings, item, ok = QInputDialog.getItem(self, "Authorizing ADE account", msg, allowed_strings,