tools v5.5

Plugins now include unaltered stand-alone scripts, so no longer need to keep separate copies.

Calibre_Plugins/eReaderPDB2PML_plugin/__init__.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
 
 # eReaderPDB2PML_plugin.py
-# Released under the terms of the GNU General Public Licence, version 3 or
-# later.  <http://www.gnu.org/licenses/>
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
 #
 # All credit given to The Dark Reverser for the original standalone script.
 # I had the much easier job of converting it to Calibre a plugin.
@@ -11,7 +11,7 @@
 # This plugin is meant to convert secure Ereader files (PDB) to unsecured PMLZ files.
 # Calibre can then convert it to whatever format you desire.
 # It is meant to function without having to install any dependencies...
-# other than having Calibre installed, of course. 
+# other than having Calibre installed, of course.
 #
 # Installation:
 # Go to Calibre's Preferences page... click on the Plugins button. Use the file
@@ -36,6 +36,11 @@
 #   0.0.5 - updated to the new calibre plugin interface
 #   0.0.6 - unknown changes
 #   0.0.7 - improved config dialog processing and fix possible output/unicode problem
+#   0.0.8 - Proper fix for unicode problems, separate out erdr2pml from plugin
+
+PLUGIN_NAME = u"eReader PDB 2 PML"
+PLUGIN_VERSION_TUPLE = (0, 0, 8)
+PLUGIN_VERSION = '.'.join([str(x) for x in PLUGIN_VERSION_TUPLE])
 
 import sys, os
 
@@ -43,113 +48,77 @@ from calibre.customize import FileTypePlugin
 from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.constants import iswindows, isosx
 
+# Wrap a stream so that output gets flushed immediately
+# and also make sure that any unicode strings get
+# encoded using "replace" before writing them.
+class SafeUnbuffered:
+    def __init__(self, stream):
+        self.stream = stream
+        self.encoding = stream.encoding
+        if self.encoding == None:
+            self.encoding = "utf-8"
+    def write(self, data):
+        if isinstance(data,unicode):
+            data = data.encode(self.encoding,"replace")
+        self.stream.write(data)
+        self.stream.flush()
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
+
+
 class eRdrDeDRM(FileTypePlugin):
-    name                = 'eReader PDB 2 PML' # Name of the plugin
-    description         = 'Removes DRM from secure pdb files. \
-                            Credit given to The Dark Reverser for the original standalone script.'
+    name                = PLUGIN_NAME
+    description         = u"Removes DRM from secure pdb files. Credit given to The Dark Reverser for the original standalone script."
     supported_platforms = ['linux', 'osx', 'windows'] # Platforms this plugin will run on
-    author              = 'DiapDealer' # The author of this plugin
-    version             = (0, 0, 7)   # The version number of this plugin
+    author              = u"DiapDealer, Apprentice Alf and The Dark Reverser"
+    version             = PLUGIN_VERSION_TUPLE
     file_types          = set(['pdb']) # The file types that this plugin will be applied to
     on_import           = True # Run this plugin during the import
     minimum_calibre_version = (0, 7, 55)
+    priority            = 100
 
     def run(self, path_to_ebook):
-        from calibre_plugins.erdrpdb2pml import erdr2pml, outputfix
-         
-        if sys.stdout.encoding == None:
-            sys.stdout = outputfix.getwriter('utf-8')(sys.stdout)
-        else:
-            sys.stdout = outputfix.getwriter(sys.stdout.encoding)(sys.stdout)
-        if sys.stderr.encoding == None:
-            sys.stderr = outputfix.getwriter('utf-8')(sys.stderr)
-        else:
-            sys.stderr = outputfix.getwriter(sys.stderr.encoding)(sys.stderr)
-        
-        global bookname, erdr2pml
-        
+
+        # make sure any unicode output gets converted safely with 'replace'
+        sys.stdout=SafeUnbuffered(sys.stdout)
+        sys.stderr=SafeUnbuffered(sys.stderr)
+
+        print u"{0} v{1}: Trying to decrypt {2}.".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
+
         infile = path_to_ebook
         bookname = os.path.splitext(os.path.basename(infile))[0]
         outdir = PersistentTemporaryDirectory()
         pmlzfile = self.temporary_file(bookname + '.pmlz')
-        
+
         if self.site_customization:
+            from calibre_plugins.erdrpdb2pml import erdr2pml
+
             keydata = self.site_customization
             ar = keydata.split(':')
             for i in ar:
                 try:
                     name, cc = i.split(',')
