tools v5.2

2012-09-09 01:45:24 +01:00
parent 0812438b9d
commit f3f02adc98
75 changed files with 2556 additions and 1092 deletions
--- a/Other_Tools/Additional_Tools/lib/mobidedrm.py
+++ b/Other_Tools/Additional_Tools/lib/mobidedrm.py
@@ -27,8 +27,8 @@
 #         files reveals that a confusion has arisen because trailing data entries
 #         are not encrypted, but it turns out that the multibyte entries
 #         in utf8 file are encrypted. (Although neither kind gets compressed.)
-#         This knowledge leads to a simplification of the test for the 
-#         trailing data byte flags - version 5 and higher AND header size >= 0xE4. 
+#         This knowledge leads to a simplification of the test for the
+#         trailing data byte flags - version 5 and higher AND header size >= 0xE4.
 #  0.15 - Now outputs 'heartbeat', and is also quicker for long files.
 #  0.16 - And reverts to 'done' not 'done.' at the end for unswindle compatibility.
 #  0.17 - added modifications to support its use as an imported python module
@@ -42,7 +42,7 @@
 #  0.20 - Correction: It seems that multibyte entries are encrypted in a v6 file.
 #  0.21 - Added support for multiple pids
 #  0.22 - revised structure to hold MobiBook as a class to allow an extended interface
-#  0.23 - fixed problem with older files with no EXTH section 
+#  0.23 - fixed problem with older files with no EXTH section
 #  0.24 - add support for type 1 encryption and 'TEXtREAd' books as well
 #  0.25 - Fixed support for 'BOOKMOBI' type 1 encryption
 #  0.26 - Now enables Text-To-Speech flag and sets clipping limit to 100%
@@ -55,8 +55,13 @@
 #  0.31 - The multibyte encrytion info is true for version 7 files too.
 #  0.32 - Added support for "Print Replica" Kindle ebooks
 #  0.33 - Performance improvements for large files (concatenation)
+#  0.34 - Performance improvements in decryption (libalfcrypto)
+#  0.35 - add interface to get mobi_version
+#  0.36 - fixed problem with TEXtREAd and getBookTitle interface
+#  0.37 - Fixed double announcement for stand-alone operation

-__version__ = '0.33'
+
+__version__ = '0.37'

 import sys

@@ -73,6 +78,7 @@ sys.stdout=Unbuffered(sys.stdout)
 import os
 import struct
 import binascii
+from alfcrypto import Pukall_Cipher

 class DrmException(Exception):
    pass
@@ -84,36 +90,37 @@ class DrmException(Exception):

 # Implementation of Pukall Cipher 1
 def PC1(key, src, decryption=True):
-    sum1 = 0;
-    sum2 = 0;
-    keyXorVal = 0;
-    if len(key)!=16:
-        print "Bad key length!"
-        return None
-    wkey = []
-    for i in xrange(8):
-        wkey.append(ord(key[i*2])<<8 | ord(key[i*2+1]))
-    dst = ""
-    for i in xrange(len(src)):
-        temp1 = 0;
-        byteXorVal = 0;
-        for j in xrange(8):
-            temp1 ^= wkey[j]
-            sum2  = (sum2+j)*20021 + sum1
-            sum1  = (temp1*346)&0xFFFF
-            sum2  = (sum2+sum1)&0xFFFF
-            temp1 = (temp1*20021+1)&0xFFFF
-            byteXorVal ^= temp1 ^ sum2
-        curByte = ord(src[i])
-        if not decryption:
-            keyXorVal = curByte * 257;
-        curByte = ((curByte ^ (byteXorVal >> 8)) ^ byteXorVal) & 0xFF
-        if decryption:
-            keyXorVal = curByte * 257;
-        for j in xrange(8):
-            wkey[j] ^= keyXorVal;
-        dst+=chr(curByte)
-    return dst
+    return Pukall_Cipher().PC1(key,src,decryption)
+#     sum1 = 0;
+#     sum2 = 0;
+#     keyXorVal = 0;
+#     if len(key)!=16:
+#         print "Bad key length!"
+#         return None
+#     wkey = []
+#     for i in xrange(8):
+#         wkey.append(ord(key[i*2])<<8 | ord(key[i*2+1]))
+#     dst = ""
+#     for i in xrange(len(src)):
+#         temp1 = 0;
+#         byteXorVal = 0;
+#         for j in xrange(8):
+#             temp1 ^= wkey[j]
+#             sum2  = (sum2+j)*20021 + sum1
+#             sum1  = (temp1*346)&0xFFFF
+#             sum2  = (sum2+sum1)&0xFFFF
+#             temp1 = (temp1*20021+1)&0xFFFF
+#             byteXorVal ^= temp1 ^ sum2
+#         curByte = ord(src[i])
+#         if not decryption:
+#             keyXorVal = curByte * 257;
+#         curByte = ((curByte ^ (byteXorVal >> 8)) ^ byteXorVal) & 0xFF
+#         if decryption:
+#             keyXorVal = curByte * 257;
+#         for j in xrange(8):
+#             wkey[j] ^= keyXorVal;
+#         dst+=chr(curByte)
+#     return dst

 def checksumPid(s):
    letters = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789"
