tools v3.8

Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py

@@ -29,7 +29,7 @@ from __future__ import with_statement
 # and import that ZIP into Calibre using its plugin configuration GUI.
 
 
-__version__ = '2.7'
+__version__ = '2.8'
 
 class Unbuffered:
     def __init__(self, stream):
@@ -250,7 +250,7 @@ if not __name__ == "__main__" and inCalibre:
                                 Provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, ApprenticeAlf, etc.'
         supported_platforms = ['osx', 'windows', 'linux'] # Platforms this plugin will run on
         author              = 'DiapDealer, SomeUpdates' # The author of this plugin
-        version             = (0, 2, 7)   # The version number of this plugin
+        version             = (0, 2, 8)   # The version number of this plugin
         file_types          = set(['prc','mobi','azw','azw1','tpz']) # The file types that this plugin will be applied to
         on_import           = True # Run this plugin during the import
         priority            = 210  # run this plugin before mobidedrm, k4pcdedrm, k4dedrm

Calibre_Plugins/k4mobidedrm_plugin/k4mutils.py

@@ -168,27 +168,33 @@ def CryptUnprotectData(encryptedData):
     return cleartext
 
 
-# Locate and open the .kindle-info file
-def openKindleInfo(kInfoFile=None):
-    if kInfoFile == None:
-	home = os.getenv('HOME')
-	cmdline = 'find "' + home + '/Library/Application Support" -name ".kindle-info"'
-	cmdline = cmdline.encode(sys.getfilesystemencoding())
-	p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
-        out1, out2 = p1.communicate()
-	reslst = out1.split('\n')
-	kinfopath = 'NONE'
-	cnt = len(reslst)
-	for j in xrange(cnt):
-	    resline = reslst[j]
-	    pp = resline.find('.kindle-info')
-	    if pp >= 0:
-		kinfopath = resline
-		break
-	if not os.path.isfile(kinfopath):
-	    raise DrmException('Error: .kindle-info file can not be found')
-	return open(kinfopath,'r')
-    else:
-	if not os.path.isfile(kInfoFile):
-	    raise DrmException('Error: kindle-info file can not be found')
-        return open(kInfoFile, 'r')
+# Locate the .kindle-info files
+def getKindleInfoFiles(kInfoFiles):
+    home = os.getenv('HOME')
+    cmdline = 'find "' + home + '/Library/Application Support" -name ".kindle-info"'
+    cmdline = cmdline.encode(sys.getfilesystemencoding())
+    p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+    out1, out2 = p1.communicate()
+    reslst = out1.split('\n')
+    kinfopath = 'NONE'
+    found = False
+    cnt = len(reslst)
+    for resline in reslst:
+        if os.path.isfile(resline):
+            kInfoFiles.append(resline)
+            found = True
+    if not found:
+        print('No .kindle-info files have been found.')
+    return kInfoFiles
+
+# Parse the Kindle.info file and return the records as a list of key-values
+def parseKindleInfo(kInfoFile):
+    DB = {}
+    infoReader = open(kInfoFile, 'r')
+    infoReader.read(1)
+    data = infoReader.read()
+    items = data.split('[')
+    for item in items:
+        splito = item.split(':')
+        DB[splito[0]] =splito[1]
+    return DB

Calibre_Plugins/k4mobidedrm_plugin/k4pcutils.py

@@ -93,18 +93,25 @@ def CryptUnprotectData():
     return CryptUnprotectData
 CryptUnprotectData = CryptUnprotectData()
 
-#
-# Locate and open the Kindle.info file.
-#
-def openKindleInfo(kInfoFile=None):
-    if kInfoFile == None:
-        regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
-        path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
-        kinfopath = path +'\\Amazon\\Kindle For PC\\{AMAwzsaPaaZAzmZzZQzgZCAkZ3AjA_AY}\\kindle.info'
-        if not os.path.isfile(kinfopath):
-            raise DrmException('Error: kindle.info file can not be found')
-        return open(kinfopath,'r')
+# Locate the .kindle-info files
+def getKindleInfoFiles(kInfoFiles):
+    regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+    path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+    kinfopath = path +'\\Amazon\\Kindle For PC\\{AMAwzsaPaaZAzmZzZQzgZCAkZ3AjA_AY}\\kindle.info'
+    if not os.path.isfile(kinfopath):
+        print('The kindle.info files has not been found.')
     else:
-        if not os.path.isfile(kInfoFile):
-            raise DrmException('Error: kindle.info file can not be found')
-        return open(kInfoFile, 'r')
+        kInfoFiles.append(kinfopath)
+    return kInfoFiles
+
+# Parse the Kindle.info file and return the records as a list of key-values
+def parseKindleInfo(kInfoFile):
+    DB = {}
+    infoReader = open(kInfoFile, 'r')
+    infoReader.read(1)
+    data = infoReader.read()
+    items = data.split('{')
+    for item in items:
+        splito = item.split(':')
+        DB[splito[0]] =splito[1]
+    return DB