-                    #remove spaces at start or end of name, and anywhere in CC
-                    name = name.strip()
-                    cc = cc.replace(" ","")
+                    user_key = erdr2pml.getuser_key(name,cc)
                 except ValueError:
-                    print '   Error parsing user supplied data.'
+                    print u"{0} v{1}: Error parsing user supplied data.".format(PLUGIN_NAME, PLUGIN_VERSION)
                     return path_to_ebook
-                
+
                 try:
-                    print "Processing..."
+                    print u"{0} v{1}: Processing...".format(PLUGIN_NAME, PLUGIN_VERSION)
                     import time
                     start_time = time.time()
-                    pmlfilepath = self.convertEreaderToPml(infile, name, cc, outdir)
-                    
-                    if pmlfilepath and pmlfilepath != 1:
-                        import zipfile
-                        print "   Creating PMLZ file"
-                        myZipFile = zipfile.ZipFile(pmlzfile.name,'w',zipfile.ZIP_STORED, False)
-                        list = os.listdir(outdir)
-                        for file in list:
-                            localname = file
-                            filePath = os.path.join(outdir,file)
-                            if os.path.isfile(filePath):
-                                myZipFile.write(filePath, localname)
-                            elif os.path.isdir(filePath):
-                                imageList = os.listdir(filePath)
-                                localimgdir = os.path.basename(filePath)
-                                for image in imageList:
-                                    localname = os.path.join(localimgdir,image)
-                                    imagePath = os.path.join(filePath,image)
-                                    if os.path.isfile(imagePath):
-                                        myZipFile.write(imagePath, localname)
-                        myZipFile.close()
-                        end_time = time.time()
-                        search_time = end_time - start_time
-                        print 'elapsed time: %.2f seconds' % (search_time, ) 
-                        print "done"
+                    if erdr2pml.decryptBook(infile,pmlzfile.name,True,user_key) == 0:
+                        print u"{0} v{1}: Elapsed time: {2:.2f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-start_time)
                         return pmlzfile.name
                     else:
-                        raise ValueError('Error Creating PML file.')
+                        raise ValueError(u"{0} v{1}: Error Creating PML file.".format(PLUGIN_NAME, PLUGIN_VERSION))
                 except ValueError, e:
-                        print "Error: %s" % e
+                        print u"{0} v{1}: Error: {2}".format(PLUGIN_NAME, PLUGIN_VERSION,e.args[0])
                         pass
-            raise Exception('Couldn\'t decrypt pdb file.')
+            raise Exception(u"{0} v{1}: Couldn\'t decrypt pdb file. See Apprentice Alf's blog for help.".format(PLUGIN_NAME, PLUGIN_VERSION))
         else:
-            raise Exception('No name and CC# provided.')
-        
-    def convertEreaderToPml(self, infile, name, cc, outdir):
+            raise Exception(u"{0} v{1}: No name and CC# provided.".format(PLUGIN_NAME, PLUGIN_VERSION))
 
-        print "   Decoding File"
-        sect = erdr2pml.Sectionizer(infile, 'PNRdPPrs')
-        er = erdr2pml.EreaderProcessor(sect, name, cc)
 
-        if er.getNumImages() > 0:
-            print "   Extracting images"
-            #imagedir = bookname + '_img/'
-            imagedir = 'images/'
-            imagedirpath = os.path.join(outdir,imagedir)
-            if not os.path.exists(imagedirpath):
-                os.makedirs(imagedirpath)
-            for i in xrange(er.getNumImages()):
-                name, contents = er.getImage(i)
-                file(os.path.join(imagedirpath, name), 'wb').write(contents)
-
-        print "   Extracting pml"
-        pml_string = er.getText()
-        pmlfilename = bookname + ".pml"
-        try:
-            file(os.path.join(outdir, pmlfilename),'wb').write(erdr2pml.cleanPML(pml_string))
-            return os.path.join(outdir, pmlfilename)
-        except:
-            return 1
- 
     def customization_help(self, gui=False):
-        return 'Enter Account Name & Last 8 digits of Credit Card number (separate with a comma)'
+        return u"Enter Account Name & Last 8 digits of Credit Card number (separate with a comma, multiple pairs with a colon)"

Calibre_Plugins/eReaderPDB2PML_plugin/erdr2pml.py