@@ -164,9 +171,10 @@ class MobiBook:
        off = self.sections[section][0]
        return self.data_file[off:endoff]

-    def __init__(self, infile):
-        print ('MobiDeDrm v%(__version__)s. '
-           'Copyright 2008-2011 The Dark Reverser et al.' % globals())
+    def __init__(self, infile, announce = True):
+        if announce:
+            print ('MobiDeDrm v%(__version__)s. '
+               'Copyright 2008-2012 The Dark Reverser et al.' % globals())

        # initial sanity check on file
        self.data_file = file(infile, 'rb').read()
@@ -194,6 +202,7 @@ class MobiBook:
            print "Book has format: ", self.magic
            self.extra_data_flags = 0
            self.mobi_length = 0
+            self.mobi_codepage = 1252
            self.mobi_version = -1
            self.meta_array = {}
            return
@@ -237,25 +246,26 @@ class MobiBook:
            self.meta_array = {}
            pass
        self.print_replica = False
-            
+
    def getBookTitle(self):
        codec_map = {
            1252 : 'windows-1252',
            65001 : 'utf-8',
        }
        title = ''
-        if 503 in self.meta_array:
-            title = self.meta_array[503]
-        else :
-            toff, tlen = struct.unpack('>II', self.sect[0x54:0x5c])
-            tend = toff + tlen
-            title = self.sect[toff:tend]
+        codec = 'windows-1252'
+        if self.magic == 'BOOKMOBI':
+            if 503 in self.meta_array:
+                title = self.meta_array[503]
+            else:
+                toff, tlen = struct.unpack('>II', self.sect[0x54:0x5c])
+                tend = toff + tlen
+                title = self.sect[toff:tend]
+            if self.mobi_codepage in codec_map.keys():
+                codec = codec_map[self.mobi_codepage]
        if title == '':
            title = self.header[:32]
            title = title.split("\0")[0]
-        codec = 'windows-1252'
-        if self.mobi_codepage in codec_map.keys():
-            codec = codec_map[self.mobi_codepage]
        return unicode(title, codec).encode('utf-8')

    def getPIDMetaInfo(self):
@@ -320,6 +330,9 @@ class MobiBook:

    def getMobiFile(self, outpath):
        file(outpath,'wb').write(self.mobi_data)
+
+    def getMobiVersion(self):
+        return self.mobi_version
        
    def getPrintReplica(self):
        return self.print_replica
@@ -356,9 +369,9 @@ class MobiBook:
            if self.magic == 'TEXtREAd':
                bookkey_data = self.sect[0x0E:0x0E+16]
            elif self.mobi_version < 0:
-                bookkey_data = self.sect[0x90:0x90+16] 
+                bookkey_data = self.sect[0x90:0x90+16]
            else:
-                bookkey_data = self.sect[self.mobi_length+16:self.mobi_length+32] 
+                bookkey_data = self.sect[self.mobi_length+16:self.mobi_length+32]
            pid = "00000000"
            found_key = PC1(t1_keyvec, bookkey_data)
        else :
@@ -368,12 +381,12 @@ class MobiBook:
                raise DrmException("Not yet initialised with PID. Must be opened with Mobipocket Reader first.")
            found_key, pid = self.parseDRM(self.sect[drm_ptr:drm_ptr+drm_size], drm_count, goodpids)
            if not found_key:
-                raise DrmException("No key found. Most likely the correct PID has not been given.")
+                raise DrmException("No key found in " + str(len(goodpids)) + " keys tried. Please report this failure for help.")
            # kill the drm keys
            self.patchSection(0, "\0" * drm_size, drm_ptr)
            # kill the drm pointers
            self.patchSection(0, "\xff" * 4 + "\0" * 12, 0xA8)
-            
+
        if pid=="00000000":
            print "File has default encryption, no specific PID."
        else:
@@ -404,26 +417,26 @@ class MobiBook:
        print "done"
        return

-def getUnencryptedBook(infile,pid):
+def getUnencryptedBook(infile,pid,announce=True):
    if not os.path.isfile(infile):
        raise DrmException('Input File Not Found')
-    book = MobiBook(infile)
+    book = MobiBook(infile,announce)
    book.processBook([pid])
    return book.mobi_data

-def getUnencryptedBookWithList(infile,pidlist):
+def getUnencryptedBookWithList(infile,pidlist,announce=True):
    if not os.path.isfile(infile):
        raise DrmException('Input File Not Found')
-    book = MobiBook(infile)
+    book = MobiBook(infile, announce)
    book.processBook(pidlist)
    return book.mobi_data


 def main(argv=sys.argv):
    print ('MobiDeDrm v%(__version__)s. '
-        'Copyright 2008-2011 The Dark Reverser et al.' % globals())
+        'Copyright 2008-2012 The Dark Reverser et al.' % globals())
    if len(argv)<3 or len(argv)>4:
