diff options
author | apprenticeharper <[email protected]> | 2015-08-12 18:35:21 +0100 |
---|---|---|
committer | apprenticeharper <[email protected]> | 2015-08-12 18:35:21 +0100 |
commit | 33d8a63f617424a3e51870603a0aaec8beed9924 (patch) | |
tree | d4250aa936ace7f3dbf14ce393a5d49a1861a061 /DeDRM_Windows_Application | |
parent | 91b22c18c40218cf668f9736667c5e72c8b507a6 (diff) |
Fix for plugin bug introduced in 6.3.1 for Kindle for PC
Diffstat (limited to 'DeDRM_Windows_Application')
-rw-r--r-- | DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw | 3 | ||||
-rw-r--r-- | DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw index 57f88c2..45c9e06 100644 --- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw +++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw @@ -17,8 +17,9 @@ # 6.3.0 - Add in Android support # 6.3.1 - Version bump for clarity # 6.3.2 - Version bump to match plugin +# 6.3.3 - Version bump to match plugin -__version__ = '6.3.2' +__version__ = '6.3.3' import sys import os, os.path diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py index bec18ed..1f34cfe 100644 --- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py +++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__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") |