@@ -1,8 +1,11 @@
 #!/usr/bin/env python
-# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
-#
+# -*- coding: utf-8 -*-
+
 # erdr2pml.py
+# Copyright © 2008 The Dark Reverser
 #
+# Modified 2008–2012 by some_updates, DiapDealer and Apprentice Alf
+
 # This is a python script. You need a Python interpreter to run it.
 # For example, ActiveState Python, which exists for windows.
 # Changelog
@@ -16,7 +19,7 @@
 # Custom version 0.03 - no change to eReader support, only usability changes
 #   - start of pep-8 indentation (spaces not tab), fix trailing blanks
 #   - version variable, only one place to change
-#   - added main routine, now callable as a library/module, 
+#   - added main routine, now callable as a library/module,
 #     means tools can add optional support for ereader2html
 #   - outdir is no longer a mandatory parameter (defaults based on input name if missing)
 #   - time taken output to stdout
@@ -59,22 +62,14 @@
 #  0.18 - on Windows try PyCrypto first and OpenSSL next
 #  0.19 - Modify the interface to allow use of import
 #  0.20 - modify to allow use inside new interface for calibre plugins
-#  0.21 - Support eReader (drm) version 11. 
-#       - Don't reject dictionary format. 
+#  0.21 - Support eReader (drm) version 11.
+#       - Don't reject dictionary format.
 #       - Ignore sidebars for dictionaries (different format?)
+#  0.22 - Unicode and plugin support, different image folders for PMLZ and source
 
-__version__='0.21'
+__version__='0.22'
 
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-
-import sys
+import sys, re
 import struct, binascii, getopt, zlib, os, os.path, urllib, tempfile
 
 if 'calibre' in sys.modules:
@@ -82,8 +77,66 @@ if 'calibre' in sys.modules:
 else:
     inCalibre = False
 
+# Wrap a stream so that output gets flushed immediately
+# and also make sure that any unicode strings get
+# encoded using "replace" before writing them.
+class SafeUnbuffered:
+    def __init__(self, stream):
+        self.stream = stream
+        self.encoding = stream.encoding
+        if self.encoding == None:
+            self.encoding = "utf-8"
+    def write(self, data):
+        if isinstance(data,unicode):
+            data = data.encode(self.encoding,"replace")
+        self.stream.write(data)
+        self.stream.flush()
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
+
+iswindows = sys.platform.startswith('win')
+isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"mobidedrm.py"]
+    else:
+        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]
+
 Des = None
-if sys.platform.startswith('win'):
+if iswindows:
     # first try with pycrypto
     if inCalibre:
         from calibre_plugins.erdrpdb2pml import pycrypto_des
@@ -168,17 +221,30 @@ class Sectionizer(object):
         off = self.sections[section][0]
         return self.contents[off:end_off]
 
-def sanitizeFileName(s):
-    r = ''
-    for c in s:
-        if c in "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.-":
-            r += c
-    return r
+# cleanup unicode filenames
+# borrowed from calibre from calibre/src/calibre/__init__.py
+# added in removal of control (<32) chars
+# and removal of . at start and end
+# and with some (heavily edited) code from Paul Durrant's kindlenamer.py
+def sanitizeFileName(name):
+    # substitute filename unfriendly characters
+    name = name.replace(u"<",u"[").replace(u">",u"]").replace(u" : ",u" – ").replace(u": ",u" – ").replace(u":",u"—").replace(u"/",u"_").replace(u"\\",u"_").replace(u"|",u"_").replace(u"\"",u"\'")
+    # delete control characters
+    name = u"".join(char for char in name if ord(char)>=32)
+    # white space to single space, delete leading and trailing while space
+    name = re.sub(ur"\s", u" ", name).strip()
+    # remove leading dots
+    while len(name)>0 and name[0] == u".":
+        name = name[1:]
+    # remove trailing dots (Windows doesn't like them)
+    if name.endswith(u'.'):
+        name = name[:-1]
+    return name
 
 def fixKey(key):
     def fixByte(b):
         return b ^ ((b ^ (b<<1) ^ (b<<2) ^ (b<<3) ^ (b<<4) ^ (b<<5) ^ (b<<6) ^ (b<<7) ^ 0x80) & 0x80)
-    return 	"".join([chr(fixByte(ord(a))) for a in key])
+    return     "".join([chr(fixByte(ord(a))) for a in key])
 
 def deXOR(text, sp, table):
     r=''
