tools v5.3

Calibre_Plugins/K4MobiDeDRM ReadMe.txt

@@ -1,4 +1,4 @@
-K4MobiDeDRM_v04.4_plugin.zip
+K4MobiDeDRM_v04.5_plugin.zip
 
 Credit given to The Dark Reverser for the original standalone script. Credit also to the many people who have updated and expanded that script since then.
 

Calibre_Plugins/K4MobiDeDRM_plugin/__init__.py

@@ -19,7 +19,7 @@ class K4DeDRM(FileTypePlugin):
     description         = 'Removes DRM from eInk Kindle, Kindle 4 Mac and Kindle 4 PC ebooks, and from Mobipocket ebooks. Provided by the work of many including DiapDealer, SomeUpdates, IHeartCabbages, CMBDTC, Skindle, DarkReverser, mdlnx, ApprenticeAlf, etc.'
     supported_platforms = ['osx', 'windows', 'linux'] # Platforms this plugin will run on
     author              = 'DiapDealer, SomeUpdates, mdlnx, Apprentice Alf' # The author of this plugin
-    version             = (0, 4, 4)   # The version number of this plugin
+    version             = (0, 4, 5)   # The version number of this plugin
     file_types          = set(['prc','mobi','azw','azw1','azw3','azw4','tpz']) # The file types that this plugin will be applied to
     on_import           = True # Run this plugin during the import
     priority            = 520  # run this plugin before earlier versions
@@ -173,6 +173,9 @@ class K4DeDRM(FileTypePlugin):
         print "   Getting PIDs from WINE"
 
         outfile = os.path.join(self.alfdir + 'winepids.txt')
+        # Remove any previous winepids.txt file.
+        if os.path.exists(outfile):
+            os.remove(outfile)
 
         cmdline = 'wine python.exe ' \
                   + '"'+self.alfdir + '/getk4pcpids.py"' \
@@ -193,19 +196,31 @@ class K4DeDRM(FileTypePlugin):
 
         print cmdline
 
-        cmdline = cmdline.encode(sys.getfilesystemencoding())
-        p2 = Process(cmdline, shell=True, bufsize=1, stdin=None, stdout=sys.stdout, stderr=STDOUT, close_fds=False)
-        result = p2.wait("wait")
-        print "Conversion returned ", result
+        try:
+            cmdline = cmdline.encode(sys.getfilesystemencoding())
+            p2 = Process(cmdline, shell=True, bufsize=1, stdin=None, stdout=sys.stdout, stderr=STDOUT, close_fds=False)
+            result = p2.wait("wait")
+        except Exception, e:
+            print "WINE subprocess error ", str(e)
+            return []
+        print "WINE subprocess returned ", result
+        
         WINEpids = []
-        customvalues = file(outfile, 'r').readline().split(',')
-        for customvalue in customvalues:
-            customvalue = str(customvalue)
-            customvalue = customvalue.strip()
-            if len(customvalue) == 10 or len(customvalue) == 8:
-                WINEpids.append(customvalue)
-            else:
-                print "'%s' is not a valid PID." % customvalue
+        if os.path.exists(outfile):
+            try:
+                customvalues = file(outfile, 'r').readline().split(',')
+                for customvalue in customvalues:
+                    customvalue = str(customvalue)
+                    customvalue = customvalue.strip()
+                    if len(customvalue) == 10 or len(customvalue) == 8:
+                        WINEpids.append(customvalue)
+                    else:
+                        print "'%s' is not a valid PID." % customvalue
+            except Exception, e:
+                print "Error parsing winepids.txt: ", str(e)
+                return []
+        else:
+            print "No PIDs generated by Wine Python subprocess."
         return WINEpids
 
     def is_customizable(self):
@@ -240,4 +255,4 @@ class K4DeDRM(FileTypePlugin):
             for candidate in zf.namelist():
                 if candidate in names:
                     ans[candidate] = zf.read(candidate)
-        return ans
+        return ans

Calibre_Plugins/k4mobidedrm_plugin/k4mutils.py

@@ -233,7 +233,7 @@ def GetVolumeSerialNumber():
 
 def GetUserHomeAppSupKindleDirParitionName():
     home = os.getenv('HOME')
-    dpath =  home + '/Library/Application Support/Kindle'
+    dpath =  home + '/Library'
     cmdline = '/sbin/mount'
     cmdline = cmdline.encode(sys.getfilesystemencoding())
     p = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
@@ -358,6 +358,10 @@ def isNewInstall():
     # soccer game fan anyone
     dpath = home + '/Library/Application Support/Kindle/storage/.pes2011'
     # print dpath, os.path.exists(dpath)
+    if os.path.exists(dpath):
+        return True
+    dpath = home + '/Library/Containers/com.amazon.Kindle/Data/Library/Application Support/Kindle/storage/.pes2011'
+    # print dpath, os.path.exists(dpath)
     if os.path.exists(dpath):
         return True
     return False
@@ -491,8 +495,30 @@ class CryptUnprotectDataV3(object):
 
 # Locate the .kindle-info files
 def getKindleInfoFiles(kInfoFiles):
-    # first search for current .kindle-info files
     home = os.getenv('HOME')
+    # search for any .kinf2011 files in new location (Sep 2012)
+    cmdline = 'find "' + home + '/Library/Containers/com.amazon.Kindle/Data/Library/Application Support" -name ".kinf2011"'
+    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')
+    for resline in reslst:
+        if os.path.isfile(resline):
+            kInfoFiles.append(resline)
+            print('Found k4Mac kinf2011 file: ' + resline)
+            found = True
+   # search for any .kinf2011 files
+    cmdline = 'find "' + home + '/Library/Application Support" -name ".kinf2011"'
+    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')
+    for resline in reslst:
+        if os.path.isfile(resline):
+            kInfoFiles.append(resline)
+            print('Found k4Mac kinf2011 file: ' + resline)
+            found = True
+    # search for any .kindle-info files
     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)
@@ -505,7 +531,7 @@ def getKindleInfoFiles(kInfoFiles):
             kInfoFiles.append(resline)
             print('Found K4Mac kindle-info file: ' + resline)
             found = True
-    # add any .rainier*-kinf files
+    # search for any .rainier*-kinf files
     cmdline = 'find "' + home + '/Library/Application Support" -name ".rainier*-kinf"'
     cmdline = cmdline.encode(sys.getfilesystemencoding())
     p1 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
@@ -516,17 +542,6 @@ def getKindleInfoFiles(kInfoFiles):
             kInfoFiles.append(resline)
             print('Found k4Mac kinf file: ' + resline)
             found = True
-    # add any .kinf2011 files
-    cmdline = 'find "' + home + '/Library/Application Support" -name ".kinf2011"'
-    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')
-    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 k4Mac kindle-info/kinf/kinf2011 files have been found.')
     return kInfoFiles