summaryrefslogtreecommitdiffstats
path: root/DeDRM_calibre_plugin
diff options
context:
space:
mode:
authorapprenticeharper <[email protected]>2015-08-12 18:35:21 +0100
committerapprenticeharper <[email protected]>2015-08-12 18:35:21 +0100
commit33d8a63f617424a3e51870603a0aaec8beed9924 (patch)
treed4250aa936ace7f3dbf14ce393a5d49a1861a061 /DeDRM_calibre_plugin
parent91b22c18c40218cf668f9736667c5e72c8b507a6 (diff)
Fix for plugin bug introduced in 6.3.1 for Kindle for PC
Diffstat (limited to 'DeDRM_calibre_plugin')
-rw-r--r--DeDRM_calibre_plugin/DeDRM_plugin.zipbin353282 -> 353297 bytes
-rw-r--r--DeDRM_calibre_plugin/DeDRM_plugin/__init__.py5
2 files changed, 3 insertions, 2 deletions
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin.zip b/DeDRM_calibre_plugin/DeDRM_plugin.zip
index 046a5da..082e508 100644
--- a/DeDRM_calibre_plugin/DeDRM_plugin.zip
+++ b/DeDRM_calibre_plugin/DeDRM_plugin.zip
Binary files differ
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py b/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
index bec18ed..1f34cfe 100644
--- a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
@@ -44,6 +44,7 @@ __docformat__ = 'restructuredtext en'
# 6.3.0 - Added in Kindle for Android serial number solution
# 6.3.1 - Version number bump for clarity
# 6.3.2 - Fixed Kindle for Android help file
+# 6.3.3 - Bug fix for Kindle for PC support
"""
@@ -51,7 +52,7 @@ Decrypt DRMed ebooks.
"""
PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 3, 2)
+PLUGIN_VERSION_TUPLE = (6, 3, 3)
PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
# Include an html helpfile in the plugin's zipfile with the following name.
RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'
@@ -523,7 +524,7 @@ class DeDRM(FileTypePlugin):
if len(newkeys) > 0:
print u"{0} v{1}: Found {2} new {3}".format(PLUGIN_NAME, PLUGIN_VERSION, len(newkeys), u"key" if len(newkeys)==1 else u"keys")
try:
- book = k4mobidedrm.GetDecryptedBook(path_to_ebook,newkeys.items(),[],[],self.starttime)
+ book = k4mobidedrm.GetDecryptedBook(path_to_ebook,newkeys.items(),[],[],[],self.starttime)
decoded = True
# store the new successful keys in the defaults
print u"{0} v{1}: Saving {2} new {3}".format(PLUGIN_NAME, PLUGIN_VERSION, len(newkeys), u"key" if len(newkeys)==1 else u"keys")