Skip to content

Commit

Permalink
tools v6.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@apprenticealf
apprenticealf committed Mar 7, 2015
1 parent 5a502db commit 74a4c89
Show file tree
Hide file tree
Showing 21 changed files with 68 additions and 53 deletions.
6 changes: 3 additions & 3 deletions DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@
<key>CFBundleExecutable</key>
<string>droplet</string>
<key>CFBundleGetInfoString</key>
<string>DeDRM AppleScript 6.0.5. Written 2010–2013 by Apprentice Alf and others.</string>
<string>DeDRM AppleScript 6.0.7. Written 2010–2013 by Apprentice Alf and others.</string>
<key>CFBundleIconFile</key>
<string>DeDRM</string>
<key>CFBundleIdentifier</key>
<string>com.apple.ScriptEditor.id.707CCCD5-0C6C-4BEB-B67C-B6E866ADE85A</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<string>6.0.7</string>
<key>CFBundleName</key>
<string>DeDRM</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>6.0.5</string>
<string>6.0.7</string>
<key>CFBundleSignature</key>
<string>dplt</string>
<key>LSRequiresCarbon</key>
Expand Down
18 changes: 11 additions & 7 deletions DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,18 @@
# Revision history:
# 6.0.0 - Initial release
# 6.0.1 - Bug Fixes for Windows App, Kindle for Mac and Windows Adobe Digital Editions
# 6.0.2 - Restored call to Wine to get Kindle for PC keys
# 6.0.2 - Restored call to Wine to get Kindle for PC keys, added for ADE
# 6.0.3 - Fixes for Kindle for Mac and Windows non-ascii user names
# 6.0.4 - Fixes for stand-alone scripts and applications
# and pdb files in plugin and initial conversion of prefs.
# 6.0.6 - Fix up an incorrect function call

"""
Decrypt DRMed ebooks.
"""

PLUGIN_NAME = u"DeDRM"
PLUGIN_VERSION_TUPLE = (6, 0, 5)
PLUGIN_VERSION_TUPLE = (6, 0, 7)
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'
Expand Down Expand Up @@ -213,10 +217,10 @@ def ePubDecrypt(self,path_to_ebook):
else: # linux
from wineutils import WineGetKeys

scriptpath = os.join(self.alfdir,u"adobekey.py")
scriptpath = os.path.join(self.alfdir,u"adobekey.py")
defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])

self.default_key = default_keys[0]
self.default_key = defaultkeys[0]
except:
traceback.print_exc()
self.default_key = u""
Expand Down Expand Up @@ -308,7 +312,7 @@ def PDFDecrypt(self,path_to_ebook):
try:
from wineutils import WineGetKeys

scriptpath = os.join(self.alfdir,u"adobekey.py")
scriptpath = os.path.join(self.alfdir,u"adobekey.py")
defaultkeys = self.WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
except:
pass
Expand Down Expand Up @@ -386,7 +390,7 @@ def KindleMobiDecrypt(self,path_to_ebook):
else: # linux
from wineutils import WineGetKeys

scriptpath = os.join(self.alfdir,u"kindlekey.py")
scriptpath = os.path.join(self.alfdir,u"kindlekey.py")
defaultkeys = self.WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix'])
except:
pass
Expand Down Expand Up @@ -426,7 +430,7 @@ def eReaderDecrypt(self,path_to_ebook):
import calibre_plugins.dedrm.prefs as prefs
import calibre_plugins.dedrm.erdr2pml

dedrmrefs = prefs.DeDRM_Prefs()
dedrmprefs = prefs.DeDRM_Prefs()
# Attempt to decrypt epub with each encryption key (generated or provided).
for keyname, userkey in dedrmprefs['ereaderkeys'].items():
keyname_masked = u"".join((u'X' if (x.isdigit()) else x) for x in keyname)
Expand Down
2 changes: 1 addition & 1 deletion DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptepub.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from __future__ import with_statement

# ineptepub.pyw, version 5.9
# ineptepub.pyw, version 6.1
# Copyright © 2009-2010 by i♥cabbages

# Released under the terms of the GNU General Public Licence, version 3
Expand Down
12 changes: 8 additions & 4 deletions DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,15 @@
# 7.12 - Revised to allow use in calibre plugins to eliminate need for duplicate code
# 7.13 - Fixed erroneous mentions of ineptepub
# 7.14 - moved unicode_argv call inside main for Windows DeDRM compatibility
# 8.0 - Work if TkInter is missing
# 8.0 - Work if TkInter is missing
# 8.0.1 - Broken Metadata fix.

