diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | DeDRM_plugin/__init__.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 808ce31..da8525a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,3 +77,4 @@ List of changes since the fork of Apprentice Harper's repository: - Small Python 2 / Calibre 4 bugfix for Obok. - Removing ancient AlfCrypto machine code libraries, moving all encryption / decryption to Python code. - General cleanup and removal of dead code. +- Fix a bug where ADE account keys weren't automatically imported from the DeACSM plugin when importing a PDF file. diff --git a/DeDRM_plugin/__init__.py b/DeDRM_plugin/__init__.py index 13a9190..9204600 100644 --- a/DeDRM_plugin/__init__.py +++ b/DeDRM_plugin/__init__.py @@ -733,10 +733,10 @@ class DeDRM(FileTypePlugin): if newkey is not None: if codecs.encode(newkey, 'hex').decode('ascii') not in dedrmprefs['adeptkeys'].values(): print("{0} v{1}: Found new key '{2}' in DeACSM plugin".format(PLUGIN_NAME, PLUGIN_VERSION, newname)) - newkeys.append(keyvalue) + newkeys.append(newkey) newnames.append(newname) except: - pass + traceback.print_exc() if len(newkeys) > 0: try: @@ -770,7 +770,7 @@ class DeDRM(FileTypePlugin): print("{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)) except Exception as e: - pass + traceback.print_exc() # Unable to decrypt the PDF with any of the existing keys. Is it a B&N PDF? |