@@ -191,7 +257,7 @@ def deXOR(text, sp, table):
     return r
 
 class EreaderProcessor(object):
-    def __init__(self, sect, username, creditcard):
+    def __init__(self, sect, user_key):
         self.section_reader = sect.loadSection
         data = self.section_reader(0)
         version,  = struct.unpack('>H', data[0:2])
@@ -212,18 +278,10 @@ class EreaderProcessor(object):
             for i in xrange(len(data)):
                 j = (j + shuf) % len(data)
                 r[j] = data[i]
-            assert	len("".join(r)) == len(data)
+            assert    len("".join(r)) == len(data)
             return "".join(r)
         r = unshuff(input[0:-8], cookie_shuf)
 
-        def fixUsername(s):
-            r = ''
-            for c in s.lower():
-                if (c >= 'a' and c <= 'z' or c >= '0' and c <= '9'):
-                    r += c
-            return r
-
-        user_key = struct.pack('>LL', binascii.crc32(fixUsername(username)) & 0xffffffff, binascii.crc32(creditcard[-8:])& 0xffffffff)
         drm_sub_version = struct.unpack('>H', r[0:2])[0]
         self.num_text_pages = struct.unpack('>H', r[2:4])[0] - 1
         self.num_image_pages = struct.unpack('>H', r[26:26+2])[0]
@@ -302,7 +360,7 @@ class EreaderProcessor(object):
         sect = self.section_reader(self.first_image_page + i)
         name = sect[4:4+32].strip('\0')
         data = sect[62:]
-        return sanitizeFileName(name), data
+        return sanitizeFileName(unicode(name,'windows-1252')), data
 
 
     # def getChapterNamePMLOffsetData(self):
@@ -314,7 +372,7 @@ class EreaderProcessor(object):
     #             offname = deXOR(chaps, j, self.xortable)
     #             offset = struct.unpack('>L', offname[0:4])[0]
     #             name = offname[4:].strip('\0')
-    #             cv += '%d|%s\n' % (offset, name) 
+    #             cv += '%d|%s\n' % (offset, name)
     #     return cv
 
     # def getLinkNamePMLOffsetData(self):
@@ -326,7 +384,7 @@ class EreaderProcessor(object):
     #             offname = deXOR(links, j, self.xortable)
     #             offset = struct.unpack('>L', offname[0:4])[0]
     #             name = offname[4:].strip('\0')
-    #             lv += '%d|%s\n' % (offset, name) 
+    #             lv += '%d|%s\n' % (offset, name)
     #     return lv
 
     # def getExpandedTextSizesData(self):
@@ -354,7 +412,7 @@ class EreaderProcessor(object):
         for i in xrange(self.num_text_pages):
             logging.debug('get page %d', i)
             r += zlib.decompress(des.decrypt(self.section_reader(1 + i)))
-             
+
         # now handle footnotes pages
         if self.num_footnote_pages > 0:
             r += '\n'
@@ -399,60 +457,53 @@ class EreaderProcessor(object):
         return r
 
 def cleanPML(pml):
-	# Convert special characters to proper PML code.  High ASCII start at (\x80, \a128) and go up to (\xff, \a255)
-	pml2 = pml
-	for k in xrange(128,256):
-		badChar = chr(k)
-		pml2 = pml2.replace(badChar, '\\a%03d' % k)
-	return pml2
+    # Convert special characters to proper PML code.  High ASCII start at (\x80, \a128) and go up to (\xff, \a255)
+    pml2 = pml
+    for k in xrange(128,256):
+        badChar = chr(k)
+        pml2 = pml2.replace(badChar, '\\a%03d' % k)
+    return pml2
 
-def convertEreaderToPml(infile, name, cc, outdir):
-    if not os.path.exists(outdir):
-        os.makedirs(outdir)
+def decryptBook(infile, outpath, make_pmlz, user_key):
     bookname = os.path.splitext(os.path.basename(infile))[0]
