tools v2.4

Calibre_Plugins/ineptepub_plugin/ade_key.py

@@ -310,35 +310,31 @@ if iswindows:
 else:
 
     import xml.etree.ElementTree as etree
-    import Carbon.File
-    import Carbon.Folder
-    import Carbon.Folders
-    import MacOS
-    
-    ACTIVATION_PATH = 'Adobe/Digital Editions/activation.dat'
+    import subprocess
+
     NSMAP = {'adept': 'http://ns.adobe.com/adept',
              'enc': 'http://www.w3.org/2001/04/xmlenc#'}
-    
-    def find_folder(domain, dtype):
-        try:
-            fsref = Carbon.Folder.FSFindFolder(domain, dtype, False)
-            return Carbon.File.pathname(fsref)
-        except MacOS.Error:
-            return None
-    
-    def find_app_support_file(subpath):
-        dtype = Carbon.Folders.kApplicationSupportFolderType
-        for domain in Carbon.Folders.kUserDomain, Carbon.Folders.kLocalDomain:
-            path = find_folder(domain, dtype)
-            if path is None:
-                continue
-            path = os.path.join(path, subpath)
-            if os.path.isfile(path):
-                return path
+
+    def findActivationDat():
+        home = os.getenv('HOME')
+        cmdline = 'find "' + home + '/Library/Application Support/Adobe/Digital Editions" -name "activation.dat"'
+        cmdline = cmdline.encode(sys.getfilesystemencoding())
+        p2 = subprocess.Popen(cmdline, shell=True, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
+        out1, out2 = p2.communicate()
+        reslst = out1.split('\n')
+        cnt = len(reslst)
+        for j in xrange(cnt):
+            resline = reslst[j]
+            pp = resline.find('activation.dat')
+            if pp >= 0:
+                ActDatPath = resline
+                break
+        if os.path.exists(ActDatPath):
+            return ActDatPath
         return None
     
     def retrieve_key():
-        actpath = find_app_support_file(ACTIVATION_PATH)
+        actpath = findActivationDat()
         if actpath is None:
             raise ADEPTError("Could not locate ADE activation")
         tree = etree.parse(actpath)

Calibre_Plugins/ineptepub_plugin/ineptepub_plugin.py

@@ -42,7 +42,9 @@
 # Revision history:
 #   0.1 - Initial release
 #   0.1.1 - Allow Windows users to make use of openssl if they have it installed.
-#          - Incorporated SomeUpdates zipfix routine.
+#         - Incorporated SomeUpdates zipfix routine.
+#   0.1.2 - Removed Carbon dependency for Mac users. Fixes an issue that was a
+#           result of Calibre changing to python 2.7.
 
 
 """
@@ -363,7 +365,7 @@ class IneptDeDRM(FileTypePlugin):
                                 Credit given to I <3 Cabbages for the original stand-alone scripts.'
     supported_platforms     = ['linux', 'osx', 'windows']
     author                  = 'DiapDealer'
-    version                 = (0, 1, 1)
+    version                 = (0, 1, 2)
     minimum_calibre_version = (0, 6, 44)  # Compiled python libraries cannot be imported in earlier versions.
     file_types              = set(['epub'])
     on_import               = True
@@ -420,7 +422,7 @@ class IneptDeDRM(FileTypePlugin):
                 try:
                     keydata = retrieve_key()
                     userkeys.append(keydata)
-                    keypath = os.path.join(confpath, 'adeptkey.der')
+                    keypath = os.path.join(confpath, 'calibre-adeptkey.der')
                     with open(keypath, 'wb') as f:
                         f.write(keydata)
                     print 'IneptEpub: Created keyfile from ADE install.'    

Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py

@@ -475,7 +475,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, 1, 3)   # The version number of this plugin
+        version             = (0, 1, 4)   # The version number of this plugin
         file_types          = set(['prc','mobi','azw']) # The file types that this plugin will be applied to
         on_import           = True # Run this plugin during the import
         priority            = 200  # run this plugin before mobidedrm, k4pcdedrm, k4dedrm
@@ -483,6 +483,24 @@ if not __name__ == "__main__" and inCalibre:
         def run(self, path_to_ebook):
             from calibre.gui2 import is_ok_to_use_qt
             from PyQt4.Qt import QMessageBox
+            
+            # Head Topaz files off at the pass and warn the user that they will NOT
+            # be decrypted. Changes the file extension from .azw or .prc to .tpz so
+            # Calibre can at least read the metadata properly and the user can find
+            # them by sorting on 'format'.
+            with open(path_to_ebook, 'rb') as f:
+                raw = f.read()
+                if raw.startswith('TPZ'):
+                    tf = self.temporary_file('.tpz')
+                    if is_ok_to_use_qt():
+                        d = QMessageBox(QMessageBox.Warning, "K4MobiDeDRM Plugin", "%s is a Topaz book. It will NOT be decrypted!" % path_to_ebook)
+                        d.show()
+                        d.raise_()
+                        d.exec_()
+                    tf.write(raw)
+                    tf.close
+                    return tf.name
+                
             global kindleDatabase
             global openKindleInfo, CryptUnprotectData, GetUserName, GetVolumeSerialNumber, charMap1, charMap2, charMap3, charMap4
             if sys.platform.startswith('win'):

Calibre_Plugins/k4mobidedrm_plugin/mobidedrm.py

@@ -39,8 +39,9 @@
 #         Removed the disabled Calibre plug-in code
 #         Permit use of 8-digit PIDs
 #  0.19 - It seems that multibyte entries aren't encrypted in a v6 file either.
+#  0.20 - Corretion: It seems that multibyte entries are encrypted in a v6 file.
 
-__version__ = '0.19'
+__version__ = '0.20'
 
 import sys
 import struct
@@ -208,8 +209,8 @@ class DrmStripper:
         if (mobi_length >= 0xE4) and (mobi_version >= 5):
             extra_data_flags, = struct.unpack('>H', sect[0xF2:0xF4])
             print "Extra Data Flags = %d" %extra_data_flags
-        if mobi_version <= 5:
-            # multibyte utf8 data is included in the encryption for mobi_version 5 and below
+        if mobi_version < 7:
+            # multibyte utf8 data is included in the encryption for mobi_version 6 and below
             # so clear that byte so that we leave it to be decrypted.
             extra_data_flags &= 0xFFFE