-        print "Removes protection from Kindle/Mobipocket and Kindle/Print Replica ebooks"
+        print "Removes protection from Kindle/Mobipocket, Kindle/KF8 and Kindle/Print Replica ebooks"
        print "Usage:"
        print "    %s <infile> <outfile> [<Comma separated list of PIDs to try>]" % sys.argv[0]
        return 1
@@ -435,7 +448,7 @@ def main(argv=sys.argv):
        else:
            pidlist = {}
        try:
-            stripped_file = getUnencryptedBookWithList(infile, pidlist)
+            stripped_file = getUnencryptedBookWithList(infile, pidlist, False)
            file(outfile, 'wb').write(stripped_file)
        except DrmException, e:
            print "Error: %s" % e
--- a/Other_Tools/Adobe_PDF_Tools/ineptpdf.pyw
+++ b/Other_Tools/Adobe_PDF_Tools/ineptpdf.pyw
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# ineptpdf.pyw, version 7.9
+# ineptpdf.pyw, version 7.11

 from __future__ import with_statement

@@ -34,6 +34,8 @@ from __future__ import with_statement
 #   7.7 - On Windows try PyCrypto first and OpenSSL next
 #   7.8 - Modify interface to allow use of import
 #   7.9 - Bug fix for some session key errors when len(bookkey) > length required
