Mirrors
/
DeDRM_tools
mirror of https://github.com/noDRM/DeDRM_tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix DeACSM import for PDF files

This commit is contained in:
NoDRM 2022-08-07 09:31:49 +02:00
parent b12e567c5f
commit 52cf3faa59
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -77,3 +77,4 @@ List of changes since the fork of Apprentice Harper's repository:
- Small Python 2 / Calibre 4 bugfix for Obok. - Small Python 2 / Calibre 4 bugfix for Obok.
- Removing ancient AlfCrypto machine code libraries, moving all encryption / decryption to Python code. - Removing ancient AlfCrypto machine code libraries, moving all encryption / decryption to Python code.
- General cleanup and removal of dead 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.

6
DeDRM_plugin/__init__.py
View File

@ -733,10 +733,10 @@ class DeDRM(FileTypePlugin):
if newkey is not None: if newkey is not None:
if codecs.encode(newkey, 'hex').decode('ascii') not in dedrmprefs['adeptkeys'].values(): 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)) 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) newnames.append(newname)
except: except:
pass traceback.print_exc()
if len(newkeys) > 0: if len(newkeys) > 0:
try: 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)) 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: 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? # Unable to decrypt the PDF with any of the existing keys. Is it a B&N PDF?