-    print "   Decoding File"
-    sect = Sectionizer(infile, 'PNRdPPrs')
-    er = EreaderProcessor(sect, name, cc)
-
-    if er.getNumImages() > 0:
-        print "   Extracting images"
-        imagedir = bookname + '_img/'
-        imagedirpath = os.path.join(outdir,imagedir)
-        if not os.path.exists(imagedirpath):
-            os.makedirs(imagedirpath)
-        for i in xrange(er.getNumImages()):
-            name, contents = er.getImage(i)
-            file(os.path.join(imagedirpath, name), 'wb').write(contents)
-
-    print "   Extracting pml"
-    pml_string = er.getText()
-    pmlfilename = bookname + ".pml"
-    file(os.path.join(outdir, pmlfilename),'wb').write(cleanPML(pml_string))
-
-    # bkinfo = er.getBookInfo()
-    # if bkinfo != '':
-    #     print "   Extracting book meta information"
-    #     file(os.path.join(outdir, 'bookinfo.txt'),'wb').write(bkinfo)
-
-
-                
-def decryptBook(infile, outdir, name, cc, make_pmlz):
-    if make_pmlz :
-        # ignore specified outdir, use tempdir instead
+    if make_pmlz:
+        # outpath is actually pmlz name
+        pmlzname = outpath
         outdir = tempfile.mkdtemp()
+        imagedirpath = os.path.join(outdir,u"images")
+    else:
+        pmlzname = None
+        outdir = outpath
+        imagedirpath = os.path.join(outdir,bookname + u"_img")
+
     try:
-        print "Processing..."
-        convertEreaderToPml(infile, name, cc, outdir)
-        if make_pmlz :
+        if not os.path.exists(outdir):
+            os.makedirs(outdir)
+        print u"Decoding File"
+        sect = Sectionizer(infile, 'PNRdPPrs')
+        er = EreaderProcessor(sect, user_key)
+
+        if er.getNumImages() > 0:
+            print u"Extracting images"
+            if not os.path.exists(imagedirpath):
+                os.makedirs(imagedirpath)
+            for i in xrange(er.getNumImages()):
+                name, contents = er.getImage(i)
+                file(os.path.join(imagedirpath, name), 'wb').write(contents)
+
+        print u"Extracting pml"
+        pml_string = er.getText()
+        pmlfilename = bookname + ".pml"
+        file(os.path.join(outdir, pmlfilename),'wb').write(cleanPML(pml_string))
+        if pmlzname is not None:
             import zipfile
             import shutil
-            print "   Creating PMLZ file"
-            zipname = infile[:-4] + '.pmlz'
-            myZipFile = zipfile.ZipFile(zipname,'w',zipfile.ZIP_STORED, False)
+            print u"Creating PMLZ file {0}".format(os.path.basename(pmlzname))
+            myZipFile = zipfile.ZipFile(pmlzname,'w',zipfile.ZIP_STORED, False)
             list = os.listdir(outdir)
-            for file in list:
-                localname = file
-                filePath = os.path.join(outdir,file)
+            for filename in list:
+                localname = filename
+                filePath = os.path.join(outdir,filename)
                 if os.path.isfile(filePath):
                     myZipFile.write(filePath, localname)
                 elif os.path.isdir(filePath):
@@ -466,36 +517,46 @@ def decryptBook(infile, outdir, name, cc, make_pmlz):
             myZipFile.close()
             # remove temporary directory
             shutil.rmtree(outdir, True)
-            print 'output is %s' % zipname
+            print u"Output is {0}".format(pmlzname)
         else :
-            print 'output in %s' % outdir 
+            print u"Output is in {0}".format(outdir)
         print "done"
     except ValueError, e:
-        print "Error: %s" % e
+        print u"Error: {0}".format(e.args[0])
         return 1
     return 0
 
 
 def usage():
-    print "Converts DRMed eReader books to PML Source"
-    print "Usage:"
-    print "  erdr2pml [options] infile.pdb [outdir] \"your name\" credit_card_number "
-    print " "
-    print "Options: "
-    print "  -h                prints this message"
-    print "  --make-pmlz       create PMLZ instead of using output directory"
-    print " "
-    print "Note:"
-    print "  if ommitted, outdir defaults based on 'infile.pdb'"
-    print "  It's enough to enter the last 8 digits of the credit card number"
+    print u"Converts DRMed eReader books to PML Source"
+    print u"Usage:"
+    print u"  erdr2pml [options] infile.pdb [outpath] \"your name\" credit_card_number"
+    print u" "
+    print u"Options: "
+    print u"  -h             prints this message"
+    print u"  -p             create PMLZ instead of source folder"
+    print u"  --make-pmlz    create PMLZ instead of source folder"
+    print u" "
+    print u"Note:"
+    print u"  if outpath is ommitted, creates source in 'infile_Source' folder"
+    print u"  if outpath is ommitted and pmlz option, creates PMLZ 'infile.pmlz'"
+    print u"  if source folder created, images are in infile_img folder"
+    print u"  if pmlz file created, images are in images folder"
+    print u"  It's enough to enter the last 8 digits of the credit card number"
     return
 