"""
Decrypts Adobe ADEPT-encrypted PDF files.
"""

__license__ = 'GPL v3'
__version__ = "8.0"
__version__ = "8.0.1"

import sys
import os
Expand Down Expand Up @@ -949,8 +950,11 @@ def nextobject(self, direct=False):
try:
(pos, objs) = self.end_type('d')
if len(objs) % 2 != 0:
raise PSSyntaxError(
'Invalid dictionary construct: %r' % objs)
print "Incomplete dictionary construct"
objs.append("") # this isn't necessary.
# temporary fix. is this due to rental books?
# raise PSSyntaxError(
# 'Invalid dictionary construct: %r' % objs)
d = dict((literal_name(k), v) \
for (k,v) in choplist(2, objs))
self.push((pos, d))
Expand Down
2 changes: 1 addition & 1 deletion DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def fixup(m):
def GetDecryptedBook(infile, kDatabases, serials, pids, starttime = time.time()):
# handle the obvious cases at the beginning
if not os.path.isfile(infile):
raise DRMException (u"Input file does not exist.")
raise DrmException(u"Input file does not exist.")

mobi = True
magic3 = open(infile,'rb').read(3)
Expand Down
9 changes: 4 additions & 5 deletions DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/prefs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def parseeReaderString(keystuff):
# Generate eReader user key from name and credit card number.
keyname = u"{0}_{1}".format(name.strip(),cc.strip()[-4:])
keyvalue = getuser_key(name,cc).encode('hex')
userkeysappend([keyname,keyvalue])
userkeys.append([keyname,keyvalue])
except Exception, e:
traceback.print_exc()
print e.args[0]
Expand Down Expand Up @@ -231,21 +231,20 @@ def getConfigFiles(extension, encoding = None):
dedrmprefs.addnamedvaluetoprefs('bandnkeys', name, value)
addedkeycount = len(dedrmprefs['bandnkeys'])-priorkeycount
if addedkeycount > 0:
print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, ignoblecount, u"key file" if ignoblecount==1 else u"key files")
print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"key file" if addedkeycount==1 else u"key files")
# Make the json write all the prefs to disk
dedrmprefs.writeprefs(False)

# get any .der files in the config dir
priorkeycount = len(dedrmprefs['adeptkeys'])
adeptfilekeys = getConfigFiles('.der','hex')
ineptcount = addConfigFiles('.der', 'adeptkeys')
for keypair in adeptfilekeys:
name = keypair[0]
value = keypair[1]
dedrmprefs.addnamedvaluetoprefs('adeptkeys', name, value)
addedkeycount = len(dedrmprefs['adeptkeys'])-priorkeycount
if addedkeycount > 0:
print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, ineptcount, u"keyfile" if ineptcount==1 else u"keyfiles")
print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"keyfile" if addedkeycount==1 else u"keyfiles")
# Make the json write all the prefs to disk
dedrmprefs.writeprefs(False)

Expand Down Expand Up @@ -280,7 +279,7 @@ def getConfigFiles(extension, encoding = None):
if addedserialcount > 0:
print u"{0} v{1}: {2:d} {3} imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, addedserialcount, u"serial number" if addedserialcount==1 else u"serial numbers")
try:
if kindleprefs['wineprefix'] != "":
if 'wineprefix' in kindleprefs and kindleprefs['wineprefix'] != "":
dedrmprefs.set('adobewineprefix',kindleprefs['wineprefix'])
dedrmprefs.set('kindlewineprefix',kindleprefs['wineprefix'])
print u"{0} v{1}: WINEPREFIX ‘(2)’ imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, kindleprefs['wineprefix'])
Expand Down
8 changes: 4 additions & 4 deletions DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/topazextract.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def unicode_argv():
argvencoding = sys.stdin.encoding
if argvencoding == None:
argvencoding = 'utf-8'
return [arg if (type(arg) == unicode) else unicode(arg, argvencoding) for arg in sys.argv]
return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]

