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.'