+def getuser_key(name,cc):
+    newname = "".join(c for c in name.lower() if c >= 'a' and c <= 'z' or c >= '0' and c <= '9')
+    cc = cc.replace(" ","")
+    return struct.pack('>LL', binascii.crc32(newname) & 0xffffffff,binascii.crc32(cc[-8:])& 0xffffffff)
+
+def cli_main(argv=unicode_argv()):
+    print u"eRdr2Pml v{0}. Copyright © 2009–2012 The Dark Reverser et al.".format(__version__)
 
-def main(argv=None):
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "h", ["make-pmlz"])
+        opts, args = getopt.getopt(argv[1:], "hp", ["make-pmlz"])
     except getopt.GetoptError, err:
-        print str(err)
+        print err.args[0]
         usage()
         return 1
     make_pmlz = False
@@ -503,25 +564,31 @@ def main(argv=None):
         if o == "-h":
             usage()
             return 0
+        elif o == "-p":
+            make_pmlz = True
         elif o == "--make-pmlz":
             make_pmlz = True
-    
-    print "eRdr2Pml v%s. Copyright (c) 2009 The Dark Reverser" % __version__
 
     if len(args)!=3 and len(args)!=4:
         usage()
         return 1
 
     if len(args)==3:
-        infile, name, cc = args[0], args[1], args[2]
-        outdir = infile[:-4] + '_Source'
+        infile, name, cc = args
+        if make_pmlz:
+            outpath = os.path.splitext(infile)[0] + u".pmlz"
+        else:
+            outpath = os.path.splitext(infile)[0] + u"_Source"
     elif len(args)==4:
-        infile, outdir, name, cc = args[0], args[1], args[2], args[3]
+        infile, outpath, name, cc = args
 
-    return decryptBook(infile, outdir, name, cc, make_pmlz)
+    print getuser_key(name,cc).encode('hex')
+
+    return decryptBook(infile, outpath, make_pmlz, getuser_key(name,cc))
 
 
 if __name__ == "__main__":
-    sys.stdout=Unbuffered(sys.stdout)
-    sys.exit(main())
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    sys.exit(cli_main())
 

Calibre_Plugins/eReaderPDB2PML_plugin/openssl_des.py

@@ -18,7 +18,7 @@ def load_libcrypto():
         return None
 
     libcrypto = CDLL(libcrypto)
-    
+
     # typedef struct DES_ks
     #     {
     #     union
@@ -30,7 +30,7 @@ def load_libcrypto():
     #         } ks[16];
     #     } DES_key_schedule;
 