#global switch
debug = False
Expand All @@ -92,12 +92,12 @@ class DrmException(Exception):
def zipUpDir(myzip, tdir, localname):
currentdir = tdir
if localname != u"":
currentdir = os.path.join(currentdir, localname)
currentdir = os.path.join(currentdir,localname)
list = os.listdir(currentdir)
for file in list:
afilename = file
localfilePath = os.path.join(localname, afilename)
realfilePath = os.path.join(currentdir, file)
realfilePath = os.path.join(currentdir,file)
if os.path.isfile(realfilePath):
myzip.write(realfilePath, localfilePath)
elif os.path.isdir(realfilePath):
Expand All @@ -116,7 +116,7 @@ def bookReadEncodedNumber(fo):
data = ord(fo.read(1))
if data >= 0x80:
datax = (data & 0x7F)
while data >= 0x80:
while data >= 0x80 :
data = ord(fo.read(1))
datax = (datax <<7) + (data & 0x7F)
data = datax
Expand Down
2 changes: 1 addition & 1 deletion DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/wineutils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):

outdirpath = os.path.join(basepath, u"winekeysdir")
if not os.path.exists(outdirpath):
os.mkdir(outdirpath)
os.makedirs(outdirpath)

if wineprefix != "" and os.path.exists(wineprefix):
cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
Expand Down
2 changes: 1 addition & 1 deletion DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# 6.0.4 - Fix for other potential unicode problems
# 6.0.5 - Fix typo

__version__ = '6.0.5'
__version__ = '6.0.7'

import sys
import os, os.path
Expand Down
11 changes: 6 additions & 5 deletions DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@
# 6.0.3 - Fixes for Kindle for Mac and Windows non-ascii user names
# 6.0.4 - Fixes for stand-alone scripts and applications
# and pdb files in plugin and initial conversion of prefs.
# 6.0.6 - Fix up an incorrect function call

"""
Decrypt DRMed ebooks.
"""

PLUGIN_NAME = u"DeDRM"
PLUGIN_VERSION_TUPLE = (6, 0, 5)
PLUGIN_VERSION_TUPLE = (6, 0, 7)
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'
Expand Down Expand Up @@ -216,10 +217,10 @@ def ePubDecrypt(self,path_to_ebook):
else: # linux
from wineutils import WineGetKeys

scriptpath = os.join(self.alfdir,u"adobekey.py")
scriptpath = os.path.join(self.alfdir,u"adobekey.py")
defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])

self.default_key = default_keys[0]
self.default_key = defaultkeys[0]
except:
traceback.print_exc()
self.default_key = u""
Expand Down Expand Up @@ -311,7 +312,7 @@ def PDFDecrypt(self,path_to_ebook):
try:
from wineutils import WineGetKeys

scriptpath = os.join(self.alfdir,u"adobekey.py")
scriptpath = os.path.join(self.alfdir,u"adobekey.py")
defaultkeys = self.WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
except:
pass
Expand Down Expand Up @@ -389,7 +390,7 @@ def KindleMobiDecrypt(self,path_to_ebook):
else: # linux
from wineutils import WineGetKeys

scriptpath = os.join(self.alfdir,u"kindlekey.py")
scriptpath = os.path.join(self.alfdir,u"kindlekey.py")
defaultkeys = self.WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix'])
except:
pass
Expand Down
2 changes: 1 addition & 1 deletion DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from __future__ import with_statement

# ineptepub.pyw, version 5.9
# ineptepub.pyw, version 6.1
# Copyright © 2009-2010 by i♥cabbages

# Released under the terms of the GNU General Public Licence, version 3
Expand Down
12 changes: 8 additions & 4 deletions DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,15 @@
# 7.12 - Revised to allow use in calibre plugins to eliminate need for duplicate code
# 7.13 - Fixed erroneous mentions of ineptepub
# 7.14 - moved unicode_argv call inside main for Windows DeDRM compatibility
# 8.0 - Work if TkInter is missing
# 8.0 - Work if TkInter is missing
# 8.0.1 - Broken Metadata fix.

"""
Decrypts Adobe ADEPT-encrypted PDF files.
"""

__license__ = 'GPL v3'
__version__ = "8.0"
__version__ = "8.0.1"