+#   7.10 - Various tweaks to fix minor problems.
+#   7.11 - More tweaks to fix minor problems.

 """
 Decrypts Adobe ADEPT-encrypted PDF files.
@@ -2200,11 +2202,19 @@ class DecryptionDialog(Tkinter.Frame):

 def decryptBook(keypath, inpath, outpath):
    with open(inpath, 'rb') as inf:
-        serializer = PDFSerializer(inf, keypath)
+        try:
+            serializer = PDFSerializer(inf, keypath)
+        except:
+            print "Error serializing pdf. Probably wrong key."
+            return 1
        # hope this will fix the 'bad file descriptor' problem
        with open(outpath, 'wb') as outf:
        # help construct to make sure the method runs to the end
-            serializer.dump(outf)
+            try:
+                serializer.dump(outf)
+            except:
+                print "error writing pdf."
+                return 1
    return 0


--- a/Other_Tools/KindleBooks/lib/config.py
+++ b/Other_Tools/KindleBooks/lib/config.py
@@ -0,0 +1,59 @@
+from PyQt4.Qt import QWidget, QVBoxLayout, QLabel, QLineEdit
+
+from calibre.utils.config import JSONConfig
+
+# This is where all preferences for this plugin will be stored
+# You should always prefix your config file name with plugins/,
+# so as to ensure you dont accidentally clobber a calibre config file
+prefs = JSONConfig('plugins/K4MobiDeDRM')
+
+# Set defaults
+prefs.defaults['pids'] = ""
+prefs.defaults['serials'] = ""
+prefs.defaults['WINEPREFIX'] = None
+
+
+class ConfigWidget(QWidget):
+
+    def __init__(self):
+        QWidget.__init__(self)
+        self.l = QVBoxLayout()
+        self.setLayout(self.l)
+
+        self.serialLabel = QLabel('Kindle Serial numbers (separate with commas, no spaces)')
+        self.l.addWidget(self.serialLabel)
+
+        self.serials = QLineEdit(self)
+        self.serials.setText(prefs['serials'])
+        self.l.addWidget(self.serials)
+        self.serialLabel.setBuddy(self.serials)
+
+        self.pidLabel = QLabel('Mobipocket PIDs (separate with commas, no spaces)')
+        self.l.addWidget(self.pidLabel)
+
+        self.pids = QLineEdit(self)
+        self.pids.setText(prefs['pids'])
+        self.l.addWidget(self.pids)
+        self.pidLabel.setBuddy(self.serials)
+
+        self.wpLabel = QLabel('For Linux only: WINEPREFIX (enter absolute path)')
+        self.l.addWidget(self.wpLabel)
+
+        self.wineprefix = QLineEdit(self)
+        wineprefix = prefs['WINEPREFIX']
+        if wineprefix is not None:
+            self.wineprefix.setText(wineprefix)
+        else:
+            self.wineprefix.setText('')
+
+        self.l.addWidget(self.wineprefix)
+        self.wpLabel.setBuddy(self.wineprefix)
+
+    def save_settings(self):
+        prefs['pids'] = str(self.pids.text())
+        prefs['serials'] = str(self.serials.text())
+        winepref=str(self.wineprefix.text())
+        if winepref.strip() != '':
+            prefs['WINEPREFIX'] = winepref
+        else:
+            prefs['WINEPREFIX'] = None
--- a/Other_Tools/KindleBooks/lib/convert2xml.py
+++ b/Other_Tools/KindleBooks/lib/convert2xml.py
@@ -214,6 +214,7 @@ class PageParser(object):
        'links.title'  : (1, 'text', 0, 0),
        'links.href'   : (1, 'text', 0, 0),
        'links.type'   : (1, 'text', 0, 0),
+        'links.id'     : (1, 'number', 0, 0),

        'paraCont'          : (0, 'number', 1, 1),
        'paraCont.rootID'   : (1, 'number', 0, 0),
@@ -239,6 +240,7 @@ class PageParser(object):
        'group'           : (1, 'snippets', 1, 0),
        'group.type'      : (1, 'scalar_text', 0, 0),
        'group._tag'      : (1, 'scalar_text', 0, 0),
+        'group.orientation': (1, 'scalar_text', 0, 0),

        'region'           : (1, 'snippets', 1, 0),
        'region.type'      : (1, 'scalar_text', 0, 0),
@@ -246,7 +248,7 @@ class PageParser(object):
        'region.y'         : (1, 'scalar_number', 0, 0),
        'region.h'         : (1, 'scalar_number', 0, 0),
        'region.w'         : (1, 'scalar_number', 0, 0),
-        'region.orientation' : (1, 'scalar_number', 0, 0),
+        'region.orientation' : (1, 'scalar_text', 0, 0),

        'empty_text_region' : (1, 'snippets', 1, 0),

--- a/Other_Tools/KindleBooks/lib/getk4pcpids.py
+++ b/Other_Tools/KindleBooks/lib/getk4pcpids.py
@@ -0,0 +1,77 @@
+#!/usr/bin/python
+#
+# This is a python script. You need a Python interpreter to run it.
+# For example, ActiveState Python, which exists for windows.
+#
+# Changelog
+#  1.00 - Initial version
+
+__version__ = '1.00'
+
+import sys
+
+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)
+sys.stdout=Unbuffered(sys.stdout)
+
+import os
+import struct
+import binascii
+import kgenpids
+import topazextract
+import mobidedrm
+from alfcrypto import Pukall_Cipher
+
+class DrmException(Exception):
+    pass
+
+def getK4PCpids(path_to_ebook):
+    # Return Kindle4PC PIDs. Assumes that the caller checked that we are not on Linux, which will raise an exception
+
+    mobi = True
+    magic3 = file(path_to_ebook,'rb').read(3)
+    if magic3 == 'TPZ':
+        mobi = False
+
+    if mobi:
+        mb = mobidedrm.MobiBook(path_to_ebook,False)
+    else:
+        mb = topazextract.TopazBook(path_to_ebook)
+    
+    md1, md2 = mb.getPIDMetaInfo()
+
+    return kgenpids.getPidList(md1, md2, True, [], [], []) 
+
+
+def main(argv=sys.argv):
+    print ('getk4pcpids.py v%(__version__)s. '
+        'Copyright 2012 Apprentic Alf' % globals())
+
+    if len(argv)<2 or len(argv)>3:
+        print "Gets the possible book-specific PIDs from K4PC for a particular book"
+        print "Usage:"
+        print "    %s <bookfile> [<outfile>]" % sys.argv[0]
+        return 1
+    else:
+        infile = argv[1]
+        try:
+            pidlist = getK4PCpids(infile)
+        except DrmException, e:
+            print "Error: %s" % e
+            return 1
+        pidstring = ','.join(pidlist)
+        print "Possible PIDs are: ", pidstring
+        if len(argv) is 3:
+            outfile = argv[2]
+            file(outfile, 'w').write(pidstring)
+        
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main())
--- a/Other_Tools/KindleBooks/lib/k4mobidedrm.py
+++ b/Other_Tools/KindleBooks/lib/k4mobidedrm.py
@@ -17,7 +17,7 @@ from __future__ import with_statement
 #    and many many others


-__version__ = '4.2'
+__version__ = '4.4'

 class Unbuffered:
    def __init__(self, stream):
@@ -58,7 +58,7 @@ else:
 # borrowed from calibre from calibre/src/calibre/__init__.py
 # added in removal of non-printing chars
 # and removal of . at start
-# convert spaces to underscores
+# convert underscores to spaces (we're OK with spaces in file names)
 def cleanup_name(name):
    _filename_sanitize = re.compile(r'[\xae\0\\|\?\*<":>\+/]')
    substitute='_'
@@ -73,7 +73,7 @@ def cleanup_name(name):
    # Mac and Unix don't like file names that begin with a full stop
    if len(one) > 0 and one[0] == '.':
        one = substitute+one[1:]
-    one = one.replace(' ','_')
+    one = one.replace('_',' ')
    return one

 def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
@@ -99,11 +99,20 @@ def decryptBook(infile, outdir, k4, kInfoFiles, serials, pids):
    title = mb.getBookTitle()
    print "Processing Book: ", title
    filenametitle = cleanup_name(title)
-    outfilename = bookname
-    if len(outfilename)<=8 or len(filenametitle)<=8:
-        outfilename = outfilename + "_" + filenametitle
-    elif outfilename[:8] != filenametitle[:8]:
-        outfilename = outfilename[:8] + "_" + filenametitle
+    outfilename = cleanup_name(bookname)
+    
+    # generate 'sensible' filename, that will sort with the original name,
+    # but is close to the name from the file.
+    outlength = len(outfilename)
+    comparelength = min(8,min(outlength,len(filenametitle)))
+    copylength = min(max(outfilename.find(' '),8),len(outfilename))
+    if outlength==0:
+        outfilename = filenametitle
+    elif comparelength > 0:
+    	if outfilename[:comparelength] == filenametitle[:comparelength]:
+        	outfilename = filenametitle
+        else:
+        	outfilename = outfilename[:copylength] + " " + filenametitle

    # avoid excessively long file names
    if len(outfilename)>150:
--- a/Other_Tools/KindleBooks/lib/k4mutils.py
+++ b/Other_Tools/KindleBooks/lib/k4mutils.py
@@ -385,17 +385,22 @@ def GetIDString():
    if isNewInstall():
        mungedmac = GetMACAddressMunged()
        if len(mungedmac) > 7:
+            print('Using Munged MAC Address for ID: '+mungedmac)
            return mungedmac
    sernum = GetVolumeSerialNumber()
    if len(sernum) > 7:
+        print('Using Volume Serial Number for ID: '+sernum)
        return sernum
    diskpart = GetUserHomeAppSupKindleDirParitionName()
    uuidnum = GetDiskPartitionUUID(diskpart)
    if len(uuidnum) > 7:
+        print('Using Disk Partition UUID for ID: '+uuidnum)
        return uuidnum
    mungedmac = GetMACAddressMunged()
    if len(mungedmac) > 7:
+        print('Using Munged MAC Address for ID: '+mungedmac)
        return mungedmac
+    print('Using Fixed constant 9999999999 for ID.')
    return '9999999999'


@@ -498,6 +503,7 @@ def getKindleInfoFiles(kInfoFiles):
    for resline in reslst:
        if os.path.isfile(resline):
            kInfoFiles.append(resline)
+            print('Found K4Mac kindle-info file: ' + resline)
            found = True
    # add any .rainier*-kinf files
    cmdline = 'find "' + home + '/Library/Application Support" -name ".rainier*-kinf"'
@@ -508,6 +514,7 @@ def getKindleInfoFiles(kInfoFiles):
    for resline in reslst:
        if os.path.isfile(resline):
            kInfoFiles.append(resline)
+            print('Found k4Mac kinf file: ' + resline)
            found = True
    # add any .kinf2011 files
    cmdline = 'find "' + home + '/Library/Application Support" -name ".kinf2011"'
@@ -518,9 +525,10 @@ def getKindleInfoFiles(kInfoFiles):
    for resline in reslst:
        if os.path.isfile(resline):
            kInfoFiles.append(resline)
+            print('Found k4Mac kinf2011 file: ' + resline)
            found = True
    if not found:
-        print('No kindle-info files have been found.')
+        print('No k4Mac kindle-info/kinf/kinf2011 files have been found.')
    return kInfoFiles

 # determine type of kindle info provided and return a
--- a/Other_Tools/KindleBooks/lib/k4pcutils.py
+++ b/Other_Tools/KindleBooks/lib/k4pcutils.py
@@ -151,7 +151,9 @@ def GetVolumeSerialNumber():
 GetVolumeSerialNumber = GetVolumeSerialNumber()

 def GetIDString():
-    return GetVolumeSerialNumber()
+    vsn = GetVolumeSerialNumber()
+    print('Using Volume Serial Number for ID: '+vsn)
+    return vsn

 def getLastError():
    GetLastError = kernel32.GetLastError
@@ -210,37 +212,40 @@ def getKindleInfoFiles(kInfoFiles):
    if 'LOCALAPPDATA' in os.environ.keys():
        path = os.environ['LOCALAPPDATA']

-    print "searching for kinfoFiles in ", path
+    print('searching for kinfoFiles in ' + path)
+    found = False

    # first look for older kindle-info files
    kinfopath = path +'\\Amazon\\Kindle For PC\\{AMAwzsaPaaZAzmZzZQzgZCAkZ3AjA_AY}\\kindle.info'
-    if not os.path.isfile(kinfopath):
-        print('No kindle.info files have not been found.')
-    else:
+    if os.path.isfile(kinfopath):
+        found = True
+        print('Found K4PC kindle.info file: ' + kinfopath)
        kInfoFiles.append(kinfopath)

    # now look for newer (K4PC 1.5.0 and later rainier.2.1.1.kinf file

    kinfopath = path +'\\Amazon\\Kindle For PC\\storage\\rainier.2.1.1.kinf'
-    if not os.path.isfile(kinfopath):
-        print('No K4PC 1.5.X .kinf files have not been found.')
-    else:
+    if os.path.isfile(kinfopath):
+        found = True
+        print('Found K4PC 1.5.X kinf file: ' + kinfopath)
        kInfoFiles.append(kinfopath)

    # now look for even newer (K4PC 1.6.0 and later) rainier.2.1.1.kinf file
    kinfopath = path +'\\Amazon\\Kindle\\storage\\rainier.2.1.1.kinf'
-    if not os.path.isfile(kinfopath):
-        print('No K4PC 1.6.X .kinf files have not been found.')
-    else:
+    if os.path.isfile(kinfopath):
+        found = True
+        print('Found K4PC 1.6.X kinf file: ' + kinfopath)
        kInfoFiles.append(kinfopath)

    # now look for even newer (K4PC 1.9.0 and later) .kinf2011 file
    kinfopath = path +'\\Amazon\\Kindle\\storage\\.kinf2011'
-    if not os.path.isfile(kinfopath):
-        print('No K4PC 1.9.X .kinf files have not been found.')
-    else:
+    if os.path.isfile(kinfopath):
+        found = True
+        print('Found K4PC kinf2011 file: ' + kinfopath)
        kInfoFiles.append(kinfopath)

+    if not found:
+        print('No K4PC kindle.info/kinf/kinf2011 files have been found.')
    return kInfoFiles


--- a/Other_Tools/KindleBooks/lib/kgenpids.py
+++ b/Other_Tools/KindleBooks/lib/kgenpids.py
@@ -62,7 +62,7 @@ def encode(data, map):
        result += map[Q]
        result += map[R]
    return result
-  
+
 # Hash the bytes in data and then encode the digest with the characters in map
 def encodeHash(data,map):
    return encode(MD5(data),map)
@@ -78,11 +78,11 @@ def decode(data,map):
        value = (((high * len(map)) ^ 0x80) & 0xFF) + low
        result += pack("B",value)
    return result
-    
+
 #
 # PID generation routines
 #
-  
+
 # Returns two bit at offset from a bit field
 def getTwoBitsFromBitField(bitField,offset):
    byteNumber = offset // 4
@@ -91,10 +91,10 @@ def getTwoBitsFromBitField(bitField,offset):

 # Returns the six bits at offset from a bit field
 def getSixBitsFromBitField(bitField,offset):
-     offset *= 3
-     value = (getTwoBitsFromBitField(bitField,offset) <<4) + (getTwoBitsFromBitField(bitField,offset+1) << 2) +getTwoBitsFromBitField(bitField,offset+2)
-     return value
-     
+    offset *= 3
+    value = (getTwoBitsFromBitField(bitField,offset) <<4) + (getTwoBitsFromBitField(bitField,offset+1) << 2) +getTwoBitsFromBitField(bitField,offset+2)
+    return value
+
 # 8 bits to six bits encoding from hash to generate PID string
 def encodePID(hash):
    global charMap3
@@ -121,8 +121,8 @@ def generatePidEncryptionTable() :
 def generatePidSeed(table,dsn) :
    value = 0
    for counter in range (0,4) :
-       index = (ord(dsn[counter]) ^ value) &0xFF
-       value = (value >> 8) ^ table[index]
+        index = (ord(dsn[counter]) ^ value) &0xFF
+        value = (value >> 8) ^ table[index]
    return value

 # Generate the device PID
@@ -141,7 +141,7 @@ def generateDevicePID(table,dsn,nbRoll):
    return pidAscii

 def crc32(s):
-  return (~binascii.crc32(s,-1))&0xFFFFFFFF 
+    return (~binascii.crc32(s,-1))&0xFFFFFFFF

 # convert from 8 digit PID to 10 digit PID with checksum
 def checksumPid(s):
@@ -204,10 +204,10 @@ def getK4Pids(pidlst, rec209, token, kInfoFile):
        print(message)
        kindleDatabase = None
        pass
-    
+
    if kindleDatabase == None :
        return pidlst
-        
+
    try:
        # Get the Mazama Random number
        MazamaRandomNumber = kindleDatabase["MazamaRandomNumber"]
@@ -217,7 +217,7 @@ def getK4Pids(pidlst, rec209, token, kInfoFile):
    except KeyError:
        print "Keys not found in " + kInfoFile
        return pidlst
-        
+
    # Get the ID string used
    encodedIDString = encodeHash(GetIDString(),charMap1)

@@ -226,7 +226,7 @@ def getK4Pids(pidlst, rec209, token, kInfoFile):

    # concat, hash and encode to calculate the DSN
    DSN = encode(SHA1(MazamaRandomNumber+encodedIDString+encodedUsername),charMap1)
-       
+
    # Compute the device PID (for which I can tell, is used for nothing).
    table =  generatePidEncryptionTable()
    devicePID = generateDevicePID(table,DSN,4)
@@ -258,13 +258,19 @@ def getK4Pids(pidlst, rec209, token, kInfoFile):
 def getPidList(md1, md2, k4, pids, serials, kInfoFiles):
    pidlst = []
    if kInfoFiles is None:
-    	kInfoFiles = []
+        kInfoFiles = []
    if k4:
        kInfoFiles = getKindleInfoFiles(kInfoFiles)
    for infoFile in kInfoFiles:
-        pidlst = getK4Pids(pidlst, md1, md2, infoFile)
+        try:
+            pidlst = getK4Pids(pidlst, md1, md2, infoFile)
+        except Exception, message:
+            print("Error getting PIDs from " + infoFile + ": " + message)
    for serialnum in serials:
-        pidlst = getKindlePid(pidlst, md1, md2, serialnum)
+        try:
+            pidlst = getKindlePid(pidlst, md1, md2, serialnum)
+        except Exception, message:
+            print("Error getting PIDs from " + serialnum + ": " + message)
    for pid in pids:
        pidlst.append(pid)
    return pidlst
--- a/Other_Tools/KindleBooks/lib/mobidedrm.py
+++ b/Other_Tools/KindleBooks/lib/mobidedrm.py
@@ -57,8 +57,11 @@
 #  0.33 - Performance improvements for large files (concatenation)
 #  0.34 - Performance improvements in decryption (libalfcrypto)
 #  0.35 - add interface to get mobi_version
+#  0.36 - fixed problem with TEXtREAd and getBookTitle interface
+#  0.37 - Fixed double announcement for stand-alone operation

-__version__ = '0.35'
+
+__version__ = '0.37'

 import sys

@@ -168,9 +171,10 @@ class MobiBook:
        off = self.sections[section][0]
        return self.data_file[off:endoff]

-    def __init__(self, infile):
-        print ('MobiDeDrm v%(__version__)s. '
-           'Copyright 2008-2011 The Dark Reverser et al.' % globals())
+    def __init__(self, infile, announce = True):
+        if announce:
+            print ('MobiDeDrm v%(__version__)s. '
+               'Copyright 2008-2012 The Dark Reverser et al.' % globals())

        # initial sanity check on file
        self.data_file = file(infile, 'rb').read()
@@ -198,6 +202,7 @@ class MobiBook:
            print "Book has format: ", self.magic
            self.extra_data_flags = 0
            self.mobi_length = 0
+            self.mobi_codepage = 1252
            self.mobi_version = -1
            self.meta_array = {}
            return
@@ -248,18 +253,19 @@ class MobiBook:
            65001 : 'utf-8',
        }
        title = ''
-        if 503 in self.meta_array:
-            title = self.meta_array[503]
-        else :
-            toff, tlen = struct.unpack('>II', self.sect[0x54:0x5c])
-            tend = toff + tlen
-            title = self.sect[toff:tend]
+        codec = 'windows-1252'
+        if self.magic == 'BOOKMOBI':
+            if 503 in self.meta_array:
+                title = self.meta_array[503]
+            else:
+                toff, tlen = struct.unpack('>II', self.sect[0x54:0x5c])
+                tend = toff + tlen
+                title = self.sect[toff:tend]
+            if self.mobi_codepage in codec_map.keys():
+                codec = codec_map[self.mobi_codepage]
        if title == '':
            title = self.header[:32]
            title = title.split("\0")[0]
-        codec = 'windows-1252'
-        if self.mobi_codepage in codec_map.keys():
-            codec = codec_map[self.mobi_codepage]
        return unicode(title, codec).encode('utf-8')

    def getPIDMetaInfo(self):
@@ -375,7 +381,7 @@ class MobiBook:
                raise DrmException("Not yet initialised with PID. Must be opened with Mobipocket Reader first.")
            found_key, pid = self.parseDRM(self.sect[drm_ptr:drm_ptr+drm_size], drm_count, goodpids)
            if not found_key:
-                raise DrmException("No key found. Please report this failure for help.")
+                raise DrmException("No key found in " + str(len(goodpids)) + " keys tried. Please report this failure for help.")
            # kill the drm keys
            self.patchSection(0, "\0" * drm_size, drm_ptr)
            # kill the drm pointers
@@ -411,26 +417,26 @@ class MobiBook:
        print "done"
        return

-def getUnencryptedBook(infile,pid):
+def getUnencryptedBook(infile,pid,announce=True):
    if not os.path.isfile(infile):
        raise DrmException('Input File Not Found')
-    book = MobiBook(infile)
+    book = MobiBook(infile,announce)
    book.processBook([pid])
    return book.mobi_data

-def getUnencryptedBookWithList(infile,pidlist):
+def getUnencryptedBookWithList(infile,pidlist,announce=True):
    if not os.path.isfile(infile):
        raise DrmException('Input File Not Found')
-    book = MobiBook(infile)
+    book = MobiBook(infile, announce)
    book.processBook(pidlist)
    return book.mobi_data


 def main(argv=sys.argv):
    print ('MobiDeDrm v%(__version__)s. '
-        'Copyright 2008-2011 The Dark Reverser et al.' % globals())
+        'Copyright 2008-2012 The Dark Reverser et al.' % globals())
    if len(argv)<3 or len(argv)>4:
-        print "Removes protection from Kindle/Mobipocket and Kindle/Print Replica ebooks"
+        print "Removes protection from Kindle/Mobipocket, Kindle/KF8 and Kindle/Print Replica ebooks"
        print "Usage:"
        print "    %s <infile> <outfile> [<Comma separated list of PIDs to try>]" % sys.argv[0]
        return 1
@@ -442,7 +448,7 @@ def main(argv=sys.argv):
        else:
            pidlist = {}
        try:
-            stripped_file = getUnencryptedBookWithList(infile, pidlist)
+            stripped_file = getUnencryptedBookWithList(infile, pidlist, False)
            file(outfile, 'wb').write(stripped_file)
        except DrmException, e:
            print "Error: %s" % e
--- a/Other_Tools/KindleBooks/lib/stylexml2css.py
+++ b/Other_Tools/KindleBooks/lib/stylexml2css.py
@@ -164,6 +164,9 @@ class DocParser(object):
                                scale = self.pw
                            elif attr == 'line-space':
                                scale = self.fontsize * 2.0
+                            
+                            if val == "":
+                                val = 0

                            if not ((attr == 'hang') and (int(val) == 0)) :
                                pv = float(val)/scale
--- a/Other_Tools/KindleBooks/lib/topazextract.py
+++ b/Other_Tools/KindleBooks/lib/topazextract.py
@@ -31,11 +31,8 @@ class TpzDRMError(Exception):
 # local support routines
 if inCalibre:
    from calibre_plugins.k4mobidedrm import kgenpids
-    from calibre_plugins.k4mobidedrm import genbook
 else:
    import kgenpids
-    import genbook
-

 # recursive zip creation support routine
 def zipUpDir(myzip, tdir, localname):
@@ -271,6 +268,11 @@ class TopazBook:
            self.createBookDirectory()
            self.extractFiles()
            print "Successfully Extracted Topaz contents"
+            if inCalibre:
+                from calibre_plugins.k4mobidedrm import genbook
+            else:
+                import genbook
+            
            rv = genbook.generateBook(self.outdir, raw, fixedimage)
            if rv == 0:
                print "\nBook Successfully generated"
@@ -300,6 +302,11 @@ class TopazBook:
        self.createBookDirectory()
        self.extractFiles()
        print "Successfully Extracted Topaz contents"
+        if inCalibre:
+            from calibre_plugins.k4mobidedrm import genbook
+        else:
+            import genbook
+        
        rv = genbook.generateBook(self.outdir, raw, fixedimage)
        if rv == 0:
            print "\nBook Successfully generated"
--- a/Other_Tools/README_Kindle_for_iPad_iPhone_iPodTouch.txt
+++ b/Other_Tools/README_Kindle_for_iPad_iPhone_iPodTouch.txt
@@ -1,7 +1,7 @@
 Kindle for iPhone, iPod Touch, iPad
 ------------------------------------

-The Kindle application for iOS (iPhone/iPod Touch/iPad) uses a PID derived from the serial number of the iPhone/iPod Touch/iPad. Kindlepid.pyw (see Other_Tools/Additional_Tools) is a python script that turns the serial number into the equivalent PID, which can then be used with the Calibre Plugins and DeDRM Applications.
+The Kindle application for iOS (iPhone/iPod Touch/iPad) uses a PID derived from the UDID number of the iPhone/iPod Touch/iPad. Kindlepid.pyw (see Other_Tools/Additional_Tools) is a python script that turns the serial number into the equivalent PID, which can then be used with the Calibre Plugins and DeDRM Applications.

 So, to remove the DRM from (Mobipocket) Kindle books downloaded to your iPhone/iPodTouch/iPad, you’ll need the latest tools_vX.X.zip archive and
 some way to extract the book files from the backup of your device on your computer. There are several free tools around to do this.
@@ -19,10 +19,19 @@ You can then add this fixed PID to the DeDRM Applications or Calibre_Plugins or

 You next need to find an "iPhone Extractor" or "iPhone Explorer" program for your OS that will allow you to mount your iPhone/iPad/iPod Touch as a usb device on your machine and copy your Kindle ebooks from the device back to your home machine.

+IMPORTANT UPDATE
+----------------
+
+Apple has recently (2012) restricted access to a device's UDID. This means that recent (2012+) versions of Kindle for iOS no longer use this method of generating an encryption key. If you had already installed and registered Kindle for iOS before this change, the key based on your device's UDID will continue to be used. Otherwise, it is not currently (2012) possible to remove the DRM of Kindle eBooks from a newly installed and registered copy of Kindle for iOS.
+
+
+

 ---


 Kindlefix gives you another way to use the PID generated by kindlepid. Some ebook stores and libraries will accept the PIDs generated by kindlepid (some won’t), and you can then download ebooks from the store or library encrypted to work with your Kindle. Except they don’t. There’s a flag byte set in encrypted Kindle ebooks, and Kindles and the Kindle app won’t read encrypted mobipocket ebooks unless that flag is set. Kindlefix will set that flag for you. If your library have Mobipocket ebooks to lend and will accept your Kindle’s PID, you can now check out library ebooks, run kindlefix on them, and then read them on your Kindle, and when your loan period ends, they’ll automatically become unreadable.

+(2012 note: Few, if any, libraries now use this method of loaning ebooks.)
+