-    # just create a big enough place to hold everything 
+    # just create a big enough place to hold everything
     # it will have alignment of structure so we should be okay (16 byte aligned?)
     class DES_KEY_SCHEDULE(Structure):
         _fields_ = [('DES_cblock1', c_char * 16),
@@ -61,7 +61,7 @@ def load_libcrypto():
     DES_set_key = F(None, 'DES_set_key',[c_char_p, DES_KEY_SCHEDULE_p])
     DES_ecb_encrypt = F(None, 'DES_ecb_encrypt',[c_char_p, c_char_p, DES_KEY_SCHEDULE_p, c_int])
 
-    
+
     class DES(object):
         def __init__(self, key):
             if len(key) != 8 :
@@ -87,4 +87,3 @@ def load_libcrypto():
             return ''.join(result)
 
     return DES
-

Calibre_Plugins/eReaderPDB2PML_plugin/outputfix.py

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Adapted and simplified from the kitchen project
-#
-# Kitchen Project Copyright (c) 2012 Red Hat, Inc.
-#
-# kitchen is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# kitchen is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with kitchen; if not, see <http://www.gnu.org/licenses/>
-#
-# Authors:
-#   Toshio Kuratomi <toshio@fedoraproject.org>
-#   Seth Vidal
-#
-# Portions of code taken from yum/i18n.py and
-# python-fedora: fedora/textutils.py
-
-import codecs
-
-# returns a char string unchanged
-# returns a unicode string converted to a char string of the passed encoding
-# return the empty string for anything else
-def getwriter(encoding):
-    class _StreamWriter(codecs.StreamWriter):
-        def __init__(self, stream):
-            codecs.StreamWriter.__init__(self, stream, 'replace')
-
-        def encode(self, msg, errors='replace'):
-            if isinstance(msg, basestring):
-                if isinstance(msg, str):
-                    return (msg, len(msg))
-                return (msg.encode(self.encoding, 'replace'), len(msg))
-            return ('',0)
-
-    _StreamWriter.encoding = encoding
-    return _StreamWriter

Calibre_Plugins/eReaderPDB2PML_plugin/pycrypto_des.py

@@ -28,4 +28,3 @@ def load_pycrypto():
                 i += 8
             return ''.join(result)
     return DES
-

Calibre_Plugins/eReaderPDB2PML_plugin/python_des.py

@@ -2,8 +2,8 @@
 # vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
 import sys
 
-ECB =	0
-CBC =	1
+ECB =   0
+CBC =   1
 class Des(object):
     __pc1 = [56, 48, 40, 32, 24, 16,  8,  0, 57, 49, 41, 33, 25, 17,
           9,  1, 58, 50, 42, 34, 26, 18, 10,  2, 59, 51, 43, 35,
@@ -11,13 +11,13 @@ class Des(object):
          13,  5, 60, 52, 44, 36, 28, 20, 12,  4, 27, 19, 11,  3]
     __left_rotations = [1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1]
     __pc2 = [13, 16, 10, 23,  0,  4,2, 27, 14,  5, 20,  9,
-        22, 18, 11,  3, 25,  7,	15,  6, 26, 19, 12,  1,
-        40, 51, 30, 36, 46, 54,	29, 39, 50, 44, 32, 47,
-        43, 48, 38, 55, 33, 52,	45, 41, 49, 35, 28, 31]
-    __ip = [57, 49, 41, 33, 25, 17, 9,  1,	59, 51, 43, 35, 27, 19, 11, 3,
-        61, 53, 45, 37, 29, 21, 13, 5,	63, 55, 47, 39, 31, 23, 15, 7,
-        56, 48, 40, 32, 24, 16, 8,  0,	58, 50, 42, 34, 26, 18, 10, 2,
-        60, 52, 44, 36, 28, 20, 12, 4,	62, 54, 46, 38, 30, 22, 14, 6]
+        22, 18, 11,  3, 25,  7, 15,  6, 26, 19, 12,  1,
+        40, 51, 30, 36, 46, 54, 29, 39, 50, 44, 32, 47,
+        43, 48, 38, 55, 33, 52, 45, 41, 49, 35, 28, 31]
+    __ip = [57, 49, 41, 33, 25, 17, 9,  1,      59, 51, 43, 35, 27, 19, 11, 3,
+        61, 53, 45, 37, 29, 21, 13, 5,  63, 55, 47, 39, 31, 23, 15, 7,
+        56, 48, 40, 32, 24, 16, 8,  0,  58, 50, 42, 34, 26, 18, 10, 2,
+        60, 52, 44, 36, 28, 20, 12, 4,  62, 54, 46, 38, 30, 22, 14, 6]
     __expansion_table = [31,  0,  1,  2,  3,  4, 3,  4,  5,  6,  7,  8,
          7,  8,  9, 10, 11, 12,11, 12, 13, 14, 15, 16,
         15, 16, 17, 18, 19, 20,19, 20, 21, 22, 23, 24,
@@ -61,8 +61,8 @@ class Des(object):
         35,  3, 43, 11, 51, 19, 59, 27,34,  2, 42, 10, 50, 18, 58, 26,
         33,  1, 41,  9, 49, 17, 57, 25,32,  0, 40,  8, 48, 16, 56, 24]
     # Type of crypting being done
-    ENCRYPT =	0x00
-    DECRYPT =	0x01
+    ENCRYPT =   0x00
+    DECRYPT =   0x01
     def __init__(self, key, mode=ECB, IV=None):
         if len(key) != 8:
             raise ValueError("Invalid DES key size. Key must be exactly 8 bytes long.")
@@ -74,7 +74,7 @@ class Des(object):
             self.setIV(IV)
         self.L = []
         self.R = []
-        self.Kn = [ [0] * 48 ] * 16	# 16 48-bit keys (K1 - K16)
+        self.Kn = [ [0] * 48 ] * 16     # 16 48-bit keys (K1 - K16)
         self.final = []
         self.setKey(key)
     def getKey(self):