import sys
import os
Expand Down Expand Up @@ -949,8 +950,11 @@ def nextobject(self, direct=False):
try:
(pos, objs) = self.end_type('d')
if len(objs) % 2 != 0:
raise PSSyntaxError(
'Invalid dictionary construct: %r' % objs)
print "Incomplete dictionary construct"
objs.append("") # this isn't necessary.
# temporary fix. is this due to rental books?
# raise PSSyntaxError(
# 'Invalid dictionary construct: %r' % objs)
d = dict((literal_name(k), v) \
for (k,v) in choplist(2, objs))
self.push((pos, d))
Expand Down
2 changes: 1 addition & 1 deletion DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4mobidedrm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def fixup(m):
def GetDecryptedBook(infile, kDatabases, serials, pids, starttime = time.time()):
# handle the obvious cases at the beginning
if not os.path.isfile(infile):
raise DRMException (u"Input file does not exist.")
raise DrmException(u"Input file does not exist.")

mobi = True
magic3 = open(infile,'rb').read(3)
Expand Down
9 changes: 4 additions & 5 deletions DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/prefs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def parseeReaderString(keystuff):
# Generate eReader user key from name and credit card number.
keyname = u"{0}_{1}".format(name.strip(),cc.strip()[-4:])
keyvalue = getuser_key(name,cc).encode('hex')
userkeysappend([keyname,keyvalue])
userkeys.append([keyname,keyvalue])
except Exception, e:
traceback.print_exc()
print e.args[0]
Expand Down Expand Up @@ -231,21 +231,20 @@ def getConfigFiles(extension, encoding = None):
dedrmprefs.addnamedvaluetoprefs('bandnkeys', name, value)
addedkeycount = len(dedrmprefs['bandnkeys'])-priorkeycount
if addedkeycount > 0:
print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, ignoblecount, u"key file" if ignoblecount==1 else u"key files")
print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"key file" if addedkeycount==1 else u"key files")
# Make the json write all the prefs to disk
dedrmprefs.writeprefs(False)

# get any .der files in the config dir
priorkeycount = len(dedrmprefs['adeptkeys'])
adeptfilekeys = getConfigFiles('.der','hex')
ineptcount = addConfigFiles('.der', 'adeptkeys')
for keypair in adeptfilekeys:
name = keypair[0]
value = keypair[1]
dedrmprefs.addnamedvaluetoprefs('adeptkeys', name, value)
addedkeycount = len(dedrmprefs['adeptkeys'])-priorkeycount
if addedkeycount > 0:
print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, ineptcount, u"keyfile" if ineptcount==1 else u"keyfiles")
print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"keyfile" if addedkeycount==1 else u"keyfiles")
# Make the json write all the prefs to disk
dedrmprefs.writeprefs(False)

Expand Down Expand Up @@ -280,7 +279,7 @@ def getConfigFiles(extension, encoding = None):
if addedserialcount > 0:
print u"{0} v{1}: {2:d} {3} imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, addedserialcount, u"serial number" if addedserialcount==1 else u"serial numbers")
try:
if kindleprefs['wineprefix'] != "":
if 'wineprefix' in kindleprefs and kindleprefs['wineprefix'] != "":
dedrmprefs.set('adobewineprefix',kindleprefs['wineprefix'])
dedrmprefs.set('kindlewineprefix',kindleprefs['wineprefix'])
print u"{0} v{1}: WINEPREFIX ‘(2)’ imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, kindleprefs['wineprefix'])
Expand Down
2 changes: 1 addition & 1 deletion DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/wineutils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):

outdirpath = os.path.join(basepath, u"winekeysdir")
if not os.path.exists(outdirpath):
os.mkdir(outdirpath)
os.makedirs(outdirpath)

if wineprefix != "" and os.path.exists(wineprefix):
cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
Expand Down
Binary file modified DeDRM_calibre_plugin/DeDRM_plugin.zip
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"""

PLUGIN_NAME = u"DeDRM"
PLUGIN_VERSION_TUPLE = (6, 0, 6)
PLUGIN_VERSION_TUPLE = (6, 0, 7)
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'
Expand Down Expand Up @@ -220,7 +220,7 @@ def ePubDecrypt(self,path_to_ebook):
scriptpath = os.path.join(self.alfdir,u"adobekey.py")
defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])

self.default_key = default_keys[0]
self.default_key = defaultkeys[0]
except:
traceback.print_exc()
self.default_key = u""
Expand Down
Loading

0 comments on commit 74a4c89

Please sign in to comment.