tools v6.2.0

Updated for B&N new scheme, added obok plugin, and many minor fixes,

DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist

@@ -24,7 +24,7 @@
 	<key>CFBundleExecutable</key>
 	<string>droplet</string>
 	<key>CFBundleGetInfoString</key>
-	<string>DeDRM AppleScript 6.1.0. Written 2010–2014 by Apprentice Alf and others.</string>
+	<string>DeDRM AppleScript 6.2.0. Written 2010–2015 by Apprentice Alf et al.</string>
 	<key>CFBundleIconFile</key>
 	<string>DeDRM</string>
 	<key>CFBundleIdentifier</key>
@@ -36,25 +36,31 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.0</string>
+	<string>6.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>dplt</string>
 	<key>LSRequiresCarbon</key>
 	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2010–2015 Paul Durrant, Apprentice Alf and Apprentice Harper</string>
 	<key>WindowState</key>
 	<dict>
+		<key>bundleDividerCollapsed</key>
+		<false/>
+		<key>bundlePositionOfDivider</key>
+		<real>728</real>
 		<key>dividerCollapsed</key>
-		<true/>
+		<false/>
 		<key>eventLogLevel</key>
-		<integer>-1</integer>
+		<integer>0</integer>
 		<key>name</key>
 		<string>ScriptWindowState</string>
 		<key>positionOfDivider</key>
-		<real>0.0</real>
+		<real>439</real>
 		<key>savedFrame</key>
-		<string>85 100 1002 753 0 0 1440 878 </string>
-		<key>selectedTabView</key>
-		<string>event log</string>
+		<string>77 69 1246 778 0 0 1440 877 </string>
+		<key>selectedTab</key>
+		<string>log</string>
 	</dict>
 </dict>
 </plist>

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Barnes and Noble Key_Help.htm

@@ -22,7 +22,24 @@ li {margin-top: 0.5em}
 
 <p>If you have upgraded from an earlier version of the plugin, any existing Barnes and Noble keys will have been automatically imported, so you might not need to do any more configuration. Continue reading for key generation and management instructions.</p>
 
-<h3>Creating New Keys:</h3>
+<h3>Changes at Barnes & Noble</h3>
+
+<p>In mid-2014, Barnes & Noble changed the way they generated encryption keys. Instead of deriving the key from the user's name and credit card number, they started generating a random key themselves, sending that key through to devices when they connected to the Barnes & Noble servers. This means that some users will find that no combination of their name and CC# will work in decrypting their ebooks.</p>
+
+<p>There is a work-around. Barnes & Noble’s desktop app NOOK Study generates a log file that contains the encryption key. You can download NOOK Study from <a href="https://yuzu.com/nsdownload">https://yuzu.com/nsdownload</a>.</p>
+<p>Once downloaded, install the application, register with your Barnes & Noble or nook account, and download at least one DRMed ebook through NOOK Study. It will be saved somewhere in a folder called "My Barnes & Noble eBooks" in your Documents folder.</p>
+<p>Now import that book into calibre. The log file and the key in the log should be automatically found by the plugin and used to decrypt the book.</p>
+<p>If the automatic process doesn't work for you, you can still find extract it manually and save it as a .b64 file for import into the plugin's preferences as follows:</p>
+<ol><li>In NOOK Study, select Settings/About (Windows) or NOOK Study/About NOOK Study (Mac) and in the dialog that appears click the link at the bottom to copy the log into the clipboard.</li>
+<li>Paste the copied log into a text editor</li>
+<li>Search for the text CCHashResponseV1</li>
+<li>On the line below which starts with ccHash, copy the text between the " marks after ccHash, but don't include the " marks.</li>
+<li>Save that text in a new <b>plain text</b> file, with file name extension .b64 (for example, key.b64)</li>
+<li>Import that file into the preferences through this dialog, using the "Import Existing Key Files" button.</li>
+</ol>
+
+
+<h3>Old instructions: Creating New Keys:</h3>
 
 <p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog for entering the necessary data to generate a new key.</p>
 <ul>
@@ -48,7 +65,7 @@ li {margin-top: 0.5em}
 
 <h3>Importing Existing Keyfiles:</h3>
 
-<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import existing ‘.b64’ key files. Key files might come from being exported from this or older plugins, or may have been generated using the original i♥cabbages script.</p>
+<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import existing ‘.b64’ key files. Key files might come from being exported from this or older plugins, or may have been generated using the original i♥cabbages script, or you may have made it by following the instructions above.</p>
 
 <p>Once done creating/deleting/renaming/importing decryption keys, click Close to exit the customization dialogue. Your changes wil only be saved permanently when you click OK in the main configuration dialog.</p>
 

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM_Help.htm

@@ -17,7 +17,7 @@ p {margin-top: 0}
 
 <body>
 
-<h1>DeDRM Plugin <span class="version">(v6.0.9)</span></h1>
+<h1>DeDRM Plugin <span class="version">(v6.1.0)</span></h1>
 
 <p>This plugin removes DRM from ebooks when they are imported into calibre. If you already have DRMed ebooks in your calibre library, you will need to remove them and import them again.</p>
 

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py

@@ -36,13 +36,16 @@ __docformat__ = 'restructuredtext en'
 #   6.0.7 - Error handling for incomplete PDF metadata
 #   6.0.8 - Fixes a Wine key issue and topaz support
 #   6.0.9 - Ported to work with newer versions of Calibre (moved to Qt5). Still supports older Qt4 versions.
+#   6.1.0 - Fixed multiple books import problem and PDF import with no key problem
+#   6.2.0 - Support for getting B&N key from nook Study log. Fix for UTF-8 filenames in Adobe ePubs.
+#           Fix for not copying needed files. Fix for getting default Adobe key for PDFs
 
 """
 Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 0, 9)
+PLUGIN_VERSION_TUPLE = (6, 2, 0)
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'
@@ -90,30 +93,20 @@ class DeDRM(FileTypePlugin):
     on_import               = True
     priority                = 600
 
-    def initialize(self):
-        # convert old preferences, if necessary.
-        try:
-            from calibre_plugins.dedrm.prefs import convertprefs
-            convertprefs()
-        except:
-            traceback.print_exc()
 
+    def initialize(self):
         """
-        Dynamic modules can't be imported/loaded from a zipfile... so this routine
-        runs whenever the plugin gets initialized. This will extract the appropriate
+        Dynamic modules can't be imported/loaded from a zipfile.
+        So this routine will extract the appropriate
         library for the target OS and copy it to the 'alfcrypto' subdirectory of
         calibre's configuration directory. That 'alfcrypto' directory is then
         inserted into the syspath (as the very first entry) in the run function
         so the CDLL stuff will work in the alfcrypto.py script.
+
+        The extraction only happens once per version of the plugin
+        Also perform upgrade of preferences once per version
         """
         try:
-            if iswindows:
-                names = [u"alfcrypto.dll",u"alfcrypto64.dll"]
-            elif isosx:
-                names = [u"libalfcrypto.dylib"]
-            else:
-                names = [u"libalfcrypto32.so",u"libalfcrypto64.so",u"kindlekey.py",u"adobekey.py",u"subasyncio.py"]
-            lib_dict = self.load_resources(names)
             self.pluginsdir = os.path.join(config_dir,u"plugins")
             if not os.path.exists(self.pluginsdir):
                 os.mkdir(self.pluginsdir)
@@ -126,9 +119,38 @@ class DeDRM(FileTypePlugin):
             self.alfdir = os.path.join(self.maindir,u"libraryfiles")
             if not os.path.exists(self.alfdir):
                 os.mkdir(self.alfdir)
-            for entry, data in lib_dict.items():
-                file_path = os.path.join(self.alfdir, entry)
-                open(file_path,'wb').write(data)
+            # only continue if we've never run this version of the plugin before
+            self.verdir = os.path.join(self.maindir,PLUGIN_VERSION)
+            if not os.path.exists(self.verdir):
+                if iswindows:
+                    names = [u"alfcrypto.dll",u"alfcrypto64.dll"]
+                elif isosx:
+                    names = [u"libalfcrypto.dylib"]
+                else:
+                    names = [u"libalfcrypto32.so",u"libalfcrypto64.so",u"kindlekey.py",u"adobekey.py",u"subasyncio.py"]
+                lib_dict = self.load_resources(names)
+                print u"{0} v{1}: Copying needed library files from plugin's zip".format(PLUGIN_NAME, PLUGIN_VERSION)
+
+                for entry, data in lib_dict.items():
+                    file_path = os.path.join(self.alfdir, entry)
+                    try:
+                        os.remove(file_path)
+                    except:
+                        pass
+
+                    try:
+                        open(file_path,'wb').write(data)
+                    except:
+                        print u"{0} v{1}: Exception when copying needed library files after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                        traceback.print_exc()
+                        pass
+
+                # convert old preferences, if necessary.
+                from calibre_plugins.dedrm.prefs import convertprefs
+                convertprefs()
+
+                # mark that this version has been initialized
+                os.mkdir(self.verdir)
         except Exception, e:
             traceback.print_exc()
             raise
@@ -166,7 +188,12 @@ class DeDRM(FileTypePlugin):
                 of = self.temporary_file(u".epub")
 
                 # Give the user key, ebook and TemporaryPersistent file to the decryption function.
-                result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                try:
+                    result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                except:
+                    print u"{0} v{1}: Exception when trying to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                    traceback.print_exc()
+                    result = 1
 
                 of.close()
 
@@ -177,8 +204,69 @@ class DeDRM(FileTypePlugin):
 
                 print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname_masked,time.time()-self.starttime)
 
+            # perhaps we should see if we can get a key from a log file
+            print u"{0} v{1}: Looking for new NOOK Study Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+
+            # get the default NOOK Study keys
+            defaultkeys = []
+
+            try:
+                if iswindows or isosx:
+                    from calibre_plugins.dedrm.ignoblekey import nookkeys
+
+                    defaultkeys = nookkeys()
+                else: # linux
+                    from wineutils import WineGetKeys
+
+                    scriptpath = os.path.join(self.alfdir,u"ignoblekey.py")
+                    defaultkeys = WineGetKeys(scriptpath, u".b64",dedrmprefs['adobewineprefix'])
+
+            except:
+                print u"{0} v{1}: Exception when getting default NOOK Study Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
+
+            newkeys = []
+            for keyvalue in defaultkeys:
+                if keyvalue not in dedrmprefs['bandnkeys'].values():
+                    newkeys.append(keyvalue)
+
+            if len(newkeys) > 0:
+                try:
+                    for i,userkey in enumerate(newkeys):
+                        print u"{0} v{1}: Trying a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+
+                        of = self.temporary_file(u".epub")
+
+                        # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+                        try:
+                            result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                        except:
+                           print u"{0} v{1}: Exception when trying to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                           traceback.print_exc()
+                           result = 1
+
+                        of.close()
+
+                        if result == 0:
+                            # Decryption was a success
+                            # Store the new successful key in the defaults
+                            print u"{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+                            try:
+                                dedrmprefs.addnamedvaluetoprefs('bandnkeys','default_key',keyvalue)
+                                dedrmprefs.writeprefs()
+                                print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                            except:
+                                print u"{0} v{1}: Exception saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                                traceback.print_exc()
+                            # Return the modified PersistentTemporary file to calibre.
+                            return of.name
+
+                        print u"{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                except Exception, e:
+                    pass
+
             print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
 
         # import the Adobe Adept ePub handler
         import calibre_plugins.dedrm.ineptepub as ineptepub
@@ -196,6 +284,8 @@ class DeDRM(FileTypePlugin):
                 try:
                     result = ineptepub.decryptBook(userkey, inf.name, of.name)
                 except:
+                    print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                    traceback.print_exc()
                     result = 1
 
                 of.close()
@@ -226,6 +316,7 @@ class DeDRM(FileTypePlugin):
 
                 self.default_key = defaultkeys[0]
             except:
+                print u"{0} v{1}: Exception when getting default Adobe Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
                 traceback.print_exc()
                 self.default_key = u""
 
@@ -244,6 +335,8 @@ class DeDRM(FileTypePlugin):
                         try:
                             result = ineptepub.decryptBook(userkey, inf.name, of.name)
                         except:
+                            print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                            traceback.print_exc()
                             result = 1
 
                         of.close()
@@ -255,7 +348,9 @@ class DeDRM(FileTypePlugin):
                             try:
                                 dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex'))
                                 dedrmprefs.writeprefs()
+                                print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
                             except:
+                                print u"{0} v{1}: Exception when saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
                                 traceback.print_exc()
                             # Return the modified PersistentTemporary file to calibre.
                             return of.name
@@ -266,12 +361,12 @@ class DeDRM(FileTypePlugin):
 
             # Something went wrong with decryption.
             print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
 
         # Not a Barnes & Noble nor an Adobe Adept
         # Import the fixed epub.
         print u"{0} v{1}: “{2}” is neither an Adobe Adept nor a Barnes & Noble encrypted ePub".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
-        return inf.name
+        raise DeDRMError(u"{0} v{1}: Couldn't decrypt after {2:.1f} seconds. DRM free perhaps?".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
 
     def PDFDecrypt(self,path_to_ebook):
         import calibre_plugins.dedrm.prefs as prefs
@@ -289,6 +384,8 @@ class DeDRM(FileTypePlugin):
             try:
                 result = ineptpdf.decryptBook(userkey, path_to_ebook, of.name)
             except:
+                print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
                 result = 1
 
             of.close()
@@ -298,67 +395,73 @@ class DeDRM(FileTypePlugin):
                 # Return the modified PersistentTemporary file to calibre.
                 return of.name
 
-            # perhaps we need to get a new default ADE key
-            print u"{0} v{1}: Looking for new default Adobe Digital Editions Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+            print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname,time.time()-self.starttime)
 
-            # get the default Adobe keys
-            defaultkeys = []
+        # perhaps we need to get a new default ADE key
+        print u"{0} v{1}: Looking for new default Adobe Digital Editions Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
 
+        # get the default Adobe keys
+        defaultkeys = []
+
+        try:
             if iswindows or isosx:
-                import calibre_plugins.dedrm.adobekey as adobe
+                from calibre_plugins.dedrm.adobekey import adeptkeys
 
-                try:
-                    defaultkeys = adobe.adeptkeys()
-                except:
-                    pass
-            else:
-                # linux
-                try:
-                    from wineutils import WineGetKeys
+                defaultkeys = adeptkeys()
+            else: # linux
+                from wineutils import WineGetKeys
 
-                    scriptpath = os.path.join(self.alfdir,u"adobekey.py")
-                    defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
-                except:
-                    pass
+                scriptpath = os.path.join(self.alfdir,u"adobekey.py")
+                defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
 
-            newkeys = []
-            for keyvalue in defaultkeys:
-                if keyvalue.encode('hex') not in dedrmprefs['adeptkeys'].values():
-                    newkeys.append(keyvalue)
+            self.default_key = defaultkeys[0]
+        except:
+            print u"{0} v{1}: Exception when getting default Adobe Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+            traceback.print_exc()
+            self.default_key = u""
 
-            if len(newkeys) > 0:
-                try:
-                    for i,userkey in enumerate(newkeys):
-                        print u"{0} v{1}: Trying a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
-                        of = self.temporary_file(u".pdf")
+        newkeys = []
+        for keyvalue in defaultkeys:
+            if keyvalue.encode('hex') not in dedrmprefs['adeptkeys'].values():
+                newkeys.append(keyvalue)
 
-                        # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+        if len(newkeys) > 0:
+            try:
+                for i,userkey in enumerate(newkeys):
+                    print u"{0} v{1}: Trying a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+                    of = self.temporary_file(u".pdf")
+
+                    # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+                    try:
+                        result = ineptpdf.decryptBook(userkey, path_to_ebook, of.name)
+                    except:
+                        print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                        traceback.print_exc()
+                        result = 1
+
+                    of.close()
+
+                    if  result == 0:
+                        # Decryption was a success
+                        # Store the new successful key in the defaults
+                        print u"{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
                         try:
-                            result = ineptepdf.decryptBook(userkey, inf.name, of.name)
+                            dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex'))
+                            dedrmprefs.writeprefs()
+                            print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
                         except:
-                            result = 1
+                            print u"{0} v{1}: Exception when saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                            traceback.print_exc()
+                        # Return the modified PersistentTemporary file to calibre.
+                        return of.name
 
-                        of.close()
-
-                        if  result == 0:
-                            # Decryption was a success
-                            # Store the new successful key in the defaults
-                            print u"{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
-                            try:
-                                dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex'))
-                                dedrmprefs.writeprefs()
-                            except:
-                                traceback.print_exc()
-                            # Return the modified PersistentTemporary file to calibre.
-                            return of.name
-
-                        print u"{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-                except Exception, e:
-                    pass
+                    print u"{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+            except Exception, e:
+                pass
 
         # Something went wrong with decryption.
         print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
 
 
     def KindleMobiDecrypt(self,path_to_ebook):
@@ -397,6 +500,8 @@ class DeDRM(FileTypePlugin):
                     scriptpath = os.path.join(self.alfdir,u"kindlekey.py")
                     defaultkeys = WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix'])
             except:
+                print u"{0} v{1}: Exception when getting default Kindle Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
                 pass
 
             newkeys = {}
@@ -419,8 +524,7 @@ class DeDRM(FileTypePlugin):
             if not decoded:
                 #if you reached here then no luck raise and exception
                 print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-                traceback.print_exc()
-                raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{4}” after {3:.1f} seconds with error: {2}\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0],time.time()-self.starttime,os.path.basename(path_to_ebook)))
+                raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
 
         of = self.temporary_file(book.getBookExtension())
         book.getFile(of.name)
@@ -454,7 +558,7 @@ class DeDRM(FileTypePlugin):
             print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname_masked,time.time()-self.starttime)
 
         print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
 
 
     def run(self, path_to_ebook):

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/activitybar.py

@@ -0,0 +1,75 @@
+import sys
+import Tkinter
+import Tkconstants
+
+class ActivityBar(Tkinter.Frame):
+
+    def __init__(self, master, length=300, height=20, barwidth=15, interval=50, bg='white', fillcolor='orchid1',\
+                 bd=2, relief=Tkconstants.GROOVE, *args, **kw):
+        Tkinter.Frame.__init__(self, master, bg=bg, width=length, height=height, *args, **kw)
+        self._master = master
+        self._interval = interval
+        self._maximum = length
+        self._startx = 0
+        self._barwidth = barwidth
+        self._bardiv = length / barwidth
+        if self._bardiv < 10:
+            self._bardiv = 10
+        stopx = self._startx + self._barwidth
+        if stopx > self._maximum:
+            stopx = self._maximum
+        # self._canv = Tkinter.Canvas(self, bg=self['bg'], width=self['width'], height=self['height'],\
+        #                             highlightthickness=0, relief='flat', bd=0)
+        self._canv = Tkinter.Canvas(self, bg=self['bg'], width=self['width'], height=self['height'],\
+                                    highlightthickness=0, relief=relief, bd=bd)
+        self._canv.pack(fill='both', expand=1)
+        self._rect = self._canv.create_rectangle(0, 0, self._canv.winfo_reqwidth(), self._canv.winfo_reqheight(), fill=fillcolor, width=0)
+
+        self._set()
+        self.bind('<Configure>', self._update_coords)
+        self._running = False
+
+    def _update_coords(self, event):
+        '''Updates the position of the rectangle inside the canvas when the size of
+        the widget gets changed.'''
+        # looks like we have to call update_idletasks() twice to make sure
+        # to get the results we expect
+        self._canv.update_idletasks()
+        self._maximum = self._canv.winfo_width()
+        self._startx = 0
+        self._barwidth = self._maximum / self._bardiv
+        if self._barwidth < 2:
+            self._barwidth = 2
+        stopx = self._startx + self._barwidth
+        if stopx > self._maximum:
+            stopx = self._maximum
+        self._canv.coords(self._rect, 0, 0, stopx, self._canv.winfo_height())
+        self._canv.update_idletasks()
+
+    def _set(self):
+        if self._startx < 0:
+            self._startx = 0
+        if self._startx > self._maximum:
+            self._startx = self._startx % self._maximum
+        stopx = self._startx + self._barwidth
+        if stopx > self._maximum:
+            stopx = self._maximum
+        self._canv.coords(self._rect, self._startx, 0, stopx, self._canv.winfo_height())
+        self._canv.update_idletasks()
+
+    def start(self):
+        self._running = True
+        self.after(self._interval, self._step)
+
+    def stop(self):
+        self._running = False
+        self._set()
+
+    def _step(self):
+        if self._running:
+            stepsize = self._barwidth / 4
+            if stepsize < 2:
+                stepsize = 2
+            self._startx += stepsize
+            self._set()
+            self.after(self._interval, self._step)

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/android.py

@@ -10,6 +10,7 @@ from cStringIO import StringIO
 from binascii import a2b_hex, b2a_hex
 
 STORAGE = 'AmazonSecureStorage.xml'
+STORAGE2 = 'map_data_storage.db'
 
 class AndroidObfuscation(object):
     '''AndroidObfuscation
@@ -76,13 +77,8 @@ def parse_preference(path):
 
 def get_serials(path=None):
     ''' get serials from android's shared preference xml '''
-    if path is None:
-        if not os.path.isfile(STORAGE):
-            if os.path.isfile("backup.ab"):
-                get_storage()
-            else:
-                return []
-        path = STORAGE
+    if path is None and os.path.isfile("backup.ab"):
+        return get_storage()
 
     if not os.path.isfile(path):
         return []
@@ -113,16 +109,27 @@ def get_serials(path=None):
     try:
         tokens = set(get_value('kindle.account.tokens').split(','))
     except:
-        return [dsnid]
+        return []
 
     serials = []
     for token in tokens:
         if token:
             serials.append('%s%s' % (dsnid, token))
-    serials.append(dsnid)
-    for token in tokens:
-        if token:
-            serials.append(token)
+    return serials
+
+def get_serials2(path=STORAGE2):
+    import sqlite3
+    connection = sqlite3.connect(path)
+    cursor = connection.cursor()
+    cursor.execute('''select userdata_value from userdata where userdata_key like '%/%token.device.deviceserialname%' ''')
+    dsns = [x[0].encode('utf8') for x in cursor.fetchall()]
+
+    cursor.execute('''select userdata_value from userdata where userdata_key like '%/%kindle.account.tokens%' ''')
+    tokens = [x[0].encode('utf8') for x in cursor.fetchall()]
+    serials = []
+    for x in dsns:
+        for y in tokens:
+            serials.append('%s%s' % (x, y))
     return serials
 
 def get_storage(path='backup.ab'):
@@ -130,25 +137,38 @@ def get_storage(path='backup.ab'):
     backup.ab can be get using adb command:
     shell> adb backup com.amazon.kindle
     '''
+    if not os.path.isfile(path):
+        serials = []
+        if os.path.isfile(STORAGE2):
+            serials.extend(get_serials2(STORAGE2))
+        if os.path.isfile(STORAGE):
+            serials.extend(get_serials(STORAGE))
+        return serials
     output = None
     read = open(path, 'rb')
     head = read.read(24)
-    if head == 'ANDROID BACKUP\n1\n1\nnone\n':
+    if head[:14] == 'ANDROID BACKUP':
         output = StringIO(zlib.decompress(read.read()))
     read.close()
 
     if not output:
-        return False
+        return []
 
+    serials = []
     tar = tarfile.open(fileobj=output)
     for member in tar.getmembers():
-        if member.name.strip().endswith(STORAGE):
+        if member.name.strip().endswith(STORAGE2):
+            write = open(STORAGE2, 'w')
+            write.write(tar.extractfile(member).read())
+            write.close()
+            serials.extend(get_serials2(STORAGE2))
+        elif member.name.strip().endswith(STORAGE):
             write = open(STORAGE, 'w')
             write.write(tar.extractfile(member).read())
             write.close()
-            break
+            serials.extend(get_serials(STORAGE))
 
-    return True
+    return serials
 
 __all__ = [ 'get_storage', 'get_serials', 'parse_preference',
             'AndroidObfuscation', 'AndroidObfuscationV2', 'STORAGE']

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/android_readme.txt

@@ -1,6 +1,7 @@
 1.1 get AmazonSecureStorage.xml from /data/data/com.amazon.kindle/shared_prefs/AmazonSecureStorage.xml
+    or map_data_storage.db from /data/data/com.amazon.kindle/databases/map_data_storage.db
 
 1.2 on android 4.0+, run `adb backup com.amazon.kindle` from PC will get backup.ab
-    now android.py can convert backup.ab to AmazonSecureStorage.xml
+    now android.py can convert backup.ab to AmazonSecureStorage.xml and map_data_storage.db
 
-2. run `k4mobidedrm.py -a AmazonSecureStorage.xml <infile> <outdir>'
+2. run `k4mobidedrm.py <infile> <outdir>'

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/argv_utils.py

@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import sys, os
+import locale
+import codecs
+
+# get sys.argv arguments and encode them into utf-8
+def unicode_argv():
+    if sys.platform.startswith('win'):
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"DeDRM.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+
+def add_cp65001_codec():
+  try:
+    codecs.lookup('cp65001')
+  except LookupError:
+    codecs.register(
+        lambda name: name == 'cp65001' and codecs.lookup('utf-8') or None)
+  return
+
+
+def set_utf8_default_encoding():
+  if sys.getdefaultencoding() == 'utf-8':
+    return
+
+  # Regenerate setdefaultencoding.
+  reload(sys)
+  sys.setdefaultencoding('utf-8')
+
+  for attr in dir(locale):
+    if attr[0:3] != 'LC_':
+      continue
+    aref = getattr(locale, attr)
+    try:
+      locale.setlocale(aref, '')
+    except locale.Error:
+      continue
+    try:
+      lang = locale.getlocale(aref)[0]
+    except (TypeError, ValueError):
+      continue
+    if lang:
+      try:
+        locale.setlocale(aref, (lang, 'UTF-8'))
+      except locale.Error:
+        os.environ[attr] = lang + '.UTF-8'
+  try:
+    locale.setlocale(locale.LC_ALL, '')
+  except locale.Error:
+    pass
+  return
+
+

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/askfolder_ed.py

@@ -0,0 +1,211 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+# to work around tk_chooseDirectory not properly returning unicode paths on Windows
+# need to use a dialog that can be hacked up to actually return full unicode paths
+# originally based on AskFolder from EasyDialogs for Windows but modified to fix it
+# to actually use unicode for path
+
+# The original license for EasyDialogs is as follows
+#
+# Copyright (c) 2003-2005 Jimmy Retzlaff
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+"""
+AskFolder(...) -- Ask the user to select a folder Windows specific
+"""
+
+import os
+
+import ctypes
+from ctypes import POINTER, byref, cdll, c_int, windll
+from ctypes.wintypes import LPCWSTR, LPWSTR
+import ctypes.wintypes as wintypes
+
+
+__all__ = ['AskFolder']
+
+# Load required Windows DLLs
+ole32 = ctypes.windll.ole32
+shell32 = ctypes.windll.shell32
+user32 = ctypes.windll.user32
+
+
+# Windows Constants
+BFFM_INITIALIZED = 1
+BFFM_SETOKTEXT = 1129
+BFFM_SETSELECTIONA = 1126
+BFFM_SETSELECTIONW = 1127
+BIF_EDITBOX = 16
+BS_DEFPUSHBUTTON = 1
+CB_ADDSTRING = 323
+CB_GETCURSEL = 327
+CB_SETCURSEL = 334
+CDM_SETCONTROLTEXT = 1128
+EM_GETLINECOUNT = 186
+EM_GETMARGINS = 212
+EM_POSFROMCHAR = 214
+EM_SETSEL = 177
+GWL_STYLE = -16
+IDC_STATIC = -1
+IDCANCEL = 2
+IDNO = 7
+IDOK = 1
+IDYES = 6
+MAX_PATH = 260
+OFN_ALLOWMULTISELECT = 512
+OFN_ENABLEHOOK = 32
+OFN_ENABLESIZING = 8388608
+OFN_ENABLETEMPLATEHANDLE = 128
+OFN_EXPLORER = 524288
+OFN_OVERWRITEPROMPT = 2
+OPENFILENAME_SIZE_VERSION_400 = 76
+PBM_GETPOS = 1032
+PBM_SETMARQUEE = 1034
+PBM_SETPOS = 1026
+PBM_SETRANGE = 1025
+PBM_SETRANGE32 = 1030
+PBS_MARQUEE = 8
+PM_REMOVE = 1
+SW_HIDE = 0
+SW_SHOW = 5
+SW_SHOWNORMAL = 1
+SWP_NOACTIVATE = 16
+SWP_NOMOVE = 2
+SWP_NOSIZE = 1
+SWP_NOZORDER = 4
+VER_PLATFORM_WIN32_NT = 2
+WM_COMMAND = 273
+WM_GETTEXT = 13
+WM_GETTEXTLENGTH = 14
+WM_INITDIALOG = 272
+WM_NOTIFY = 78
+
+# Windows function prototypes
+BrowseCallbackProc = ctypes.WINFUNCTYPE(ctypes.c_int, wintypes.HWND, ctypes.c_uint, wintypes.LPARAM, wintypes.LPARAM)
+
+# Windows types
+LPCTSTR = ctypes.c_char_p
+LPTSTR = ctypes.c_char_p
+LPVOID = ctypes.c_voidp
+TCHAR = ctypes.c_char
+
+class BROWSEINFO(ctypes.Structure):
+    _fields_ = [
+                ("hwndOwner", wintypes.HWND),
+                ("pidlRoot", LPVOID),
+                ("pszDisplayName", LPTSTR),
+                ("lpszTitle", LPCTSTR),
+                ("ulFlags", ctypes.c_uint),
+                ("lpfn", BrowseCallbackProc),
+                ("lParam", wintypes.LPARAM),
+                ("iImage", ctypes.c_int)
+               ]
+
+
+# Utilities
+def CenterWindow(hwnd):
+    desktopRect = GetWindowRect(user32.GetDesktopWindow())
+    myRect = GetWindowRect(hwnd)
+    x = width(desktopRect) // 2 - width(myRect) // 2
+    y = height(desktopRect) // 2 - height(myRect) // 2
+    user32.SetWindowPos(hwnd, 0,
+                        desktopRect.left + x,
+                        desktopRect.top + y,
+                        0, 0,
+                        SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER
+                       )
+
+
+def GetWindowRect(hwnd):
+    rect = wintypes.RECT()
+    user32.GetWindowRect(hwnd, ctypes.byref(rect))
+    return rect
+
+def width(rect):
+    return rect.right-rect.left
+
+def height(rect):
+    return rect.bottom-rect.top
+
+
+def AskFolder(
+        message=None,
+        version=None,
+        defaultLocation=None,
+        location=None,
+        windowTitle=None,
+        actionButtonLabel=None,
+        cancelButtonLabel=None,
+        multiple=None):
+    """Display a dialog asking the user for select a folder.
+       modified to use unicode strings as much as possible
+       returns unicode path
+    """
+
+    def BrowseCallback(hwnd, uMsg, lParam, lpData):
+        if uMsg == BFFM_INITIALIZED:
+            if actionButtonLabel:
+                label = unicode(actionButtonLabel, errors='replace')
+                user32.SendMessageW(hwnd, BFFM_SETOKTEXT, 0, label)
+            if cancelButtonLabel:
+                label = unicode(cancelButtonLabel, errors='replace')
+                cancelButton = user32.GetDlgItem(hwnd, IDCANCEL)
+                if cancelButton:
+                    user32.SetWindowTextW(cancelButton, label)
+            if windowTitle:
+                title = unicode(windowTitle, erros='replace')
+                user32.SetWindowTextW(hwnd, title)
+            if defaultLocation:
+                user32.SendMessageW(hwnd, BFFM_SETSELECTIONW, 1, defaultLocation.replace('/', '\\'))
+            if location:
+                x, y = location
+                desktopRect = wintypes.RECT()
+                user32.GetWindowRect(0, ctypes.byref(desktopRect))
+                user32.SetWindowPos(hwnd, 0,
+                                  desktopRect.left + x,
+                                  desktopRect.top + y, 0, 0,
+                                  SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER)
+            else:
+                CenterWindow(hwnd)
+        return 0
+
+    # This next line is needed to prevent gc of the callback
+    callback = BrowseCallbackProc(BrowseCallback)
+
+    browseInfo = BROWSEINFO()
+    browseInfo.pszDisplayName = ctypes.c_char_p('\0' * (MAX_PATH+1))
+    browseInfo.lpszTitle = message
+    browseInfo.lpfn = callback
+
+    pidl = shell32.SHBrowseForFolder(ctypes.byref(browseInfo))
+    if not pidl:
+        result = None
+    else:
+        path = LPCWSTR(u" " * (MAX_PATH+1))
+        shell32.SHGetPathFromIDListW(pidl, path)
+        ole32.CoTaskMemFree(pidl)
+        result = path.value
+    return result
+
+
+
+

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf

@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
 {\fonttbl}
 {\colortbl;\red255\green255\blue255;}
 }

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/dialogs.py

@@ -0,0 +1,719 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+
+from __future__ import with_statement
+__license__ = 'GPL v3'
+
+# Standard Python modules.
+import os, sys, re, hashlib
+import json
+
+from PyQt4.Qt import (Qt, QWidget, QHBoxLayout, QVBoxLayout, QLabel, QListWidget, QListWidgetItem, QAbstractItemView, QLineEdit, QPushButton, QIcon, QGroupBox, QDialog, QDialogButtonBox, QUrl, QString)
+from PyQt4 import QtGui
+
+# calibre modules and constants.
+from calibre.gui2 import (error_dialog, question_dialog, info_dialog, open_url,
+                            choose_dir, choose_files)
+from calibre.utils.config import dynamic, config_dir, JSONConfig
+
+from calibre_plugins.dedrm.__init__ import PLUGIN_NAME, PLUGIN_VERSION
+from calibre_plugins.dedrm.utilities import (uStrCmp, DETAILED_MESSAGE, parseCustString)
+from calibre_plugins.dedrm.ignoblekeygen import generate_key as generate_bandn_key
+from calibre_plugins.dedrm.erdr2pml import getuser_key as generate_ereader_key
+from calibre_plugins.dedrm.adobekey import adeptkeys as retrieve_adept_keys
+from calibre_plugins.dedrm.kindlekey import kindlekeys as retrieve_kindle_keys
+
+class ManageKeysDialog(QDialog):
+    def __init__(self, parent, key_type_name, plugin_keys, create_key, keyfile_ext = u""):
+        QDialog.__init__(self,parent)
+        self.parent = parent
+        self.key_type_name = key_type_name
+        self.plugin_keys = plugin_keys
+        self.create_key = create_key
+        self.keyfile_ext = keyfile_ext
+        self.import_key = (keyfile_ext != u"")
+        self.binary_file = (key_type_name == u"Adobe Digital Editions Key")
+        self.json_file = (key_type_name == u"Kindle for Mac and PC Key")
+
+        self.setWindowTitle("{0} {1}: Manage {2}s".format(PLUGIN_NAME, PLUGIN_VERSION, self.key_type_name))
+
+        # Start Qt Gui dialog layout
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        help_layout = QHBoxLayout()
+        layout.addLayout(help_layout)
+        # Add hyperlink to a help file at the right. We will replace the correct name when it is clicked.
+        help_label = QLabel('<a href="http://www.foo.com/">Help</a>', self)
+        help_label.setTextInteractionFlags(Qt.LinksAccessibleByMouse | Qt.LinksAccessibleByKeyboard)
+        help_label.setAlignment(Qt.AlignRight)
+        help_label.linkActivated.connect(self.help_link_activated)
+        help_layout.addWidget(help_label)
+
+        keys_group_box = QGroupBox(_(u"{0}s".format(self.key_type_name)), self)
+        layout.addWidget(keys_group_box)
+        keys_group_box_layout = QHBoxLayout()
+        keys_group_box.setLayout(keys_group_box_layout)
+
+        self.listy = QListWidget(self)
+        self.listy.setToolTip(u"{0}s that will be used to decrypt ebooks".format(self.key_type_name))
+        self.listy.setSelectionMode(QAbstractItemView.SingleSelection)
+        self.populate_list()
+        keys_group_box_layout.addWidget(self.listy)
+
+        button_layout = QVBoxLayout()
+        keys_group_box_layout.addLayout(button_layout)
+        self._add_key_button = QtGui.QToolButton(self)
+        self._add_key_button.setToolTip(u"Create new {0}".format(self.key_type_name))
+        self._add_key_button.setIcon(QIcon(I('plus.png')))
+        self._add_key_button.clicked.connect(self.add_key)
+        button_layout.addWidget(self._add_key_button)
+
+        self._delete_key_button = QtGui.QToolButton(self)
+        self._delete_key_button.setToolTip(_(u"Delete highlighted key"))
+        self._delete_key_button.setIcon(QIcon(I('list_remove.png')))
+        self._delete_key_button.clicked.connect(self.delete_key)
+        button_layout.addWidget(self._delete_key_button)
+
+        if type(self.plugin_keys) == dict:
+            self._rename_key_button = QtGui.QToolButton(self)
+            self._rename_key_button.setToolTip(_(u"Rename highlighted key"))
+            self._rename_key_button.setIcon(QIcon(I('edit-select-all.png')))
+            self._rename_key_button.clicked.connect(self.rename_key)
+            button_layout.addWidget(self._rename_key_button)
+
+            self.export_key_button = QtGui.QToolButton(self)
+            self.export_key_button.setToolTip(u"Save highlighted key to a .{0} file".format(self.keyfile_ext))
+            self.export_key_button.setIcon(QIcon(I('save.png')))
+            self.export_key_button.clicked.connect(self.export_key)
+            button_layout.addWidget(self.export_key_button)
+        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        button_layout.addItem(spacerItem)
+
+        layout.addSpacing(5)
+        migrate_layout = QHBoxLayout()
+        layout.addLayout(migrate_layout)
+        if self.import_key:
+            migrate_layout.setAlignment(Qt.AlignJustify)
+            self.migrate_btn = QPushButton(u"Import Existing Keyfiles", self)
+            self.migrate_btn.setToolTip(u"Import *.{0} files (created using other tools).".format(self.keyfile_ext))
+            self.migrate_btn.clicked.connect(self.migrate_wrapper)
+            migrate_layout.addWidget(self.migrate_btn)
+        migrate_layout.addStretch()
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Close)
+        self.button_box.rejected.connect(self.close)
+        migrate_layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    def populate_list(self):
+        if type(self.plugin_keys) == dict:
+            for key in self.plugin_keys.keys():
+                self.listy.addItem(QListWidgetItem(key))
+        else:
+            for key in self.plugin_keys:
+                self.listy.addItem(QListWidgetItem(key))
+
+    def add_key(self):
+        d = self.create_key(self)
+        d.exec_()
+
+        if d.result() != d.Accepted:
+            # New key generation cancelled.
+            return
+        new_key_value = d.key_value
+        if type(self.plugin_keys) == dict:
+            if new_key_value in self.plugin_keys.values():
+                old_key_name = [name for name, value in self.plugin_keys.iteritems() if value == new_key_value][0]
+                info_dialog(None, "{0} {1}: Duplicate {2}".format(PLUGIN_NAME, PLUGIN_VERSION,self.key_type_name),
+                                    u"The new {1} is the same as the existing {1} named <strong>{0}</strong> and has not been added.".format(old_key_name,self.key_type_name), show=True)
+                return
+            self.plugin_keys[d.key_name] = new_key_value
+        else:
+            if new_key_value in self.plugin_keys:
+                info_dialog(None, "{0} {1}: Duplicate {2}".format(PLUGIN_NAME, PLUGIN_VERSION,self.key_type_name),
+                                    u"This {0} is already in the list of {0}s has not been added.".format(self.key_type_name), show=True)
+                return
+
+            self.plugin_keys.append(d.key_value)
+        self.listy.clear()
+        self.populate_list()
+
+    def rename_key(self):
+        if not self.listy.currentItem():
+            errmsg = u"No {0} selected to rename. Highlight a keyfile first.".format(self.key_type_name)
+            r = error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+            return
+
+        d = RenameKeyDialog(self)
+        d.exec_()
+
+        if d.result() != d.Accepted:
+            # rename cancelled or moot.
+            return
+        keyname = unicode(self.listy.currentItem().text().toUtf8(),'utf8')
+        if not question_dialog(self, "{0} {1}: Confirm Rename".format(PLUGIN_NAME, PLUGIN_VERSION), u"Do you really want to rename the {2} named <strong>{0}</strong> to <strong>{1}</strong>?".format(keyname,d.key_name,self.key_type_name), show_copy_button=False, default_yes=False):
+            return
+        self.plugin_keys[d.key_name] = self.plugin_keys[keyname]
+        del self.plugin_keys[keyname]
+
+        self.listy.clear()
+        self.populate_list()
+
+    def delete_key(self):
+        if not self.listy.currentItem():
+            return
+        keyname = unicode(self.listy.currentItem().text().toUtf8(), 'utf8')
+        if not question_dialog(self, "{0} {1}: Confirm Delete".format(PLUGIN_NAME, PLUGIN_VERSION), u"Do you really want to delete the {1} <strong>{0}</strong>?".format(keyname, self.key_type_name), show_copy_button=False, default_yes=False):
+            return
+        if type(self.plugin_keys) == dict:
+            del self.plugin_keys[keyname]
+        else:
+            self.plugin_keys.remove(keyname)
+
+        self.listy.clear()
+        self.populate_list()
+
+    def help_link_activated(self, url):
+        def get_help_file_resource():
+            # Copy the HTML helpfile to the plugin directory each time the
+            # link is clicked in case the helpfile is updated in newer plugins.
+            help_file_name = u"{0}_{1}_Help.htm".format(PLUGIN_NAME, self.key_type_name)
+            file_path = os.path.join(config_dir, u"plugins", u"DeDRM", u"help", help_file_name)
+            with open(file_path,'w') as f:
+                f.write(self.parent.load_resource(help_file_name))
+            return file_path
+        url = 'file:///' + get_help_file_resource()
+        open_url(QUrl(url))
+
+    def migrate_files(self):
+        dynamic[PLUGIN_NAME + u"config_dir"] = config_dir
+        files = choose_files(self, PLUGIN_NAME + u"config_dir",
+                u"Select {0} files to import".format(self.key_type_name), [(u"{0} files".format(self.key_type_name), [self.keyfile_ext])], False)
+        counter = 0
+        skipped = 0
+        if files:
+            for filename in files:
+                fpath = os.path.join(config_dir, filename)
+                filename = os.path.basename(filename)
+                new_key_name = os.path.splitext(os.path.basename(filename))[0]
+                with open(fpath,'rb') as keyfile:
+                    new_key_value = keyfile.read()
+                if self.binary_file:
+                    new_key_value = new_key_value.encode('hex')
+                elif self.json_file:
+                    new_key_value = json.loads(new_key_value)
+                match = False
+                for key in self.plugin_keys.keys():
+                    if uStrCmp(new_key_name, key, True):
+                        skipped += 1
+                        msg = u"A key with the name <strong>{0}</strong> already exists!\nSkipping key file  <strong>{1}</strong>.\nRename the existing key and import again".format(new_key_name,filename)
+                        inf = info_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                _(msg), show_copy_button=False, show=True)
+                        match = True
+                        break
+                if not match:
+                    if new_key_value in self.plugin_keys.values():
+                        old_key_name = [name for name, value in self.plugin_keys.iteritems() if value == new_key_value][0]
+                        skipped += 1
+                        info_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                            u"The key in file {0} is the same as the existing key <strong>{1}</strong> and has been skipped.".format(filename,old_key_name), show_copy_button=False, show=True)
+                    else:
+                        counter += 1
+                        self.plugin_keys[new_key_name] = new_key_value
+
+            msg = u""
+            if counter+skipped > 1:
+                if counter > 0:
+                    msg += u"Imported <strong>{0:d}</strong> key {1}. ".format(counter, u"file" if counter == 1 else u"files")
+                if skipped > 0:
+                    msg += u"Skipped <strong>{0:d}</strong> key {1}.".format(skipped, u"file" if counter == 1 else u"files")
+                inf = info_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(msg), show_copy_button=False, show=True)
+        return counter > 0
+
+    def migrate_wrapper(self):
+        if self.migrate_files():
+            self.listy.clear()
+            self.populate_list()
+
+    def export_key(self):
+        if not self.listy.currentItem():
+            errmsg = u"No keyfile selected to export. Highlight a keyfile first."
+            r = error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+            return
+        filter = QString(u"{0} Files (*.{1})".format(self.key_type_name, self.keyfile_ext))
+        keyname = unicode(self.listy.currentItem().text().toUtf8(), 'utf8')
+        if dynamic.get(PLUGIN_NAME + 'save_dir'):
+            defaultname = os.path.join(dynamic.get(PLUGIN_NAME + 'save_dir'), u"{0}.{1}".format(keyname , self.keyfile_ext))
+        else:
+            defaultname = os.path.join(os.path.expanduser('~'), u"{0}.{1}".format(keyname , self.keyfile_ext))
+        filename = unicode(QtGui.QFileDialog.getSaveFileName(self, u"Save {0} File as...".format(self.key_type_name), defaultname,
+                                            u"{0} Files (*.{1})".format(self.key_type_name,self.keyfile_ext), filter))
+        if filename:
+            dynamic[PLUGIN_NAME + 'save_dir'] = os.path.split(filename)[0]
+            with file(filename, 'w') as fname:
+                if self.binary_file:
+                    fname.write(self.plugin_keys[keyname].decode('hex'))
+                elif self.json_file:
+                    fname.write(json.dumps(self.plugin_keys[keyname]))
+                else:
+                    fname.write(self.plugin_keys[keyname])
+
+
+
+
+class RenameKeyDialog(QDialog):
+    def __init__(self, parent=None,):
+        print repr(self), repr(parent)
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle("{0} {1}: Rename {0}".format(PLUGIN_NAME, PLUGIN_VERSION, parent.key_type_name))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox('', self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        data_group_box_layout.addWidget(QLabel('New Key Name:', self))
+        self.key_ledit = QLineEdit(self.parent.listy.currentItem().text(), self)
+        self.key_ledit.setToolTip(u"Enter a new name for this existing {0}.".format(parent.key_type_name))
+        data_group_box_layout.addWidget(self.key_ledit)
+
+        layout.addSpacing(20)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    def accept(self):
+        if self.key_ledit.text().isEmpty() or unicode(self.key_ledit.text()).isspace():
+            errmsg = u"Key name field cannot be empty!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+        if len(self.key_ledit.text()) < 4:
+            errmsg = u"Key name must be at <i>least</i> 4 characters long!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+        if uStrCmp(self.key_ledit.text(), self.parent.listy.currentItem().text()):
+                # Same exact name ... do nothing.
+                return QDialog.reject(self)
+        for k in self.parent.plugin_keys.keys():
+            if (uStrCmp(self.key_ledit.text(), k, True) and
+                        not uStrCmp(k, self.parent.listy.currentItem().text(), True)):
+                errmsg = u"The key name <strong>{0}</strong> is already being used.".format(self.key_ledit.text())
+                return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+
+
+
+
+
+
+
+class AddBandNKeyDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Create New Barnes & Noble Key".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox(u"", self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"Unique Key Name:", self))
+        self.key_ledit = QLineEdit("", self)
+        self.key_ledit.setToolTip(_(u"<p>Enter an identifying name for this new key.</p>" +
+                                u"<p>It should be something that will help you remember " +
+                                u"what personal information was used to create it."))
+        key_group.addWidget(self.key_ledit)
+        key_label = QLabel(_(''), self)
+        key_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(key_label)
+
+        name_group = QHBoxLayout()
+        data_group_box_layout.addLayout(name_group)
+        name_group.addWidget(QLabel(u"Your Name:", self))
+        self.name_ledit = QLineEdit(u"", self)
+        self.name_ledit.setToolTip(_(u"<p>Enter your name as it appears in your B&N " +
+                                u"account or on your credit card.</p>" +
+                                u"<p>It will only be used to generate this " +
+                                u"one-time key and won\'t be stored anywhere " +
+                                u"in calibre or on your computer.</p>" +
+                                u"<p>(ex: Jonathan Smith)"))
+        name_group.addWidget(self.name_ledit)
+        name_disclaimer_label = QLabel(_(u"(Will not be saved in configuration data)"), self)
+        name_disclaimer_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(name_disclaimer_label)
+
+        ccn_group = QHBoxLayout()
+        data_group_box_layout.addLayout(ccn_group)
+        ccn_group.addWidget(QLabel(u"Credit Card#:", self))
+        self.cc_ledit = QLineEdit(u"", self)
+        self.cc_ledit.setToolTip(_(u"<p>Enter the full credit card number on record " +
+                                u"in your B&N account.</p>" +
+                                u"<p>No spaces or dashes... just the numbers. " +
+                                u"This number will only be used to generate this " +
+                                u"one-time key and won\'t be stored anywhere in " +
+                                u"calibre or on your computer."))
+        ccn_group.addWidget(self.cc_ledit)
+        ccn_disclaimer_label = QLabel(_('(Will not be saved in configuration data)'), self)
+        ccn_disclaimer_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(ccn_disclaimer_label)
+        layout.addSpacing(10)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return generate_bandn_key(self.user_name,self.cc_number)
+
+    @property
+    def user_name(self):
+        return unicode(self.name_ledit.text().toUtf8(), 'utf8').strip().lower().replace(' ','')
+
+    @property
+    def cc_number(self):
+        return unicode(self.cc_ledit.text().toUtf8(), 'utf8').strip().replace(' ', '').replace('-','')
+
+
+    def accept(self):
+        if len(self.key_name) == 0 or len(self.user_name) == 0 or len(self.cc_number) == 0 or self.key_name.isspace() or self.user_name.isspace() or self.cc_number.isspace():
+            errmsg = u"All fields are required!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if not self.cc_number.isdigit():
+            errmsg = u"Numbers only in the credit card number field!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) < 4:
+            errmsg = u"Key name must be at <i>least</i> 4 characters long!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+class AddEReaderDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Create New eReader Key".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox(u"", self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"Unique Key Name:", self))
+        self.key_ledit = QLineEdit("", self)
+        self.key_ledit.setToolTip(u"<p>Enter an identifying name for this new key.\nIt should be something that will help you remember what personal information was used to create it.")
+        key_group.addWidget(self.key_ledit)
+        key_label = QLabel(_(''), self)
+        key_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(key_label)
+
+        name_group = QHBoxLayout()
+        data_group_box_layout.addLayout(name_group)
+        name_group.addWidget(QLabel(u"Your Name:", self))
+        self.name_ledit = QLineEdit(u"", self)
+        self.name_ledit.setToolTip(u"Enter the name for this eReader key, usually the name on your credit card.\nIt will only be used to generate this one-time key and won\'t be stored anywhere in calibre or on your computer.\n(ex: Mr Jonathan Q Smith)")
+        name_group.addWidget(self.name_ledit)
+        name_disclaimer_label = QLabel(_(u"(Will not be saved in configuration data)"), self)
+        name_disclaimer_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(name_disclaimer_label)
+
+        ccn_group = QHBoxLayout()
+        data_group_box_layout.addLayout(ccn_group)
+        ccn_group.addWidget(QLabel(u"Credit Card#:", self))
+        self.cc_ledit = QLineEdit(u"", self)
+        self.cc_ledit.setToolTip(u"<p>Enter the last 8 digits of credit card number for this eReader key.\nThey will only be used to generate this one-time key and won\'t be stored anywhere in calibre or on your computer.")
+        ccn_group.addWidget(self.cc_ledit)
+        ccn_disclaimer_label = QLabel(_('(Will not be saved in configuration data)'), self)
+        ccn_disclaimer_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(ccn_disclaimer_label)
+        layout.addSpacing(10)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return generate_ereader_key(self.user_name,self.cc_number).encode('hex')
+
+    @property
+    def user_name(self):
+        return unicode(self.name_ledit.text().toUtf8(), 'utf8').strip().lower().replace(' ','')
+
+    @property
+    def cc_number(self):
+        return unicode(self.cc_ledit.text().toUtf8(), 'utf8').strip().replace(' ', '').replace('-','')
+
+
+    def accept(self):
+        if len(self.key_name) == 0 or len(self.user_name) == 0 or len(self.cc_number) == 0 or self.key_name.isspace() or self.user_name.isspace() or self.cc_number.isspace():
+            errmsg = u"All fields are required!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if not self.cc_number.isdigit():
+            errmsg = u"Numbers only in the credit card number field!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) < 4:
+            errmsg = u"Key name must be at <i>least</i> 4 characters long!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+
+class AddAdeptDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Getting Default Adobe Digital Editions Key".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        try:
+            self.default_key = retrieve_adept_keys()[0]
+        except:
+            self.default_key = u""
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+
+        if len(self.default_key)>0:
+            data_group_box = QGroupBox(u"", self)
+            layout.addWidget(data_group_box)
+            data_group_box_layout = QVBoxLayout()
+            data_group_box.setLayout(data_group_box_layout)
+
+            key_group = QHBoxLayout()
+            data_group_box_layout.addLayout(key_group)
+            key_group.addWidget(QLabel(u"Unique Key Name:", self))
+            self.key_ledit = QLineEdit("", self)
+            self.key_ledit.setToolTip(u"<p>Enter an identifying name for the current default Adobe Digital Editions key.")
+            key_group.addWidget(self.key_ledit)
+            key_label = QLabel(_(''), self)
+            key_label.setAlignment(Qt.AlignHCenter)
+            data_group_box_layout.addWidget(key_label)
+            self.button_box.accepted.connect(self.accept)
+        else:
+            default_key_error = QLabel(u"The default encryption key for Adobe Digital Editions could not be found.", self)
+            default_key_error.setAlignment(Qt.AlignHCenter)
+            layout.addWidget(default_key_error)
+            # if no default, bot buttons do the same
+            self.button_box.accepted.connect(self.reject)
+
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return self.default_key.encode('hex')
+
+
+    def accept(self):
+        if len(self.key_name) == 0 or self.key_name.isspace():
+            errmsg = u"All fields are required!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) < 4:
+            errmsg = u"Key name must be at <i>least</i> 4 characters long!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+
+class AddKindleDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Getting Default Kindle for Mac/PC Key".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        try:
+            self.default_key = retrieve_kindle_keys()[0]
+        except:
+            self.default_key = u""
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+
+        if len(self.default_key)>0:
+            data_group_box = QGroupBox(u"", self)
+            layout.addWidget(data_group_box)
+            data_group_box_layout = QVBoxLayout()
+            data_group_box.setLayout(data_group_box_layout)
+
+            key_group = QHBoxLayout()
+            data_group_box_layout.addLayout(key_group)
+            key_group.addWidget(QLabel(u"Unique Key Name:", self))
+            self.key_ledit = QLineEdit("", self)
+            self.key_ledit.setToolTip(u"<p>Enter an identifying name for the current default Kindle for Mac/PC key.")
+            key_group.addWidget(self.key_ledit)
+            key_label = QLabel(_(''), self)
+            key_label.setAlignment(Qt.AlignHCenter)
+            data_group_box_layout.addWidget(key_label)
+            self.button_box.accepted.connect(self.accept)
+        else:
+            default_key_error = QLabel(u"The default encryption key for Kindle for Mac/PC could not be found.", self)
+            default_key_error.setAlignment(Qt.AlignHCenter)
+            layout.addWidget(default_key_error)
+            # if no default, bot buttons do the same
+            self.button_box.accepted.connect(self.reject)
+
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return self.default_key
+
+
+    def accept(self):
+        if len(self.key_name) == 0 or self.key_name.isspace():
+            errmsg = u"All fields are required!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) < 4:
+            errmsg = u"Key name must be at <i>least</i> 4 characters long!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+
+class AddSerialDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Add New EInk Kindle Serial Number".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox(u"", self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"EInk Kindle Serial Number:", self))
+        self.key_ledit = QLineEdit("", self)
+        self.key_ledit.setToolTip(u"Enter an eInk Kindle serial number. EInk Kindle serial numbers are 16 characters long and usually start with a 'B' or a '9'. Kindle Serial Numbers are case-sensitive, so be sure to enter the upper and lower case letters unchanged.")
+        key_group.addWidget(self.key_ledit)
+        key_label = QLabel(_(''), self)
+        key_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(key_label)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    def accept(self):
+        if len(self.key_name) == 0 or self.key_name.isspace():
+            errmsg = u"Please enter an eInk Kindle Serial Number or click Cancel in the dialog."
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) != 16:
+            errmsg = u"EInk Kindle Serial Numbers must be 16 characters long. This is {0:d} characters long.".format(len(self.key_name))
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+
+class AddPIDDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Add New Mobipocket PID".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox(u"", self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"PID:", self))
+        self.key_ledit = QLineEdit("", self)
+        self.key_ledit.setToolTip(u"Enter a Mobipocket PID. Mobipocket PIDs are 8 or 10 characters long. Mobipocket PIDs are case-sensitive, so be sure to enter the upper and lower case letters unchanged.")
+        key_group.addWidget(self.key_ledit)
+        key_label = QLabel(_(''), self)
+        key_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(key_label)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    def accept(self):
+        if len(self.key_name) == 0 or self.key_name.isspace():
+            errmsg = u"Please enter a Mobipocket PID or click Cancel in the dialog."
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) != 8 and len(self.key_name) != 10:
+            errmsg = u"Mobipocket PIDs must be 8 or 10 characters long. This is {0:d} characters long.".format(len(self.key_name))
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ignoblekey.py

@@ -0,0 +1,335 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+# ignoblekey.py
+# Copyright © 2015 Apprentice Alf
+
+# Based on kindlekey.py, Copyright © 2010-2013 by some_updates and Apprentice Alf
+
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
+
+# Revision history:
+#   1.0 - Initial release
+
+"""
+Get Barnes & Noble EPUB user key from nook Studio log file
+"""
+
+__license__ = 'GPL v3'
+__version__ = "1.0"
+
+import sys
+import os
+import hashlib
+import getopt
+import re
+
+# Wrap a stream so that output gets flushed immediately
+# and also make sure that any unicode strings get
+# encoded using "replace" before writing them.
+class SafeUnbuffered:
+    def __init__(self, stream):
+        self.stream = stream
+        self.encoding = stream.encoding
+        if self.encoding == None:
+            self.encoding = "utf-8"
+    def write(self, data):
+        if isinstance(data,unicode):
+            data = data.encode(self.encoding,"replace")
+        self.stream.write(data)
+        self.stream.flush()
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.  So use shell32.GetCommandLineArgvW to get sys.argv
+        # as a list of Unicode strings and encode them as utf-8
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"ignoblekey.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+class DrmException(Exception):
+    pass
+
+# Locate all of the nookStudy/nook for PC/Mac log file and return as list
+def getNookLogFiles():
+    logFiles = []
+    found = False
+    if iswindows:
+        import _winreg as winreg
+
+        # some 64 bit machines do not have the proper registry key for some reason
+        # or the python interface to the 32 vs 64 bit registry is broken
+        paths = set()
+        if 'LOCALAPPDATA' in os.environ.keys():
+            # Python 2.x does not return unicode env. Use Python 3.x
+            path = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
+            if os.path.isdir(path):
+                paths.add(path)
+        if 'USERPROFILE' in os.environ.keys():
+            # Python 2.x does not return unicode env. Use Python 3.x
+            path = winreg.ExpandEnvironmentStrings(u"%USERPROFILE%")+u"\\AppData\\Local"
+            if os.path.isdir(path):
+                paths.add(path)
+            path = winreg.ExpandEnvironmentStrings(u"%USERPROFILE%")+u"\\AppData\\Roaming"
+            if os.path.isdir(path):
+                paths.add(path)
+        # User Shell Folders show take precedent over Shell Folders if present
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+ 
+        for path in paths:
+            # look for nookStudy log file
+            logpath = path +'\\Barnes & Noble\\NOOKstudy\\logs\\BNClientLog.txt'
+            if os.path.isfile(logpath):
+                found = True
+                print('Found nookStudy log file: ' + logpath.encode('ascii','ignore'))
+                logFiles.append(logpath)
+    else:
+        home = os.getenv('HOME')
+        # check for BNClientLog.txt in various locations
+        testpath = home + '/Library/Application Support/Barnes & Noble/DesktopReader/logs/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/DesktopReader/indices/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/BNDesktopReader/logs/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/BNDesktopReader/indices/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+
+    if not found:
+        print('No nook Study log files have been found.')
+    return logFiles
+
+
+# Extract CCHash key(s) from log file
+def getKeysFromLog(kLogFile):
+    keys = []
+    regex = re.compile("ccHash: \"(.{28})\"");
+    for line in open(kLogFile):
+        for m in regex.findall(line):
+            keys.append(m)
+    return keys
+
+# interface for calibre plugin
+def nookkeys(files = []):
+    keys = []
+    if files == []:
+        files = getNookLogFiles()
+    for file in files:
+        fileKeys = getKeysFromLog(file)
+        if fileKeys:
+            print u"Found {0} keys in the Nook Study log files".format(len(fileKeys))
+            keys.extend(fileKeys)
+    return keys
+
+# interface for Python DeDRM
+# returns single key or multiple keys, depending on path or file passed in
+def getkey(outpath, files=[]):
+    keys = nookkeys(files)
+    if len(keys) > 0:
+        if not os.path.isdir(outpath):
+            outfile = outpath
+            with file(outfile, 'w') as keyfileout:
+                keyfileout.write(keys[0])
+            print u"Saved a key to {0}".format(outfile)
+        else:
+            keycount = 0
+            for key in keys:
+                while True:
+                    keycount += 1
+                    outfile = os.path.join(outpath,u"nookkey{0:d}.b64".format(keycount))
+                    if not os.path.exists(outfile):
+                        break
+                with file(outfile, 'w') as keyfileout:
+                    keyfileout.write(key)
+                print u"Saved a key to {0}".format(outfile)
+        return True
+    return False
+
+def usage(progname):
+    print u"Finds the nook Study encryption keys."
+    print u"Keys are saved to the current directory, or a specified output directory."
+    print u"If a file name is passed instead of a directory, only the first key is saved, in that file."
+    print u"Usage:"
+    print u"    {0:s} [-h] [-k <logFile>] [<outpath>]".format(progname)
+
+
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
+    progname = os.path.basename(argv[0])
+    print u"{0} v{1}\nCopyright © 2015 Apprentice Alf".format(progname,__version__)
+
+    try:
+        opts, args = getopt.getopt(argv[1:], "hk:")
+    except getopt.GetoptError, err:
+        print u"Error in options or arguments: {0}".format(err.args[0])
+        usage(progname)
+        sys.exit(2)
+
+    files = []
+    for o, a in opts:
+        if o == "-h":
+            usage(progname)
+            sys.exit(0)
+        if o == "-k":
+            files = [a]
+
+    if len(args) > 1:
+        usage(progname)
+        sys.exit(2)
+
+    if len(args) == 1:
+        # save to the specified file or directory
+        outpath = args[0]
+        if not os.path.isabs(outpath):
+           outpath = os.path.abspath(outpath)
+    else:
+        # save to the same directory as the script
+        outpath = os.path.dirname(argv[0])
+
+    # make sure the outpath is the
+    outpath = os.path.realpath(os.path.normpath(outpath))
+
+    if not getkey(outpath, files):
+        print u"Could not retrieve nook Study key."
+    return 0
+
+
+def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import traceback
+    except:
+        return cli_main()
+
+    class ExceptionDialog(Tkinter.Frame):
+        def __init__(self, root, text):
+            Tkinter.Frame.__init__(self, root, border=5)
+            label = Tkinter.Label(self, text=u"Unexpected error:",
+                                  anchor=Tkconstants.W, justify=Tkconstants.LEFT)
+            label.pack(fill=Tkconstants.X, expand=0)
+            self.text = Tkinter.Text(self)
+            self.text.pack(fill=Tkconstants.BOTH, expand=1)
+
+            self.text.insert(Tkconstants.END, text)
+
+
+    argv=unicode_argv()
+    root = Tkinter.Tk()
+    root.withdraw()
+    progpath, progname = os.path.split(argv[0])
+    success = False
+    try:
+        keys = nookkeys()
+        keycount = 0
+        for key in keys:
+            print key
+            while True:
+                keycount += 1
+                outfile = os.path.join(progpath,u"nookkey{0:d}.b64".format(keycount))
+                if not os.path.exists(outfile):
+                    break
+
+            with file(outfile, 'w') as keyfileout:
+                keyfileout.write(key)
+            success = True
+            tkMessageBox.showinfo(progname, u"Key successfully retrieved to {0}".format(outfile))
+    except DrmException, e:
+        tkMessageBox.showerror(progname, u"Error: {0}".format(str(e)))
+    except Exception:
+        root.wm_state('normal')
+        root.title(progname)
+        text = traceback.format_exc()
+        ExceptionDialog(root, text).pack(fill=Tkconstants.BOTH, expand=1)
+        root.mainloop()
+    if not success:
+        return 1
+    return 0
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        sys.exit(cli_main())
+    sys.exit(gui_main())

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptepub.py

@@ -37,13 +37,14 @@ from __future__ import with_statement
 #   5.9 - Fixed to retain zip file metadata (e.g. file modification date)
 #   6.0 - moved unicode_argv call inside main for Windows DeDRM compatibility
 #   6.1 - Work if TkInter is missing
+#   6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis
 
 """
 Decrypt Adobe Digital Editions encrypted ePub books.
 """
 
 __license__ = 'GPL v3'
-__version__ = "6.1"
+__version__ = "6.2"
 
 import sys
 import os
@@ -366,7 +367,7 @@ class Decryptor(object):
         return bytes
 
     def decrypt(self, path, data):
-        if path in self._encrypted:
+        if path.encode('utf-8') in self._encrypted:
             data = self._aes.decrypt(data)[16:]
             data = data[:-ord(data[-1])]
             data = self.decompress(data)

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/scrolltextwidget.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+import Tkinter
+import Tkconstants
+
+# basic scrolled text widget
+class ScrolledText(Tkinter.Text):
+    def __init__(self, master=None, **kw):
+        self.frame = Tkinter.Frame(master)
+        self.vbar = Tkinter.Scrollbar(self.frame)
+        self.vbar.pack(side=Tkconstants.RIGHT, fill=Tkconstants.Y)
+        kw.update({'yscrollcommand': self.vbar.set})
+        Tkinter.Text.__init__(self, self.frame, **kw)
+        self.pack(side=Tkconstants.LEFT, fill=Tkconstants.BOTH, expand=True)
+        self.vbar['command'] = self.yview
+        # Copy geometry methods of self.frame without overriding Text
+        # methods = hack!
+        text_meths = vars(Tkinter.Text).keys()
+        methods = vars(Tkinter.Pack).keys() + vars(Tkinter.Grid).keys() + vars(Tkinter.Place).keys()
+        methods = set(methods).difference(text_meths)
+        for m in methods:
+            if m[0] != '_' and m != 'config' and m != 'configure':
+                setattr(self, m, getattr(self.frame, m))
+
+    def __str__(self):
+        return str(self.frame)

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/simpleprefs.py

@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+import sys
+import os, os.path
+import shutil
+
+class SimplePrefsError(Exception):
+    pass
+
+class SimplePrefs(object):
+    def __init__(self, target, description):
+        self.prefs = {}
+        self.key2file={}
+        self.file2key={}
+        for keyfilemap in description:
+            [key, filename] = keyfilemap
+            self.key2file[key] = filename
+            self.file2key[filename] = key
+        self.target = target + 'Prefs'
+        if sys.platform.startswith('win'):
+            import _winreg as winreg
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            prefdir = path + os.sep + self.target
+        elif sys.platform.startswith('darwin'):
+            home = os.getenv('HOME')
+            prefdir = os.path.join(home,'Library','Preferences','org.' + self.target)
+        else:
+            # linux and various flavors of unix
+            home = os.getenv('HOME')
+            prefdir = os.path.join(home,'.' + self.target)
+        if not os.path.exists(prefdir):
+            os.makedirs(prefdir)
+        self.prefdir = prefdir
+        self.prefs['dir'] = self.prefdir
+        self._loadPreferences()
+
+    def _loadPreferences(self):
+        filenames = os.listdir(self.prefdir)
+        for filename in filenames:
+            if filename in self.file2key:
+                key = self.file2key[filename]
+                filepath = os.path.join(self.prefdir,filename)
+                if os.path.isfile(filepath):
+                    try :
+                        data = file(filepath,'rb').read()
+                        self.prefs[key] = data
+                    except Exception, e:
+                        pass
+
+    def getPreferences(self):
+        return self.prefs
+
+    def setPreferences(self, newprefs={}):
+        if 'dir' not in newprefs:
+            raise SimplePrefsError('Error: Attempt to Set Preferences in unspecified directory')
+        if newprefs['dir'] != self.prefs['dir']:
+            raise SimplePrefsError('Error: Attempt to Set Preferences in unspecified directory')
+        for key in newprefs:
+            if key != 'dir':
+                if key in self.key2file:
+                    filename = self.key2file[key]
+                    filepath = os.path.join(self.prefdir,filename)
+                    data = newprefs[key]
+                    if data != None:
+                        data = str(data)
+                    if data == None or data == '':
+                        if os.path.exists(filepath):
+                            os.remove(filepath)
+                    else:
+                        try:
+                            file(filepath,'wb').write(data)
+                        except Exception, e:
+                            pass
+        self.prefs = newprefs
+        return

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/subasyncio.py

@@ -0,0 +1,148 @@
+#!/usr/bin/env python
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+import os, sys
+import signal
+import threading
+import subprocess
+from subprocess import Popen, PIPE, STDOUT
+
+# **heavily** chopped up and modfied version of asyncproc.py
+# to make it actually work on Windows as well as Mac/Linux
+# For the original see:
+# "http://www.lysator.liu.se/~bellman/download/"
+# author is  "Thomas Bellman <bellman@lysator.liu.se>"
+# available under GPL version 3 or Later
+
+# create an asynchronous subprocess whose output can be collected in
+# a non-blocking manner
+
+# What a mess!  Have to use threads just to get non-blocking io
+# in a cross-platform manner
+
+# luckily all thread use is hidden within this class
+
+class Process(object):
+    def __init__(self, *params, **kwparams):
+        if len(params) <= 3:
+            kwparams.setdefault('stdin', subprocess.PIPE)
+        if len(params) <= 4:
+            kwparams.setdefault('stdout', subprocess.PIPE)
+        if len(params) <= 5:
+            kwparams.setdefault('stderr', subprocess.PIPE)
+        self.__pending_input = []
+        self.__collected_outdata = []
+        self.__collected_errdata = []
+        self.__exitstatus = None
+        self.__lock = threading.Lock()
+        self.__inputsem = threading.Semaphore(0)
+        self.__quit = False
+
+        self.__process = subprocess.Popen(*params, **kwparams)
+
+        if self.__process.stdin:
+            self.__stdin_thread = threading.Thread(
+                name="stdin-thread",
+                target=self.__feeder, args=(self.__pending_input,
+                                            self.__process.stdin))
+            self.__stdin_thread.setDaemon(True)
+            self.__stdin_thread.start()
+
+        if self.__process.stdout:
+            self.__stdout_thread = threading.Thread(
+                name="stdout-thread",
+                target=self.__reader, args=(self.__collected_outdata,
+                                            self.__process.stdout))
+            self.__stdout_thread.setDaemon(True)
+            self.__stdout_thread.start()
+
+        if self.__process.stderr:
+            self.__stderr_thread = threading.Thread(
+                name="stderr-thread",
+                target=self.__reader, args=(self.__collected_errdata,
+                                            self.__process.stderr))
+            self.__stderr_thread.setDaemon(True)
+            self.__stderr_thread.start()
+
+    def pid(self):
+        return self.__process.pid
+
+    def kill(self, signal):
+        self.__process.send_signal(signal)
+
+    # check on subprocess (pass in 'nowait') to act like poll
+    def wait(self, flag):
+        if flag.lower() == 'nowait':
+            rc = self.__process.poll()
+        else:
+            rc = self.__process.wait()
+        if rc != None:
+            if self.__process.stdin:
+                self.closeinput()
+            if self.__process.stdout:
+                self.__stdout_thread.join()
+            if self.__process.stderr:
+                self.__stderr_thread.join()
+        return self.__process.returncode
+
+    def terminate(self):
+        if self.__process.stdin:
+            self.closeinput()
+        self.__process.terminate()
+
+    # thread gets data from subprocess stdout
+    def __reader(self, collector, source):
+        while True:
+            data = os.read(source.fileno(), 65536)
+            self.__lock.acquire()
+            collector.append(data)
+            self.__lock.release()
+            if data == "":
+                source.close()
+                break
+        return
+
+    # thread feeds data to subprocess stdin
+    def __feeder(self, pending, drain):
+        while True:
+            self.__inputsem.acquire()
+            self.__lock.acquire()
+            if not pending  and self.__quit:
+                drain.close()
+                self.__lock.release()
+                break
+            data = pending.pop(0)
+            self.__lock.release()
+            drain.write(data)
+
+    # non-blocking read of data from subprocess stdout
+    def read(self):
+        self.__lock.acquire()
+        outdata = "".join(self.__collected_outdata)
+        del self.__collected_outdata[:]
+        self.__lock.release()
+        return outdata
+
+    # non-blocking read of data from subprocess stderr
+    def readerr(self):
+        self.__lock.acquire()
+        errdata = "".join(self.__collected_errdata)
+        del self.__collected_errdata[:]
+        self.__lock.release()
+        return errdata
+
+    # non-blocking write to stdin of subprocess
+    def write(self, data):
+        if self.__process.stdin is None:
+            raise ValueError("Writing to process with stdin not a pipe")
+        self.__lock.acquire()
+        self.__pending_input.append(data)
+        self.__inputsem.release()
+        self.__lock.release()
+
+    # close stdinput of subprocess
+    def closeinput(self):
+        self.__lock.acquire()
+        self.__quit = True
+        self.__inputsem.release()
+        self.__lock.release()

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw.bak

@@ -0,0 +1,635 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# DeDRM.pyw, version 6.0.1
+# Copyright 2010-2013 some_updates and Apprentice Alf
+
+# Revision history:
+#   6.0.0 - Release along with unified plugin
+#   6.0.1 - Bug Fixes for Windows App
+#   6.0.2 - Fixed problem with spaces in paths and the bat file
+#   6.0.3 - Fix for Windows non-ascii user names
+#   6.0.4 - Fix for other potential unicode problems
+#   6.0.5 - Fix typo
+#   6.2.0 - Update to match plugin and AppleScript
+
+__version__ = '6.2.0'
+
+import sys
+import os, os.path
+sys.path.append(os.path.join(sys.path[0],"lib"))
+import sys, os
+import codecs
+
+from argv_utils import add_cp65001_codec, set_utf8_default_encoding, unicode_argv
+add_cp65001_codec()
+set_utf8_default_encoding()
+
+
+import shutil
+import Tkinter
+from Tkinter import *
+import Tkconstants
+import tkFileDialog
+from scrolltextwidget import ScrolledText
+from activitybar import ActivityBar
+if sys.platform.startswith("win"):
+    from askfolder_ed import AskFolder
+import re
+import simpleprefs
+import traceback
+
+from Queue import Full
+from Queue import Empty
+from multiprocessing import Process, Queue
+
+from scriptinterface import decryptepub, decryptpdb, decryptpdf, decryptk4mobi
+
+
+# Wrap a stream so that output gets flushed immediately
+# and appended to shared queue
+class QueuedUTF8Stream:
+    def __init__(self, stream, q):
+        self.stream = stream
+        self.encoding = 'utf-8'
+        self.q = q
+    def write(self, data):
+        if isinstance(data,unicode):
+            data = data.encode('utf-8',"replace")
+        self.q.put(data)
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
+
+class DrmException(Exception):
+    pass
+
+class MainApp(Tk):
+    def __init__(self, apphome, dnd=False, filenames=[]):
+        Tk.__init__(self)
+        self.withdraw()
+        self.dnd = dnd
+        self.apphome = apphome
+
+        # preference settings
+        # [dictionary key, file in preferences directory where info is stored]
+        description = [ ['pids'   , 'pidlist.txt'   ],
+                        ['serials', 'seriallist.txt'],
+                        ['sdrms'  , 'sdrmlist.txt'  ],
+                        ['outdir' , 'outdir.txt'    ]]
+        self.po = simpleprefs.SimplePrefs("DeDRM",description)
+        if self.dnd:
+            self.cd = ConvDialog(self)
+            prefs = self.getPreferences()
+            self.cd.doit(prefs, filenames)
+        else:
+            prefs = self.getPreferences()
+            self.pd = PrefsDialog(self, prefs)
+            self.cd = ConvDialog(self)
+            self.pd.show()
+
+    def getPreferences(self):
+        prefs = self.po.getPreferences()
+        prefdir = prefs['dir']
+        adeptkeyfile = os.path.join(prefdir,'adeptkey.der')
+        if not os.path.exists(adeptkeyfile):
+            import adobekey
+            try:
+                adobekey.getkey(adeptkeyfile)
+            except:
+                pass
+        kindlekeyfile = os.path.join(prefdir,'kindlekey.k4i')
+        if not os.path.exists(kindlekeyfile):
+            import kindlekey
+            try:
+                kindlekey.getkey(kindlekeyfile)
+            except:
+                traceback.print_exc()
+                pass
+        bnepubkeyfile = os.path.join(prefdir,'bnepubkey.b64')
+        if not os.path.exists(bnepubkeyfile):
+            import ignoblekey
+            try:
+                ignoblekey.getkey(bnepubkeyfile)
+            except:
+                traceback.print_exc()
+                pass
+        return prefs
+
+    def setPreferences(self, newprefs):
+        prefdir = self.po.prefdir
+        if 'adkfile' in newprefs:
+            dfile = newprefs['adkfile']
+            fname = os.path.basename(dfile)
+            nfile = os.path.join(prefdir,fname)
+            if os.path.isfile(dfile):
+                shutil.copyfile(dfile,nfile)
+        if 'bnkfile' in newprefs:
+            dfile = newprefs['bnkfile']
+            fname = os.path.basename(dfile)
+            nfile = os.path.join(prefdir,fname)
+            if os.path.isfile(dfile):
+                shutil.copyfile(dfile,nfile)
+        if 'kinfofile' in newprefs:
+            dfile = newprefs['kinfofile']
+            fname = os.path.basename(dfile)
+            nfile = os.path.join(prefdir,fname)
+            if os.path.isfile(dfile):
+                shutil.copyfile(dfile,nfile)
+        self.po.setPreferences(newprefs)
+        return
+
+    def alldone(self):
+        if not self.dnd:
+            self.pd.enablebuttons()
+        else:
+            self.destroy()
+
+class PrefsDialog(Toplevel):
+    def __init__(self, mainapp, prefs_array):
+        Toplevel.__init__(self, mainapp)
+        self.withdraw()
+        self.protocol("WM_DELETE_WINDOW", self.withdraw)
+        self.title("DeDRM " + __version__)
+        self.prefs_array = prefs_array
+        self.status = Tkinter.Label(self, text='Setting Preferences')
+        self.status.pack(fill=Tkconstants.X, expand=1)
+        body = Tkinter.Frame(self)
+        self.body = body
+        body.pack(fill=Tkconstants.X, expand=1)
+        sticky = Tkconstants.E + Tkconstants.W
+        body.grid_columnconfigure(1, weight=2)
+
+        Tkinter.Label(body, text='Adobe Key file (adeptkey.der)').grid(row=0, sticky=Tkconstants.E)
+        self.adkpath = Tkinter.Entry(body, width=50)
+        self.adkpath.grid(row=0, column=1, sticky=sticky)
+        prefdir = self.prefs_array['dir']
+        keyfile = os.path.join(prefdir,'adeptkey.der')
+        if os.path.isfile(keyfile):
+            path = keyfile
+            self.adkpath.insert(0, path)
+        button = Tkinter.Button(body, text="...", command=self.get_adkpath)
+        button.grid(row=0, column=2)
+
+        Tkinter.Label(body, text='Kindle Key file (kindlekey.k4i)').grid(row=1, sticky=Tkconstants.E)
+        self.kkpath = Tkinter.Entry(body, width=50)
+        self.kkpath.grid(row=1, column=1, sticky=sticky)
+        prefdir = self.prefs_array['dir']
+        keyfile = os.path.join(prefdir,'kindlekey.k4i')
+        if os.path.isfile(keyfile):
+            path = keyfile
+            self.kkpath.insert(1, path)
+        button = Tkinter.Button(body, text="...", command=self.get_kkpath)
+        button.grid(row=1, column=2)
+
+        Tkinter.Label(body, text='Barnes and Noble Key file (bnepubkey.b64)').grid(row=2, sticky=Tkconstants.E)
+        self.bnkpath = Tkinter.Entry(body, width=50)
+        self.bnkpath.grid(row=2, column=1, sticky=sticky)
+        prefdir = self.prefs_array['dir']
+        keyfile = os.path.join(prefdir,'bnepubkey.b64')
+        if os.path.isfile(keyfile):
+            path = keyfile
+            self.bnkpath.insert(2, path)
+        button = Tkinter.Button(body, text="...", command=self.get_bnkpath)
+        button.grid(row=2, column=2)
+
+        Tkinter.Label(body, text='Mobipocket PID list\n(8 or 10 characters, comma separated)').grid(row=3, sticky=Tkconstants.E)
+        self.pidnums = Tkinter.StringVar()
+        self.pidinfo = Tkinter.Entry(body, width=50, textvariable=self.pidnums)
+        if 'pids' in self.prefs_array:
+            self.pidnums.set(self.prefs_array['pids'])
+        self.pidinfo.grid(row=3, column=1, sticky=sticky)
+
+        Tkinter.Label(body, text='eInk Kindle Serial Number list\n(16 characters, comma separated)').grid(row=4, sticky=Tkconstants.E)
+        self.sernums = Tkinter.StringVar()
+        self.serinfo = Tkinter.Entry(body, width=50, textvariable=self.sernums)
+        if 'serials' in self.prefs_array:
+            self.sernums.set(self.prefs_array['serials'])
+        self.serinfo.grid(row=4, column=1, sticky=sticky)
+
+        Tkinter.Label(body, text='eReader data list\n(name:last 8 digits on credit card, comma separated)').grid(row=5, sticky=Tkconstants.E)
+        self.sdrmnums = Tkinter.StringVar()
+        self.sdrminfo = Tkinter.Entry(body, width=50, textvariable=self.sdrmnums)
+        if 'sdrms' in self.prefs_array:
+            self.sdrmnums.set(self.prefs_array['sdrms'])
+        self.sdrminfo.grid(row=5, column=1, sticky=sticky)
+
+        Tkinter.Label(body, text="Output Folder (if blank, use input ebook's folder)").grid(row=6, sticky=Tkconstants.E)
+        self.outpath = Tkinter.Entry(body, width=50)
+        self.outpath.grid(row=6, column=1, sticky=sticky)
+        if 'outdir' in self.prefs_array:
+            dpath = self.prefs_array['outdir']
+            self.outpath.insert(0, dpath)
+        button = Tkinter.Button(body, text="...", command=self.get_outpath)
+        button.grid(row=6, column=2)
+
+        Tkinter.Label(body, text='').grid(row=7, column=0, columnspan=2, sticky=Tkconstants.N)
+
+        Tkinter.Label(body, text='Alternatively Process an eBook').grid(row=8, column=0, columnspan=2, sticky=Tkconstants.N)
+
+        Tkinter.Label(body, text='Select an eBook to Process*').grid(row=9, sticky=Tkconstants.E)
+        self.bookpath = Tkinter.Entry(body, width=50)
+        self.bookpath.grid(row=9, column=1, sticky=sticky)
+        button = Tkinter.Button(body, text="...", command=self.get_bookpath)
+        button.grid(row=9, column=2)
+
+        Tkinter.Label(body, font=("Helvetica", "10", "italic"), text='*To DeDRM multiple ebooks simultaneously, set your preferences and quit.\nThen drag and drop ebooks or folders onto the DeDRM_Drop_Target').grid(row=10, column=1, sticky=Tkconstants.E)
+
+        Tkinter.Label(body, text='').grid(row=11, column=0, columnspan=2, sticky=Tkconstants.E)
+
+        buttons = Tkinter.Frame(self)
+        buttons.pack()
+        self.sbotton = Tkinter.Button(buttons, text="Set Prefs", width=14, command=self.setprefs)
+        self.sbotton.pack(side=Tkconstants.LEFT)
+
+        buttons.pack()
+        self.pbotton = Tkinter.Button(buttons, text="Process eBook", width=14, command=self.doit)
+        self.pbotton.pack(side=Tkconstants.LEFT)
+        buttons.pack()
+        self.qbotton = Tkinter.Button(buttons, text="Quit", width=14, command=self.quitting)
+        self.qbotton.pack(side=Tkconstants.RIGHT)
+        buttons.pack()
+
+    def disablebuttons(self):
+        self.sbotton.configure(state='disabled')
+        self.pbotton.configure(state='disabled')
+        self.qbotton.configure(state='disabled')
+
+    def enablebuttons(self):
+        self.sbotton.configure(state='normal')
+        self.pbotton.configure(state='normal')
+        self.qbotton.configure(state='normal')
+
+    def show(self):
+        self.deiconify()
+        self.tkraise()
+
+    def hide(self):
+        self.withdraw()
+
+    def get_outpath(self):
+        cpath = self.outpath.get()
+        if sys.platform.startswith("win"):
+            # tk_chooseDirectory is horribly broken for unicode paths
+            # on windows - bug has been reported but not fixed for years
+            # workaround by using our own unicode aware version
+            outpath = AskFolder(message="Choose the folder for DRM-free ebooks",
+                defaultLocation=cpath)
+        else:
+            outpath = tkFileDialog.askdirectory(
+                parent=None, title='Choose the folder for DRM-free ebooks',
+                initialdir=cpath, initialfile=None)
+        if outpath:
+            outpath = os.path.normpath(outpath)
+            self.outpath.delete(0, Tkconstants.END)
+            self.outpath.insert(0, outpath)
+        return
+
+    def get_adkpath(self):
+        cpath = self.adkpath.get()
+        adkpath = tkFileDialog.askopenfilename(initialdir = cpath, parent=None, title='Select Adept Key file',
+            defaultextension='.der', filetypes=[('Adept Key file', '.der'), ('All Files', '.*')])
+        if adkpath:
+            adkpath = os.path.normpath(adkpath)
+            self.adkpath.delete(0, Tkconstants.END)
+            self.adkpath.insert(0, adkpath)
+        return
+
+    def get_kkpath(self):
+        cpath = self.kkpath.get()
+        kkpath = tkFileDialog.askopenfilename(initialdir = cpath, parent=None, title='Select Kindle Key file',
+            defaultextension='.k4i', filetypes=[('Kindle Key file', '.k4i'), ('All Files', '.*')])
+        if kkpath:
+            kkpath = os.path.normpath(kkpath)
+            self.kkpath.delete(0, Tkconstants.END)
+            self.kkpath.insert(0, kkpath)
+        return
+
+    def get_bnkpath(self):
+        cpath = self.bnkpath.get()
+        bnkpath = tkFileDialog.askopenfilename(initialdir = cpath, parent=None, title='Select Barnes and Noble Key file',
+            defaultextension='.b64', filetypes=[('Barnes and Noble Key file', '.b64'), ('All Files', '.*')])
+        if bnkpath:
+            bnkpath = os.path.normpath(bnkpath)
+            self.bnkpath.delete(0, Tkconstants.END)
+            self.bnkpath.insert(0, bnkpath)
+        return
+
+    def get_bookpath(self):
+        cpath = self.bookpath.get()
+        bookpath = tkFileDialog.askopenfilename(parent=None, title='Select eBook for DRM Removal',
+            filetypes=[('All Files', '.*'),
+                    ('ePub Files','.epub'),
+                    ('Kindle','.azw'),
+                    ('Kindle','.azw1'),
+                    ('Kindle','.azw3'),
+                    ('Kindle','.azw4'),
+                    ('Kindle','.tpz'),
+                    ('Kindle','.mobi'),
+                    ('Kindle','.prc'),
+                    ('eReader','.pdb'),
+                    ('PDF','.pdf')],
+            initialdir=cpath)
+        if bookpath:
+            bookpath = os.path.normpath(bookpath)
+            self.bookpath.delete(0, Tkconstants.END)
+            self.bookpath.insert(0, bookpath)
+        return
+
+    def quitting(self):
+        self.master.destroy()
+
+    def setprefs(self):
+        # setting new prefereces
+        new_prefs = {}
+        prefdir = self.prefs_array['dir']
+        new_prefs['dir'] = prefdir
+        new_prefs['pids'] = self.pidinfo.get().replace(" ","")
+        new_prefs['serials'] = self.serinfo.get().replace(" ","")
+        new_prefs['sdrms'] = self.sdrminfo.get().strip().replace(", ",",")
+        new_prefs['outdir'] = self.outpath.get().strip()
+        adkpath = self.adkpath.get()
+        if os.path.dirname(adkpath) != prefdir:
+            new_prefs['adkfile'] = adkpath
+        bnkpath = self.bnkpath.get()
+        if os.path.dirname(bnkpath) != prefdir:
+            new_prefs['bnkfile'] = bnkpath
+        kkpath = self.kkpath.get()
+        if os.path.dirname(kkpath) != prefdir:
+            new_prefs['kindlefile'] = kkpath
+        self.master.setPreferences(new_prefs)
+        # and update internal copies
+        self.prefs_array['pids'] = new_prefs['pids']
+        self.prefs_array['serials'] = new_prefs['serials']
+        self.prefs_array['sdrms'] = new_prefs['sdrms']
+        self.prefs_array['outdir'] = new_prefs['outdir']
+
+    def doit(self):
+        self.disablebuttons()
+        filenames=[]
+        bookpath = self.bookpath.get()
+        bookpath = os.path.abspath(bookpath)
+        filenames.append(bookpath)
+        self.master.cd.doit(self.prefs_array,filenames)
+
+
+
+class ConvDialog(Toplevel):
+    def __init__(self, master, prefs_array={}, filenames=[]):
+        Toplevel.__init__(self, master)
+        self.withdraw()
+        self.protocol("WM_DELETE_WINDOW", self.withdraw)
+        self.title("DeDRM Processing")
+        self.master = master
+        self.apphome = self.master.apphome
+        self.prefs_array = prefs_array
+        self.filenames = filenames
+        self.interval = 50
+        self.p2 = None
+        self.q = Queue()
+        self.running = 'inactive'
+        self.numgood = 0
+        self.numbad = 0
+        self.status = Tkinter.Label(self, text='DeDRM processing...')
+        self.status.pack(fill=Tkconstants.X, expand=1)
+        body = Tkinter.Frame(self)
+        body.pack(fill=Tkconstants.X, expand=1)
+        sticky = Tkconstants.E + Tkconstants.W
+        body.grid_columnconfigure(1, weight=2)
+
+        Tkinter.Label(body, text='Activity Bar').grid(row=0, sticky=Tkconstants.E)
+        self.bar = ActivityBar(body, length=80, height=15, barwidth=5)
+        self.bar.grid(row=0, column=1, sticky=sticky)
+
+        msg1 = ''
+        self.stext = ScrolledText(body, bd=5, relief=Tkconstants.RIDGE, height=4, width=80, wrap=Tkconstants.WORD)
+        self.stext.grid(row=2, column=0, columnspan=2,sticky=sticky)
+        self.stext.insert(Tkconstants.END,msg1)
+
+        buttons = Tkinter.Frame(self)
+        buttons.pack()
+        self.qbutton = Tkinter.Button(buttons, text="Quit", width=14, command=self.quitting)
+        self.qbutton.pack(side=Tkconstants.BOTTOM)
+        self.status['text'] = ''
+
+        self.logfile = open(os.path.join(os.path.expanduser('~'),'DeDRM.log'),'w')
+
+    def show(self):
+        self.deiconify()
+        self.tkraise()
+
+    def hide(self):
+        self.withdraw()
+
+    def doit(self, prefs, filenames):
+        self.running = 'inactive'
+        self.prefs_array = prefs
+        self.filenames = filenames
+        self.show()
+        self.processBooks()
+
+    def conversion_done(self):
+        self.hide()
+        self.master.alldone()
+
+    def processBooks(self):
+        while self.running == 'inactive':
+            rscpath = self.prefs_array['dir']
+            filename = None
+            if len(self.filenames) > 0:
+                filename = self.filenames.pop(0)
+            if filename == None:
+                msg = 'Complete:  '
+                msg += 'Successes: %d, ' % self.numgood
+                msg += 'Failures: %d\n' % self.numbad
+                self.showCmdOutput(msg)
+                if self.numbad == 0:
+                    self.after(2000,self.conversion_done())
+                self.logfile.write("DeDRM v{0}: {1}".format(__version__,msg))
+                self.logfile.close()
+                return
+            infile = filename
+            bname = os.path.basename(infile)
+            msg = 'Processing: ' + bname + '...'
+            self.logfile.write("DeDRM v{0}: {1}\n".format(__version__,msg))
+            self.showCmdOutput(msg)
+            outdir = os.path.dirname(filename)
+            if 'outdir' in self.prefs_array:
+                dpath = self.prefs_array['outdir']
+                if dpath.strip() != '':
+                    outdir = dpath
+            rv = self.decrypt_ebook(infile, outdir, rscpath)
+            if rv == 0:
+                self.bar.start()
+                self.running = 'active'
+                self.processQueue()
+            else:
+                msg = 'Unknown File: ' + bname + '\n'
+                self.logfile.write("DeDRM v{0}: {1}".format(__version__,msg))
+                self.showCmdOutput(msg)
+                self.numbad += 1
+
+    def quitting(self):
+        # kill any still running subprocess
+        self.running = 'stopped'
+        if self.p2 != None:
+            if (self.p2.exitcode == None):
+                self.p2.terminate()
+        self.conversion_done()
+
+    # post output from subprocess in scrolled text widget
+    def showCmdOutput(self, msg):
+        if msg and msg !='':
+            if sys.platform.startswith('win'):
+                msg = msg.replace('\r\n','\n')
+            self.stext.insert(Tkconstants.END,msg)
+            self.stext.yview_pickplace(Tkconstants.END)
+        return
+
+    # read from subprocess pipe without blocking
+    # invoked every interval via the widget "after"
+    # option being used, so need to reset it for the next time
+    def processQueue(self):
+        if self.p2 == None:
+            # nothing to wait for so just return
+            return
+        poll = self.p2.exitcode
+        #print "processing", poll
+        done = False
+        text = ''
+        while not done:
+            try:
+                data = self.q.get_nowait()
+                text += data
+            except Empty:
+                done = True
+        if text != '':
+            self.logfile.write(text)
+        if poll != None:
+            self.bar.stop()
+            if poll == 0:
+                msg = 'Success\n'
+                self.numgood += 1
+            else:
+                msg = 'Failed\n'
+                self.numbad += 1
+            self.p2.join()
+            self.logfile.write("DeDRM v{0}: {1}\n".format(__version__,msg))
+            self.showCmdOutput(msg)
+            self.p2 = None
+            self.running = 'inactive'
+            self.after(50,self.processBooks)
+            return
+        # make sure we get invoked again by event loop after interval
+        self.stext.after(self.interval,self.processQueue)
+        return
+
+    def decrypt_ebook(self, infile, outdir, rscpath):
+        q = self.q
+        rv = 1
+        name, ext = os.path.splitext(os.path.basename(infile))
+        ext = ext.lower()
+        if ext == '.epub':
+            self.p2 = Process(target=processEPUB, args=(q, infile, outdir, rscpath))
+            self.p2.start()
+            return 0
+        if ext == '.pdb':
+            self.p2 = Process(target=processPDB, args=(q, infile, outdir, rscpath))
+            self.p2.start()
+            return 0
+        if ext in ['.azw', '.azw1', '.azw3', '.azw4', '.prc', '.mobi', '.tpz']:
+            self.p2 = Process(target=processK4MOBI,args=(q, infile, outdir, rscpath))
+            self.p2.start()
+            return 0
+        if ext == '.pdf':
+            self.p2 = Process(target=processPDF, args=(q, infile, outdir, rscpath))
+            self.p2.start()
+            return 0
+        return rv
+
+
+# child process starts here
+def processK4MOBI(q, infile, outdir, rscpath):
+    add_cp65001_codec()
+    set_utf8_default_encoding()
+    sys.stdout = QueuedUTF8Stream(sys.stdout, q)
+    sys.stderr = QueuedUTF8Stream(sys.stderr, q)
+    rv = decryptk4mobi(infile, outdir, rscpath)
+    sys.exit(rv)
+
+# child process starts here
+def processPDF(q, infile, outdir, rscpath):
+    add_cp65001_codec()
+    set_utf8_default_encoding()
+    sys.stdout = QueuedUTF8Stream(sys.stdout, q)
+    sys.stderr = QueuedUTF8Stream(sys.stderr, q)
+    rv = decryptpdf(infile, outdir, rscpath)
+    sys.exit(rv)
+
+# child process starts here
+def processEPUB(q, infile, outdir, rscpath):
+    add_cp65001_codec()
+    set_utf8_default_encoding()
+    sys.stdout = QueuedUTF8Stream(sys.stdout, q)
+    sys.stderr = QueuedUTF8Stream(sys.stderr, q)
+    rv = decryptepub(infile, outdir, rscpath)
+    sys.exit(rv)
+
+# child process starts here
+def processPDB(q, infile, outdir, rscpath):
+    add_cp65001_codec()
+    set_utf8_default_encoding()
+    sys.stdout = QueuedUTF8Stream(sys.stdout, q)
+    sys.stderr = QueuedUTF8Stream(sys.stderr, q)
+    rv = decryptpdb(infile, outdir, rscpath)
+    sys.exit(rv)
+
+
+def main():
+    argv=unicode_argv()
+    apphome = os.path.dirname(argv[0])
+    apphome = os.path.abspath(apphome)
+
+    # windows may pass a spurious quoted null string as argv[1] from bat file
+    # simply work around this until we can figure out a better way to handle things
+    if sys.platform.startswith('win') and len(argv) == 2:
+        temp = argv[1]
+        temp = temp.strip('"')
+        temp = temp.strip()
+        if temp == '':
+            argv.pop()
+
+    if len(argv) == 1:
+        filenames = []
+        dnd = False
+
+    else : # processing books via drag and drop
+        dnd = True
+        # build a list of the files to be processed
+        # note all filenames and paths have been utf-8 encoded
+        infilelst = argv[1:]
+        filenames = []
+        for infile in infilelst:
+            infile = infile.replace('"','')
+            infile = os.path.abspath(infile)
+            if os.path.isdir(infile):
+                bpath = infile
+                filelst = os.listdir(infile)
+                for afile in filelst:
+                    if not afile.startswith('.'):
+                        filepath = os.path.join(bpath,afile)
+                        if os.path.isfile(filepath):
+                            filenames.append(filepath)
+            else :
+                afile = os.path.basename(infile)
+                if not afile.startswith('.'):
+                    if os.path.isfile(infile):
+                        filenames.append(infile)
+
+    # start up gui app
+    app = MainApp(apphome, dnd, filenames)
+    app.mainloop()
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# DeDRM.pyw, version 6.0.1
+# DeDRM.pyw
 # Copyright 2010-2013 some_updates and Apprentice Alf
 
 # Revision history:
@@ -11,8 +11,9 @@
 #   6.0.3 - Fix for Windows non-ascii user names
 #   6.0.4 - Fix for other potential unicode problems
 #   6.0.5 - Fix typo
+#   6.2.0 - Update to match plugin and AppleScript
 
-__version__ = '6.0.8'
+__version__ = '6.2.0'
 
 import sys
 import os, os.path
@@ -104,6 +105,14 @@ class MainApp(Tk):
             except:
                 traceback.print_exc()
                 pass
+        bnepubkeyfile = os.path.join(prefdir,'bnepubkey.b64')
+        if not os.path.exists(bnepubkeyfile):
+            import ignoblekey
+            try:
+                ignoblekey.getkey(bnepubkeyfile)
+            except:
+                traceback.print_exc()
+                pass
         return prefs
 
     def setPreferences(self, newprefs):

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/DeDRM_Barnes and Noble Key_Help.htm

@@ -22,7 +22,24 @@ li {margin-top: 0.5em}
 
 <p>If you have upgraded from an earlier version of the plugin, any existing Barnes and Noble keys will have been automatically imported, so you might not need to do any more configuration. Continue reading for key generation and management instructions.</p>
 
-<h3>Creating New Keys:</h3>
+<h3>Changes at Barnes & Noble</h3>
+
+<p>In mid-2014, Barnes & Noble changed the way they generated encryption keys. Instead of deriving the key from the user's name and credit card number, they started generating a random key themselves, sending that key through to devices when they connected to the Barnes & Noble servers. This means that some users will find that no combination of their name and CC# will work in decrypting their ebooks.</p>
+
+<p>There is a work-around. Barnes & Noble’s desktop app NOOK Study generates a log file that contains the encryption key. You can download NOOK Study from <a href="https://yuzu.com/nsdownload">https://yuzu.com/nsdownload</a>.</p>
+<p>Once downloaded, install the application, register with your Barnes & Noble or nook account, and download at least one DRMed ebook through NOOK Study. It will be saved somewhere in a folder called "My Barnes & Noble eBooks" in your Documents folder.</p>
+<p>Now import that book into calibre. The log file and the key in the log should be automatically found by the plugin and used to decrypt the book.</p>
+<p>If the automatic process doesn't work for you, you can still find extract it manually and save it as a .b64 file for import into the plugin's preferences as follows:</p>
+<ol><li>In NOOK Study, select Settings/About (Windows) or NOOK Study/About NOOK Study (Mac) and in the dialog that appears click the link at the bottom to copy the log into the clipboard.</li>
+<li>Paste the copied log into a text editor</li>
+<li>Search for the text CCHashResponseV1</li>
+<li>On the line below which starts with ccHash, copy the text between the " marks after ccHash, but don't include the " marks.</li>
+<li>Save that text in a new <b>plain text</b> file, with file name extension .b64 (for example, key.b64)</li>
+<li>Import that file into the preferences through this dialog, using the "Import Existing Key Files" button.</li>
+</ol>
+
+
+<h3>Old instructions: Creating New Keys:</h3>
 
 <p>On the right-hand side of the plugin’s customization dialog, you will see a button with an icon that looks like a green plus sign (+). Clicking this button will open a new dialog for entering the necessary data to generate a new key.</p>
 <ul>
@@ -48,7 +65,7 @@ li {margin-top: 0.5em}
 
 <h3>Importing Existing Keyfiles:</h3>
 
-<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import existing ‘.b64’ key files. Key files might come from being exported from this or older plugins, or may have been generated using the original i♥cabbages script.</p>
+<p>At the bottom-left of the plugin’s customization dialog, you will see a button labeled "Import Existing Keyfiles". Use this button to import existing ‘.b64’ key files. Key files might come from being exported from this or older plugins, or may have been generated using the original i♥cabbages script, or you may have made it by following the instructions above.</p>
 
 <p>Once done creating/deleting/renaming/importing decryption keys, click Close to exit the customization dialogue. Your changes wil only be saved permanently when you click OK in the main configuration dialog.</p>
 

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/DeDRM_Help.htm

@@ -17,7 +17,7 @@ p {margin-top: 0}
 
 <body>
 
-<h1>DeDRM Plugin <span class="version">(v6.0.9)</span></h1>
+<h1>DeDRM Plugin <span class="version">(v6.1.0)</span></h1>
 
 <p>This plugin removes DRM from ebooks when they are imported into calibre. If you already have DRMed ebooks in your calibre library, you will need to remove them and import them again.</p>
 

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py

@@ -36,13 +36,16 @@ __docformat__ = 'restructuredtext en'
 #   6.0.7 - Error handling for incomplete PDF metadata
 #   6.0.8 - Fixes a Wine key issue and topaz support
 #   6.0.9 - Ported to work with newer versions of Calibre (moved to Qt5). Still supports older Qt4 versions.
+#   6.1.0 - Fixed multiple books import problem and PDF import with no key problem
+#   6.2.0 - Support for getting B&N key from nook Study log. Fix for UTF-8 filenames in Adobe ePubs.
+#           Fix for not copying needed files. Fix for getting default Adobe key for PDFs
 
 """
 Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 0, 9)
+PLUGIN_VERSION_TUPLE = (6, 2, 0)
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'
@@ -90,30 +93,20 @@ class DeDRM(FileTypePlugin):
     on_import               = True
     priority                = 600
 
-    def initialize(self):
-        # convert old preferences, if necessary.
-        try:
-            from calibre_plugins.dedrm.prefs import convertprefs
-            convertprefs()
-        except:
-            traceback.print_exc()
 
+    def initialize(self):
         """
-        Dynamic modules can't be imported/loaded from a zipfile... so this routine
-        runs whenever the plugin gets initialized. This will extract the appropriate
+        Dynamic modules can't be imported/loaded from a zipfile.
+        So this routine will extract the appropriate
         library for the target OS and copy it to the 'alfcrypto' subdirectory of
         calibre's configuration directory. That 'alfcrypto' directory is then
         inserted into the syspath (as the very first entry) in the run function
         so the CDLL stuff will work in the alfcrypto.py script.
+
+        The extraction only happens once per version of the plugin
+        Also perform upgrade of preferences once per version
         """
         try:
-            if iswindows:
-                names = [u"alfcrypto.dll",u"alfcrypto64.dll"]
-            elif isosx:
-                names = [u"libalfcrypto.dylib"]
-            else:
-                names = [u"libalfcrypto32.so",u"libalfcrypto64.so",u"kindlekey.py",u"adobekey.py",u"subasyncio.py"]
-            lib_dict = self.load_resources(names)
             self.pluginsdir = os.path.join(config_dir,u"plugins")
             if not os.path.exists(self.pluginsdir):
                 os.mkdir(self.pluginsdir)
@@ -126,9 +119,38 @@ class DeDRM(FileTypePlugin):
             self.alfdir = os.path.join(self.maindir,u"libraryfiles")
             if not os.path.exists(self.alfdir):
                 os.mkdir(self.alfdir)
-            for entry, data in lib_dict.items():
-                file_path = os.path.join(self.alfdir, entry)
-                open(file_path,'wb').write(data)
+            # only continue if we've never run this version of the plugin before
+            self.verdir = os.path.join(self.maindir,PLUGIN_VERSION)
+            if not os.path.exists(self.verdir):
+                if iswindows:
+                    names = [u"alfcrypto.dll",u"alfcrypto64.dll"]
+                elif isosx:
+                    names = [u"libalfcrypto.dylib"]
+                else:
+                    names = [u"libalfcrypto32.so",u"libalfcrypto64.so",u"kindlekey.py",u"adobekey.py",u"subasyncio.py"]
+                lib_dict = self.load_resources(names)
+                print u"{0} v{1}: Copying needed library files from plugin's zip".format(PLUGIN_NAME, PLUGIN_VERSION)
+
+                for entry, data in lib_dict.items():
+                    file_path = os.path.join(self.alfdir, entry)
+                    try:
+                        os.remove(file_path)
+                    except:
+                        pass
+
+                    try:
+                        open(file_path,'wb').write(data)
+                    except:
+                        print u"{0} v{1}: Exception when copying needed library files after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                        traceback.print_exc()
+                        pass
+
+                # convert old preferences, if necessary.
+                from calibre_plugins.dedrm.prefs import convertprefs
+                convertprefs()
+
+                # mark that this version has been initialized
+                os.mkdir(self.verdir)
         except Exception, e:
             traceback.print_exc()
             raise
@@ -166,7 +188,12 @@ class DeDRM(FileTypePlugin):
                 of = self.temporary_file(u".epub")
 
                 # Give the user key, ebook and TemporaryPersistent file to the decryption function.
-                result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                try:
+                    result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                except:
+                    print u"{0} v{1}: Exception when trying to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                    traceback.print_exc()
+                    result = 1
 
                 of.close()
 
@@ -177,8 +204,69 @@ class DeDRM(FileTypePlugin):
 
                 print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname_masked,time.time()-self.starttime)
 
+            # perhaps we should see if we can get a key from a log file
+            print u"{0} v{1}: Looking for new NOOK Study Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+
+            # get the default NOOK Study keys
+            defaultkeys = []
+
+            try:
+                if iswindows or isosx:
+                    from calibre_plugins.dedrm.ignoblekey import nookkeys
+
+                    defaultkeys = nookkeys()
+                else: # linux
+                    from wineutils import WineGetKeys
+
+                    scriptpath = os.path.join(self.alfdir,u"ignoblekey.py")
+                    defaultkeys = WineGetKeys(scriptpath, u".b64",dedrmprefs['adobewineprefix'])
+
+            except:
+                print u"{0} v{1}: Exception when getting default NOOK Study Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
+
+            newkeys = []
+            for keyvalue in defaultkeys:
+                if keyvalue not in dedrmprefs['bandnkeys'].values():
+                    newkeys.append(keyvalue)
+
+            if len(newkeys) > 0:
+                try:
+                    for i,userkey in enumerate(newkeys):
+                        print u"{0} v{1}: Trying a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+
+                        of = self.temporary_file(u".epub")
+
+                        # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+                        try:
+                            result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                        except:
+                           print u"{0} v{1}: Exception when trying to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                           traceback.print_exc()
+                           result = 1
+
+                        of.close()
+
+                        if result == 0:
+                            # Decryption was a success
+                            # Store the new successful key in the defaults
+                            print u"{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+                            try:
+                                dedrmprefs.addnamedvaluetoprefs('bandnkeys','default_key',keyvalue)
+                                dedrmprefs.writeprefs()
+                                print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                            except:
+                                print u"{0} v{1}: Exception saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                                traceback.print_exc()
+                            # Return the modified PersistentTemporary file to calibre.
+                            return of.name
+
+                        print u"{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                except Exception, e:
+                    pass
+
             print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
 
         # import the Adobe Adept ePub handler
         import calibre_plugins.dedrm.ineptepub as ineptepub
@@ -196,6 +284,8 @@ class DeDRM(FileTypePlugin):
                 try:
                     result = ineptepub.decryptBook(userkey, inf.name, of.name)
                 except:
+                    print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                    traceback.print_exc()
                     result = 1
 
                 of.close()
@@ -226,6 +316,7 @@ class DeDRM(FileTypePlugin):
 
                 self.default_key = defaultkeys[0]
             except:
+                print u"{0} v{1}: Exception when getting default Adobe Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
                 traceback.print_exc()
                 self.default_key = u""
 
@@ -244,6 +335,8 @@ class DeDRM(FileTypePlugin):
                         try:
                             result = ineptepub.decryptBook(userkey, inf.name, of.name)
                         except:
+                            print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                            traceback.print_exc()
                             result = 1
 
                         of.close()
@@ -255,7 +348,9 @@ class DeDRM(FileTypePlugin):
                             try:
                                 dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex'))
                                 dedrmprefs.writeprefs()
+                                print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
                             except:
+                                print u"{0} v{1}: Exception when saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
                                 traceback.print_exc()
                             # Return the modified PersistentTemporary file to calibre.
                             return of.name
@@ -266,12 +361,12 @@ class DeDRM(FileTypePlugin):
 
             # Something went wrong with decryption.
             print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
 
         # Not a Barnes & Noble nor an Adobe Adept
         # Import the fixed epub.
         print u"{0} v{1}: “{2}” is neither an Adobe Adept nor a Barnes & Noble encrypted ePub".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
-        return inf.name
+        raise DeDRMError(u"{0} v{1}: Couldn't decrypt after {2:.1f} seconds. DRM free perhaps?".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
 
     def PDFDecrypt(self,path_to_ebook):
         import calibre_plugins.dedrm.prefs as prefs
@@ -289,6 +384,8 @@ class DeDRM(FileTypePlugin):
             try:
                 result = ineptpdf.decryptBook(userkey, path_to_ebook, of.name)
             except:
+                print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
                 result = 1
 
             of.close()
@@ -298,67 +395,73 @@ class DeDRM(FileTypePlugin):
                 # Return the modified PersistentTemporary file to calibre.
                 return of.name
 
-            # perhaps we need to get a new default ADE key
-            print u"{0} v{1}: Looking for new default Adobe Digital Editions Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+            print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname,time.time()-self.starttime)
 
-            # get the default Adobe keys
-            defaultkeys = []
+        # perhaps we need to get a new default ADE key
+        print u"{0} v{1}: Looking for new default Adobe Digital Editions Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
 
+        # get the default Adobe keys
+        defaultkeys = []
+
+        try:
             if iswindows or isosx:
-                import calibre_plugins.dedrm.adobekey as adobe
+                from calibre_plugins.dedrm.adobekey import adeptkeys
 
-                try:
-                    defaultkeys = adobe.adeptkeys()
-                except:
-                    pass
-            else:
-                # linux
-                try:
-                    from wineutils import WineGetKeys
+                defaultkeys = adeptkeys()
+            else: # linux
+                from wineutils import WineGetKeys
 
-                    scriptpath = os.path.join(self.alfdir,u"adobekey.py")
-                    defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
-                except:
-                    pass
+                scriptpath = os.path.join(self.alfdir,u"adobekey.py")
+                defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
 
-            newkeys = []
-            for keyvalue in defaultkeys:
-                if keyvalue.encode('hex') not in dedrmprefs['adeptkeys'].values():
-                    newkeys.append(keyvalue)
+            self.default_key = defaultkeys[0]
+        except:
+            print u"{0} v{1}: Exception when getting default Adobe Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+            traceback.print_exc()
+            self.default_key = u""
 
-            if len(newkeys) > 0:
-                try:
-                    for i,userkey in enumerate(newkeys):
-                        print u"{0} v{1}: Trying a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
-                        of = self.temporary_file(u".pdf")
+        newkeys = []
+        for keyvalue in defaultkeys:
+            if keyvalue.encode('hex') not in dedrmprefs['adeptkeys'].values():
+                newkeys.append(keyvalue)
 
-                        # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+        if len(newkeys) > 0:
+            try:
+                for i,userkey in enumerate(newkeys):
+                    print u"{0} v{1}: Trying a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+                    of = self.temporary_file(u".pdf")
+
+                    # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+                    try:
+                        result = ineptpdf.decryptBook(userkey, path_to_ebook, of.name)
+                    except:
+                        print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                        traceback.print_exc()
+                        result = 1
+
+                    of.close()
+
+                    if  result == 0:
+                        # Decryption was a success
+                        # Store the new successful key in the defaults
+                        print u"{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
                         try:
-                            result = ineptepdf.decryptBook(userkey, inf.name, of.name)
+                            dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex'))
+                            dedrmprefs.writeprefs()
+                            print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
                         except:
-                            result = 1
+                            print u"{0} v{1}: Exception when saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                            traceback.print_exc()
+                        # Return the modified PersistentTemporary file to calibre.
+                        return of.name
 
-                        of.close()
-
-                        if  result == 0:
-                            # Decryption was a success
-                            # Store the new successful key in the defaults
-                            print u"{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
-                            try:
-                                dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex'))
-                                dedrmprefs.writeprefs()
-                            except:
-                                traceback.print_exc()
-                            # Return the modified PersistentTemporary file to calibre.
-                            return of.name
-
-                        print u"{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-                except Exception, e:
-                    pass
+                    print u"{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+            except Exception, e:
+                pass
 
         # Something went wrong with decryption.
         print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
 
 
     def KindleMobiDecrypt(self,path_to_ebook):
@@ -397,6 +500,8 @@ class DeDRM(FileTypePlugin):
                     scriptpath = os.path.join(self.alfdir,u"kindlekey.py")
                     defaultkeys = WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix'])
             except:
+                print u"{0} v{1}: Exception when getting default Kindle Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
                 pass
 
             newkeys = {}
@@ -419,8 +524,7 @@ class DeDRM(FileTypePlugin):
             if not decoded:
                 #if you reached here then no luck raise and exception
                 print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-                traceback.print_exc()
-                raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{4}” after {3:.1f} seconds with error: {2}\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0],time.time()-self.starttime,os.path.basename(path_to_ebook)))
+                raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
 
         of = self.temporary_file(book.getBookExtension())
         book.getFile(of.name)
@@ -454,7 +558,7 @@ class DeDRM(FileTypePlugin):
             print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname_masked,time.time()-self.starttime)
 
         print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
 
 
     def run(self, path_to_ebook):

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/android.py

@@ -10,6 +10,7 @@ from cStringIO import StringIO
 from binascii import a2b_hex, b2a_hex
 
 STORAGE = 'AmazonSecureStorage.xml'
+STORAGE2 = 'map_data_storage.db'
 
 class AndroidObfuscation(object):
     '''AndroidObfuscation
@@ -76,13 +77,8 @@ def parse_preference(path):
 
 def get_serials(path=None):
     ''' get serials from android's shared preference xml '''
-    if path is None:
-        if not os.path.isfile(STORAGE):
-            if os.path.isfile("backup.ab"):
-                get_storage()
-            else:
-                return []
-        path = STORAGE
+    if path is None and os.path.isfile("backup.ab"):
+        return get_storage()
 
     if not os.path.isfile(path):
         return []
@@ -113,16 +109,27 @@ def get_serials(path=None):
     try:
         tokens = set(get_value('kindle.account.tokens').split(','))
     except:
-        return [dsnid]
+        return []
 
     serials = []
     for token in tokens:
         if token:
             serials.append('%s%s' % (dsnid, token))
-    serials.append(dsnid)
-    for token in tokens:
-        if token:
-            serials.append(token)
+    return serials
+
+def get_serials2(path=STORAGE2):
+    import sqlite3
+    connection = sqlite3.connect(path)
+    cursor = connection.cursor()
+    cursor.execute('''select userdata_value from userdata where userdata_key like '%/%token.device.deviceserialname%' ''')
+    dsns = [x[0].encode('utf8') for x in cursor.fetchall()]
+
+    cursor.execute('''select userdata_value from userdata where userdata_key like '%/%kindle.account.tokens%' ''')
+    tokens = [x[0].encode('utf8') for x in cursor.fetchall()]
+    serials = []
+    for x in dsns:
+        for y in tokens:
+            serials.append('%s%s' % (x, y))
     return serials
 
 def get_storage(path='backup.ab'):
@@ -130,25 +137,38 @@ def get_storage(path='backup.ab'):
     backup.ab can be get using adb command:
     shell> adb backup com.amazon.kindle
     '''
+    if not os.path.isfile(path):
+        serials = []
+        if os.path.isfile(STORAGE2):
+            serials.extend(get_serials2(STORAGE2))
+        if os.path.isfile(STORAGE):
+            serials.extend(get_serials(STORAGE))
+        return serials
     output = None
     read = open(path, 'rb')
     head = read.read(24)
-    if head == 'ANDROID BACKUP\n1\n1\nnone\n':
+    if head[:14] == 'ANDROID BACKUP':
         output = StringIO(zlib.decompress(read.read()))
     read.close()
 
     if not output:
-        return False
+        return []
 
+    serials = []
     tar = tarfile.open(fileobj=output)
     for member in tar.getmembers():
-        if member.name.strip().endswith(STORAGE):
+        if member.name.strip().endswith(STORAGE2):
+            write = open(STORAGE2, 'w')
+            write.write(tar.extractfile(member).read())
+            write.close()
+            serials.extend(get_serials2(STORAGE2))
+        elif member.name.strip().endswith(STORAGE):
             write = open(STORAGE, 'w')
             write.write(tar.extractfile(member).read())
             write.close()
-            break
+            serials.extend(get_serials(STORAGE))
 
-    return True
+    return serials
 
 __all__ = [ 'get_storage', 'get_serials', 'parse_preference',
             'AndroidObfuscation', 'AndroidObfuscationV2', 'STORAGE']

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/android_readme.txt

@@ -1,6 +1,7 @@
 1.1 get AmazonSecureStorage.xml from /data/data/com.amazon.kindle/shared_prefs/AmazonSecureStorage.xml
+    or map_data_storage.db from /data/data/com.amazon.kindle/databases/map_data_storage.db
 
 1.2 on android 4.0+, run `adb backup com.amazon.kindle` from PC will get backup.ab
-    now android.py can convert backup.ab to AmazonSecureStorage.xml
+    now android.py can convert backup.ab to AmazonSecureStorage.xml and map_data_storage.db
 
-2. run `k4mobidedrm.py -a AmazonSecureStorage.xml <infile> <outdir>'
+2. run `k4mobidedrm.py <infile> <outdir>'

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ignoblekey.py

@@ -0,0 +1,335 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+# ignoblekey.py
+# Copyright © 2015 Apprentice Alf
+
+# Based on kindlekey.py, Copyright © 2010-2013 by some_updates and Apprentice Alf
+
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
+
+# Revision history:
+#   1.0 - Initial release
+
+"""
+Get Barnes & Noble EPUB user key from nook Studio log file
+"""
+
+__license__ = 'GPL v3'
+__version__ = "1.0"
+
+import sys
+import os
+import hashlib
+import getopt
+import re
+
+# Wrap a stream so that output gets flushed immediately
+# and also make sure that any unicode strings get
+# encoded using "replace" before writing them.
+class SafeUnbuffered:
+    def __init__(self, stream):
+        self.stream = stream
+        self.encoding = stream.encoding
+        if self.encoding == None:
+            self.encoding = "utf-8"
+    def write(self, data):
+        if isinstance(data,unicode):
+            data = data.encode(self.encoding,"replace")
+        self.stream.write(data)
+        self.stream.flush()
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.  So use shell32.GetCommandLineArgvW to get sys.argv
+        # as a list of Unicode strings and encode them as utf-8
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"ignoblekey.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+class DrmException(Exception):
+    pass
+
+# Locate all of the nookStudy/nook for PC/Mac log file and return as list
+def getNookLogFiles():
+    logFiles = []
+    found = False
+    if iswindows:
+        import _winreg as winreg
+
+        # some 64 bit machines do not have the proper registry key for some reason
+        # or the python interface to the 32 vs 64 bit registry is broken
+        paths = set()
+        if 'LOCALAPPDATA' in os.environ.keys():
+            # Python 2.x does not return unicode env. Use Python 3.x
+            path = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
+            if os.path.isdir(path):
+                paths.add(path)
+        if 'USERPROFILE' in os.environ.keys():
+            # Python 2.x does not return unicode env. Use Python 3.x
+            path = winreg.ExpandEnvironmentStrings(u"%USERPROFILE%")+u"\\AppData\\Local"
+            if os.path.isdir(path):
+                paths.add(path)
+            path = winreg.ExpandEnvironmentStrings(u"%USERPROFILE%")+u"\\AppData\\Roaming"
+            if os.path.isdir(path):
+                paths.add(path)
+        # User Shell Folders show take precedent over Shell Folders if present
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+ 
+        for path in paths:
+            # look for nookStudy log file
+            logpath = path +'\\Barnes & Noble\\NOOKstudy\\logs\\BNClientLog.txt'
+            if os.path.isfile(logpath):
+                found = True
+                print('Found nookStudy log file: ' + logpath.encode('ascii','ignore'))
+                logFiles.append(logpath)
+    else:
+        home = os.getenv('HOME')
+        # check for BNClientLog.txt in various locations
+        testpath = home + '/Library/Application Support/Barnes & Noble/DesktopReader/logs/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/DesktopReader/indices/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/BNDesktopReader/logs/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/BNDesktopReader/indices/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+
+    if not found:
+        print('No nook Study log files have been found.')
+    return logFiles
+
+
+# Extract CCHash key(s) from log file
+def getKeysFromLog(kLogFile):
+    keys = []
+    regex = re.compile("ccHash: \"(.{28})\"");
+    for line in open(kLogFile):
+        for m in regex.findall(line):
+            keys.append(m)
+    return keys
+
+# interface for calibre plugin
+def nookkeys(files = []):
+    keys = []
+    if files == []:
+        files = getNookLogFiles()
+    for file in files:
+        fileKeys = getKeysFromLog(file)
+        if fileKeys:
+            print u"Found {0} keys in the Nook Study log files".format(len(fileKeys))
+            keys.extend(fileKeys)
+    return keys
+
+# interface for Python DeDRM
+# returns single key or multiple keys, depending on path or file passed in
+def getkey(outpath, files=[]):
+    keys = nookkeys(files)
+    if len(keys) > 0:
+        if not os.path.isdir(outpath):
+            outfile = outpath
+            with file(outfile, 'w') as keyfileout:
+                keyfileout.write(keys[0])
+            print u"Saved a key to {0}".format(outfile)
+        else:
+            keycount = 0
+            for key in keys:
+                while True:
+                    keycount += 1
+                    outfile = os.path.join(outpath,u"nookkey{0:d}.b64".format(keycount))
+                    if not os.path.exists(outfile):
+                        break
+                with file(outfile, 'w') as keyfileout:
+                    keyfileout.write(key)
+                print u"Saved a key to {0}".format(outfile)
+        return True
+    return False
+
+def usage(progname):
+    print u"Finds the nook Study encryption keys."
+    print u"Keys are saved to the current directory, or a specified output directory."
+    print u"If a file name is passed instead of a directory, only the first key is saved, in that file."
+    print u"Usage:"
+    print u"    {0:s} [-h] [-k <logFile>] [<outpath>]".format(progname)
+
+
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
+    progname = os.path.basename(argv[0])
+    print u"{0} v{1}\nCopyright © 2015 Apprentice Alf".format(progname,__version__)
+
+    try:
+        opts, args = getopt.getopt(argv[1:], "hk:")
+    except getopt.GetoptError, err:
+        print u"Error in options or arguments: {0}".format(err.args[0])
+        usage(progname)
+        sys.exit(2)
+
+    files = []
+    for o, a in opts:
+        if o == "-h":
+            usage(progname)
+            sys.exit(0)
+        if o == "-k":
+            files = [a]
+
+    if len(args) > 1:
+        usage(progname)
+        sys.exit(2)
+
+    if len(args) == 1:
+        # save to the specified file or directory
+        outpath = args[0]
+        if not os.path.isabs(outpath):
+           outpath = os.path.abspath(outpath)
+    else:
+        # save to the same directory as the script
+        outpath = os.path.dirname(argv[0])
+
+    # make sure the outpath is the
+    outpath = os.path.realpath(os.path.normpath(outpath))
+
+    if not getkey(outpath, files):
+        print u"Could not retrieve nook Study key."
+    return 0
+
+
+def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import traceback
+    except:
+        return cli_main()
+
+    class ExceptionDialog(Tkinter.Frame):
+        def __init__(self, root, text):
+            Tkinter.Frame.__init__(self, root, border=5)
+            label = Tkinter.Label(self, text=u"Unexpected error:",
+                                  anchor=Tkconstants.W, justify=Tkconstants.LEFT)
+            label.pack(fill=Tkconstants.X, expand=0)
+            self.text = Tkinter.Text(self)
+            self.text.pack(fill=Tkconstants.BOTH, expand=1)
+
+            self.text.insert(Tkconstants.END, text)
+
+
+    argv=unicode_argv()
+    root = Tkinter.Tk()
+    root.withdraw()
+    progpath, progname = os.path.split(argv[0])
+    success = False
+    try:
+        keys = nookkeys()
+        keycount = 0
+        for key in keys:
+            print key
+            while True:
+                keycount += 1
+                outfile = os.path.join(progpath,u"nookkey{0:d}.b64".format(keycount))
+                if not os.path.exists(outfile):
+                    break
+
+            with file(outfile, 'w') as keyfileout:
+                keyfileout.write(key)
+            success = True
+            tkMessageBox.showinfo(progname, u"Key successfully retrieved to {0}".format(outfile))
+    except DrmException, e:
+        tkMessageBox.showerror(progname, u"Error: {0}".format(str(e)))
+    except Exception:
+        root.wm_state('normal')
+        root.title(progname)
+        text = traceback.format_exc()
+        ExceptionDialog(root, text).pack(fill=Tkconstants.BOTH, expand=1)
+        root.mainloop()
+    if not success:
+        return 1
+    return 0
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        sys.exit(cli_main())
+    sys.exit(gui_main())

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py

@@ -37,13 +37,14 @@ from __future__ import with_statement
 #   5.9 - Fixed to retain zip file metadata (e.g. file modification date)
 #   6.0 - moved unicode_argv call inside main for Windows DeDRM compatibility
 #   6.1 - Work if TkInter is missing
+#   6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis
 
 """
 Decrypt Adobe Digital Editions encrypted ePub books.
 """
 
 __license__ = 'GPL v3'
-__version__ = "6.1"
+__version__ = "6.2"
 
 import sys
 import os
@@ -366,7 +367,7 @@ class Decryptor(object):
         return bytes
 
     def decrypt(self, path, data):
-        if path in self._encrypted:
+        if path.encode('utf-8') in self._encrypted:
             data = self._aes.decrypt(data)[16:]
             data = data[:-ord(data[-1])]
             data = self.decompress(data)

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/subasyncio.py

@@ -0,0 +1,148 @@
+#!/usr/bin/env python
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+import os, sys
+import signal
+import threading
+import subprocess
+from subprocess import Popen, PIPE, STDOUT
+
+# **heavily** chopped up and modfied version of asyncproc.py
+# to make it actually work on Windows as well as Mac/Linux
+# For the original see:
+# "http://www.lysator.liu.se/~bellman/download/"
+# author is  "Thomas Bellman <bellman@lysator.liu.se>"
+# available under GPL version 3 or Later
+
+# create an asynchronous subprocess whose output can be collected in
+# a non-blocking manner
+
+# What a mess!  Have to use threads just to get non-blocking io
+# in a cross-platform manner
+
+# luckily all thread use is hidden within this class
+
+class Process(object):
+    def __init__(self, *params, **kwparams):
+        if len(params) <= 3:
+            kwparams.setdefault('stdin', subprocess.PIPE)
+        if len(params) <= 4:
+            kwparams.setdefault('stdout', subprocess.PIPE)
+        if len(params) <= 5:
+            kwparams.setdefault('stderr', subprocess.PIPE)
+        self.__pending_input = []
+        self.__collected_outdata = []
+        self.__collected_errdata = []
+        self.__exitstatus = None
+        self.__lock = threading.Lock()
+        self.__inputsem = threading.Semaphore(0)
+        self.__quit = False
+
+        self.__process = subprocess.Popen(*params, **kwparams)
+
+        if self.__process.stdin:
+            self.__stdin_thread = threading.Thread(
+                name="stdin-thread",
+                target=self.__feeder, args=(self.__pending_input,
+                                            self.__process.stdin))
+            self.__stdin_thread.setDaemon(True)
+            self.__stdin_thread.start()
+
+        if self.__process.stdout:
+            self.__stdout_thread = threading.Thread(
+                name="stdout-thread",
+                target=self.__reader, args=(self.__collected_outdata,
+                                            self.__process.stdout))
+            self.__stdout_thread.setDaemon(True)
+            self.__stdout_thread.start()
+
+        if self.__process.stderr:
+            self.__stderr_thread = threading.Thread(
+                name="stderr-thread",
+                target=self.__reader, args=(self.__collected_errdata,
+                                            self.__process.stderr))
+            self.__stderr_thread.setDaemon(True)
+            self.__stderr_thread.start()
+
+    def pid(self):
+        return self.__process.pid
+
+    def kill(self, signal):
+        self.__process.send_signal(signal)
+
+    # check on subprocess (pass in 'nowait') to act like poll
+    def wait(self, flag):
+        if flag.lower() == 'nowait':
+            rc = self.__process.poll()
+        else:
+            rc = self.__process.wait()
+        if rc != None:
+            if self.__process.stdin:
+                self.closeinput()
+            if self.__process.stdout:
+                self.__stdout_thread.join()
+            if self.__process.stderr:
+                self.__stderr_thread.join()
+        return self.__process.returncode
+
+    def terminate(self):
+        if self.__process.stdin:
+            self.closeinput()
+        self.__process.terminate()
+
+    # thread gets data from subprocess stdout
+    def __reader(self, collector, source):
+        while True:
+            data = os.read(source.fileno(), 65536)
+            self.__lock.acquire()
+            collector.append(data)
+            self.__lock.release()
+            if data == "":
+                source.close()
+                break
+        return
+
+    # thread feeds data to subprocess stdin
+    def __feeder(self, pending, drain):
+        while True:
+            self.__inputsem.acquire()
+            self.__lock.acquire()
+            if not pending  and self.__quit:
+                drain.close()
+                self.__lock.release()
+                break
+            data = pending.pop(0)
+            self.__lock.release()
+            drain.write(data)
+
+    # non-blocking read of data from subprocess stdout
+    def read(self):
+        self.__lock.acquire()
+        outdata = "".join(self.__collected_outdata)
+        del self.__collected_outdata[:]
+        self.__lock.release()
+        return outdata
+
+    # non-blocking read of data from subprocess stderr
+    def readerr(self):
+        self.__lock.acquire()
+        errdata = "".join(self.__collected_errdata)
+        del self.__collected_errdata[:]
+        self.__lock.release()
+        return errdata
+
+    # non-blocking write to stdin of subprocess
+    def write(self, data):
+        if self.__process.stdin is None:
+            raise ValueError("Writing to process with stdin not a pipe")
+        self.__lock.acquire()
+        self.__pending_input.append(data)
+        self.__inputsem.release()
+        self.__lock.release()
+
+    # close stdinput of subprocess
+    def closeinput(self):
+        self.__lock.acquire()
+        self.__quit = True
+        self.__inputsem.release()
+        self.__lock.release()

DeDRM_Windows_Application/DeDRM_App_ReadMe.txt

@@ -1,27 +1,26 @@
-DeDRM_App - DeDRM_App.pyw and DeDRM_Drop_Target.bat
-===========================================================
+DeDRM_App - DeDRM_App.pyw and DeDRM_Drop_Target.bat
+===================================================
 
-DeDRM_App.pyw is a pure python drag and drop application that allows users to drag and drop ebooks or folders of ebooks onto the DeDRM_Drop_Target.bat to have the DRM removed.  It repackages all the "tools" python software in one easy to use program that remembers preferences and settings.
+DeDRM_App.pyw is a python drag and drop application that allows users to drag and drop ebooks or folders of ebooks onto the DeDRM_Drop_Target.bat to have the DRM removed.  It repackages all the "tools" python software (except obok) in one easy to use program that remembers preferences and settings.
 
-It will work without manual configuration for Kindle for PC ebooks and Adobe Digital Edition epub and pdf ebooks, when Kindle for PC and/or Adobe Digital Editions are installed on the same computer.
+It will work without manual configuration for Kindle for PC ebooks, Adobe Digital Edition epub and pdf ebooks and Barnes & Noble NOOK Study ePubs when Kindle for PC, Adobe Digital Editions and NOOK Study are installed on the same computer and user account.
 
-To remove the DRM from eInk Kindle ebooks, Barnes and Noble epubs, Mobipocket ebooks and Fictionwise eReader ebooks requires the user to double-click the DeDRM_Drop_Target.bat file and set some additional Preferences including:
+To remove the DRM from eInk Kindle ebooks, Mobipocket ebooks and Fictionwise eReader ebooks requires the user to double-click the DeDRM_Drop_Target.bat file and set some additional Preferences including:
 
 eInk Kindle: 16 digit Serial Number
-Barnes & Noble: key file (bnepubkey.b64) generate using ignoblekeygen.pyw
 eReader Social DRM: Name:Last 8 digits of CC number
 MobiPocket: 10 digit PID
 
 Once these preferences have been set, the user can simply drag and drop ebooks onto the DeDRM_Drop_Target to remove the DRM. Note that after setting preferences it is necessary to click on "Set Prefs" button and then quit the application for the change in preferences to fully take effect.
 
-This program requires that a 32 bit version of Python 2.x (tested with Python 2.5 through Python 2.7) and PyCrypto be installed on your computer before it will work.  See below for where to get theese programs for Windows.
+This program requires that Python 2.7 and PyCrypto 2.6 for Python 2.7 be installed on your computer before it will work.  See below for how to get and install these programs for Windows.
 
 
 Installation
 ------------
 0. If you don't already have a correct version of Python and PyCrypto installed, follow the "Installing Python on Windows" and "Installing PyCrypto on Windows" sections below before continuing.
 
-1. Drag the DeDRM_App folder from tools_v6.1.0/DeDRM_Application_Windows to your "My Documents" folder.
+1. Drag the DeDRM_App folder from tools_v6.2.0/DeDRM_Application_Windows to your "My Documents" folder.
 
 2. Open the DeDRM_App folder you've just dragged, and make a short-cut of the DeDRM_Drop_Target.bat file (right-click/Create Shortcut). Drag the shortcut file onto your Desktop.
 
@@ -30,37 +29,37 @@ Installation
 
 Credits
 -------
-The mobidedrm and erdr2pml scripts were created by The Dark Reverser
-The ignobleepub, ignoblekeygen, ineptepub and adobe key scripts were created by i♥cabbages
-The k4mobidedrm script and supporting scripts were written by some_updates with help from DiapDealer and Apprentice Alf, based on code by Bart Simpson (aka Skindle), CMBDTC and clarknova
-The alfcrypto library was created by some_updates
-The ePub encryption detection script was adapted by Apprentice Alf from a script by Paul Durrant
-The DeDRM all-in-one AppleScript was created by Apprentice Alf
-The DeDRM all-in-one python script was created by some_updates and Apprentice Alf
+The original inept and ignoble scripts were by i♥cabbages
+The original mobidedrm and erdr2pml scripts were by The Dark Reverser
+The original topaz DRM removal script was by CMBDTC
+The original topaz format conversion scripts were by some_updates, clarknova and Bart Simpson
+
+The alfcrypto library is by some_updates
+The ePub encryption detection script is by Apprentice Alf, adapted from a script by Paul Durrant
+The ignoblekey script is by Apprentice Harper
+The DeDRM python GUI was by some_updates and is maintained by Apprentice Alf and Apprentice Harper
+
+Many fixes, updates and enhancements to the scripts and applicatons have been made by many other people. For more details, see the commments in the individual scripts.
 
 
 Installing Python on Windows
 ----------------------------
-I strongly recommend fully installing ActiveState’s Active Python, free Community Edition for Windows (x86) 32 bits. This is a free, full version of the Python.  It comes with some important additional modules that are not included in the bare-bones version from www.python.org unless you choose to install everything.
+I strongly recommend fully installing ActiveState’s Active Python, free Community Edition for Windows. This is a free, full version of the Python.  It comes with some important additional modules that are not included in the bare-bones version from www.python.org unless you choose to install everything.
 
-1. Download ActivePython 2.7.X for Windows (x86) (or later 2.7 version for Windows (x86) ) from http://www.activestate.com/activepython/downloads. Do not download the ActivePython 2.7.X for Windows (64-bit, x64) verson, even if you are running 64-bit Windows.
+1. Download ActivePython 2.7.8 for Windows (or later 2.7.x version for Windows) from http://www.activestate.com/activepython/downloads.
 
 2. When it has finished downloading, run the installer. Accept the default options.
 
 
 Installing PyCrypto on Windows
 ------------------------------
-PyCrypto is a set of encryption/decryption routines that work with Python. The sources are freely available, and compiled versions are available from several sources. You must install a version that is for 32-bit Windows and Python 2.7. I recommend the installer linked from Michael Foord’s blog.
-
-1. Download PyCrypto 2.1 for 32bit Windows and Python 2.7 from http://www.voidspace.org.uk/python/modules.shtml#pycrypto
-
-2. When it has finished downloading, unzip it. This will produce a file “pycrypto-2.1.0.win32-py2.7.exe”.
-
-3. Double-click “pycrypto-2.1.0.win32-py2.7.exe” to run it. Accept the default options.
+PyCrypto is a set of encryption/decryption routines that work with Python. The sources are freely available, and compiled versions are available from several sources. You must install a version that is for Python 2.7. I recommend the installer linked from Michael Foord’s blog.
 
+1. Download PyCrypto 2.6 (or later) for Windows and Python 2.7 from http://www.voidspace.org.uk/python/modules.shtml#pycrypto
 
+2. When it has finished downloading, run the application. Accept the default options.
 
 
 Linux Users
 ===========
-The DeDRM_app.pyw script, although not the bat shortcut, should work under Linux. Drag & drop functionality is not available.
+The DeDRM_app.pyw script, although not the .bat shortcut, should work under Linux. Drag & drop functionality is not available. Depending on your Linux installation, you may or may not need to install Python 2 and PyCrypto.

DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Barnes and Noble Key_Help.htm

@@ -24,14 +24,20 @@ li {margin-top: 0.5em}
 
 <h3>Changes at Barnes & Noble</h3>
 
-<p>In mid-2014, Barnes & Noble changed the way they generated encryption keys. Instead of deriving the key from the user's name and credit card number, they started generating a random key themselves, sending that key through to devices when they connected to the B&N servers. This means that some users will find that no combination of their name and CC# will work in decrypting their ebooks.</p>
+<p>In mid-2014, Barnes & Noble changed the way they generated encryption keys. Instead of deriving the key from the user's name and credit card number, they started generating a random key themselves, sending that key through to devices when they connected to the Barnes & Noble servers. This means that some users will find that no combination of their name and CC# will work in decrypting their ebooks.</p>
+
+<p>There is a work-around. Barnes & Noble’s desktop app NOOK Study generates a log file that contains the encryption key. You can download NOOK Study from <a href="https://yuzu.com/nsdownload">https://yuzu.com/nsdownload</a>.</p>
+<p>Once downloaded, install the application, register with your Barnes & Noble or nook account, and download at least one DRMed ebook through NOOK Study. It will be saved somewhere in a folder called "My Barnes & Noble eBooks" in your Documents folder.</p>
+<p>Now import that book into calibre. The log file and the key in the log should be automatically found by the plugin and used to decrypt the book.</p>
+<p>If the automatic process doesn't work for you, you can still find extract it manually and save it as a .b64 file for import into the plugin's preferences as follows:</p>
+<ol><li>In NOOK Study, select Settings/About (Windows) or NOOK Study/About NOOK Study (Mac) and in the dialog that appears click the link at the bottom to copy the log into the clipboard.</li>
+<li>Paste the copied log into a text editor</li>
+<li>Search for the text CCHashResponseV1</li>
+<li>On the line below which starts with ccHash, copy the text between the " marks after ccHash, but don't include the " marks.</li>
+<li>Save that text in a new <b>plain text</b> file, with file name extension .b64 (for example, key.b64)</li>
+<li>Import that file into the preferences through this dialog, using the "Import Existing Key Files" button.</li>
+</ol>
 
-<p>There is a work-around. B&N's desktop apps for Mac and Windows (nook for Mac/PC, nookStudy) generate a log file that contains the encryption key. For Mac the log file can be found somewhere in [user folder]/Library/Application Support/Barnes & Noble/ and for Windows the log file can be found somewhere in C:\Users\admin\AppData\Roaming\Barnes & Noble\</p>
-<p>In both cases, the log file will be called BNClientLog.txt</p>
-<p>You will need to open the application, sign in to your account, and download your books, checking that you can read them in the application, and then quit the application.</p>
-<p>Then you must open the log file in a text editor and search for CCHashResponseV1. Immediately after that text should be some more text, similar to ccHash: "rLYiGD+vcPoXvsj/87kDAb1AkBy="<p>
-<p>Copy the text after ccHash, include the " marks. Save it in a new text file, with file name extension .b64</p>
-<p>Follow the instructions below "Importing Existing Keyfiles:" to import that newly saved file into the preferences.</p>
 
 <h3>Old instructions: Creating New Keys:</h3>
 

DeDRM_calibre_plugin/DeDRM_plugin/__init__.py

@@ -37,13 +37,15 @@ __docformat__ = 'restructuredtext en'
 #   6.0.8 - Fixes a Wine key issue and topaz support
 #   6.0.9 - Ported to work with newer versions of Calibre (moved to Qt5). Still supports older Qt4 versions.
 #   6.1.0 - Fixed multiple books import problem and PDF import with no key problem
+#   6.2.0 - Support for getting B&N key from nook Study log. Fix for UTF-8 filenames in Adobe ePubs.
+#           Fix for not copying needed files. Fix for getting default Adobe key for PDFs
 
 """
 Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 1, 0)
+PLUGIN_VERSION_TUPLE = (6, 2, 0)
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'
@@ -91,13 +93,8 @@ class DeDRM(FileTypePlugin):
     on_import               = True
     priority                = 600
 
-    def load_resources(self, names):
-        print u"{0} v{1}: In load_resources".format(PLUGIN_NAME, PLUGIN_VERSION)
-        return {}
 
-    def __init__(self, plugin_path):
-        print u"{0} v{1}: In __init__".format(PLUGIN_NAME, PLUGIN_VERSION)
-        super(DeDRM, self).__init__(plugin_path)
+    def initialize(self):
         """
         Dynamic modules can't be imported/loaded from a zipfile.
         So this routine will extract the appropriate
@@ -107,15 +104,9 @@ class DeDRM(FileTypePlugin):
         so the CDLL stuff will work in the alfcrypto.py script.
 
         The extraction only happens once per version of the plugin
+        Also perform upgrade of preferences once per version
         """
         try:
-            if iswindows:
-                names = [u"alfcrypto.dll",u"alfcrypto64.dll"]
-            elif isosx:
-                names = [u"libalfcrypto.dylib"]
-            else:
-                names = [u"libalfcrypto32.so",u"libalfcrypto64.so",u"kindlekey.py",u"adobekey.py",u"subasyncio.py"]
-            lib_dict = self.load_resources(names)
             self.pluginsdir = os.path.join(config_dir,u"plugins")
             if not os.path.exists(self.pluginsdir):
                 os.mkdir(self.pluginsdir)
@@ -130,29 +121,40 @@ class DeDRM(FileTypePlugin):
                 os.mkdir(self.alfdir)
             # only continue if we've never run this version of the plugin before
             self.verdir = os.path.join(self.maindir,PLUGIN_VERSION)
-            print u"{0} v{1}: verdir {2}".format(PLUGIN_NAME, PLUGIN_VERSION, self.verdir)
             if not os.path.exists(self.verdir):
-                print u"{0} v{1}: Copying needed libraries from zip".format(PLUGIN_NAME, PLUGIN_VERSION)
-                os.mkdir(self.verdir)
+                if iswindows:
+                    names = [u"alfcrypto.dll",u"alfcrypto64.dll"]
+                elif isosx:
+                    names = [u"libalfcrypto.dylib"]
+                else:
+                    names = [u"libalfcrypto32.so",u"libalfcrypto64.so",u"kindlekey.py",u"adobekey.py",u"subasyncio.py"]
+                lib_dict = self.load_resources(names)
+                print u"{0} v{1}: Copying needed library files from plugin's zip".format(PLUGIN_NAME, PLUGIN_VERSION)
+
                 for entry, data in lib_dict.items():
                     file_path = os.path.join(self.alfdir, entry)
-                    os.remove(file_path)
-                    open(file_path,'wb').write(data)
+                    try:
+                        os.remove(file_path)
+                    except:
+                        pass
+
+                    try:
+                        open(file_path,'wb').write(data)
+                    except:
+                        print u"{0} v{1}: Exception when copying needed library files after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                        traceback.print_exc()
+                        pass
+
+                # convert old preferences, if necessary.
+                from calibre_plugins.dedrm.prefs import convertprefs
+                convertprefs()
+
+                # mark that this version has been initialized
+                os.mkdir(self.verdir)
         except Exception, e:
             traceback.print_exc()
             raise
 
-
-
-    def initialize(self):
-        print u"{0} v{1}: In initialize".format(PLUGIN_NAME, PLUGIN_VERSION)
-        # convert old preferences, if necessary.
-        try:
-            from calibre_plugins.dedrm.prefs import convertprefs
-            convertprefs()
-        except:
-            traceback.print_exc()
-
     def ePubDecrypt(self,path_to_ebook):
         # Create a TemporaryPersistent file to work with.
         # Check original epub archive for zip errors.
@@ -186,7 +188,12 @@ class DeDRM(FileTypePlugin):
                 of = self.temporary_file(u".epub")
 
                 # Give the user key, ebook and TemporaryPersistent file to the decryption function.
-                result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                try:
+                    result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                except:
+                    print u"{0} v{1}: Exception when trying to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                    traceback.print_exc()
+                    result = 1
 
                 of.close()
 
@@ -197,8 +204,69 @@ class DeDRM(FileTypePlugin):
 
                 print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname_masked,time.time()-self.starttime)
 
+            # perhaps we should see if we can get a key from a log file
+            print u"{0} v{1}: Looking for new NOOK Study Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+
+            # get the default NOOK Study keys
+            defaultkeys = []
+
+            try:
+                if iswindows or isosx:
+                    from calibre_plugins.dedrm.ignoblekey import nookkeys
+
+                    defaultkeys = nookkeys()
+                else: # linux
+                    from wineutils import WineGetKeys
+
+                    scriptpath = os.path.join(self.alfdir,u"ignoblekey.py")
+                    defaultkeys = WineGetKeys(scriptpath, u".b64",dedrmprefs['adobewineprefix'])
+
+            except:
+                print u"{0} v{1}: Exception when getting default NOOK Study Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
+
+            newkeys = []
+            for keyvalue in defaultkeys:
+                if keyvalue not in dedrmprefs['bandnkeys'].values():
+                    newkeys.append(keyvalue)
+
+            if len(newkeys) > 0:
+                try:
+                    for i,userkey in enumerate(newkeys):
+                        print u"{0} v{1}: Trying a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+
+                        of = self.temporary_file(u".epub")
+
+                        # Give the user key, ebook and TemporaryPersistent file to the decryption function.
+                        try:
+                            result = ignobleepub.decryptBook(userkey, inf.name, of.name)
+                        except:
+                           print u"{0} v{1}: Exception when trying to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                           traceback.print_exc()
+                           result = 1
+
+                        of.close()
+
+                        if result == 0:
+                            # Decryption was a success
+                            # Store the new successful key in the defaults
+                            print u"{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)
+                            try:
+                                dedrmprefs.addnamedvaluetoprefs('bandnkeys','default_key',keyvalue)
+                                dedrmprefs.writeprefs()
+                                print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                            except:
+                                print u"{0} v{1}: Exception saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                                traceback.print_exc()
+                            # Return the modified PersistentTemporary file to calibre.
+                            return of.name
+
+                        print u"{0} v{1}: Failed to decrypt with new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
+                except Exception, e:
+                    pass
+
             print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
 
         # import the Adobe Adept ePub handler
         import calibre_plugins.dedrm.ineptepub as ineptepub
@@ -216,6 +284,8 @@ class DeDRM(FileTypePlugin):
                 try:
                     result = ineptepub.decryptBook(userkey, inf.name, of.name)
                 except:
+                    print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                    traceback.print_exc()
                     result = 1
 
                 of.close()
@@ -246,6 +316,7 @@ class DeDRM(FileTypePlugin):
 
                 self.default_key = defaultkeys[0]
             except:
+                print u"{0} v{1}: Exception when getting default Adobe Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
                 traceback.print_exc()
                 self.default_key = u""
 
@@ -264,6 +335,8 @@ class DeDRM(FileTypePlugin):
                         try:
                             result = ineptepub.decryptBook(userkey, inf.name, of.name)
                         except:
+                            print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                            traceback.print_exc()
                             result = 1
 
                         of.close()
@@ -275,7 +348,9 @@ class DeDRM(FileTypePlugin):
                             try:
                                 dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex'))
                                 dedrmprefs.writeprefs()
+                                print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
                             except:
+                                print u"{0} v{1}: Exception when saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
                                 traceback.print_exc()
                             # Return the modified PersistentTemporary file to calibre.
                             return of.name
@@ -286,12 +361,12 @@ class DeDRM(FileTypePlugin):
 
             # Something went wrong with decryption.
             print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+            raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
 
         # Not a Barnes & Noble nor an Adobe Adept
         # Import the fixed epub.
         print u"{0} v{1}: “{2}” is neither an Adobe Adept nor a Barnes & Noble encrypted ePub".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))
-        return inf.name
+        raise DeDRMError(u"{0} v{1}: Couldn't decrypt after {2:.1f} seconds. DRM free perhaps?".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
 
     def PDFDecrypt(self,path_to_ebook):
         import calibre_plugins.dedrm.prefs as prefs
@@ -309,6 +384,8 @@ class DeDRM(FileTypePlugin):
             try:
                 result = ineptpdf.decryptBook(userkey, path_to_ebook, of.name)
             except:
+                print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
                 result = 1
 
             of.close()
@@ -318,28 +395,30 @@ class DeDRM(FileTypePlugin):
                 # Return the modified PersistentTemporary file to calibre.
                 return of.name
 
+            print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname,time.time()-self.starttime)
+
         # perhaps we need to get a new default ADE key
         print u"{0} v{1}: Looking for new default Adobe Digital Editions Keys after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
 
         # get the default Adobe keys
         defaultkeys = []
 
-        if iswindows or isosx:
-            import calibre_plugins.dedrm.adobekey as adobe
+        try:
+            if iswindows or isosx:
+                from calibre_plugins.dedrm.adobekey import adeptkeys
 
-            try:
-                defaultkeys = adobe.adeptkeys()
-            except:
-                pass
-        else:
-            # linux
-            try:
+                defaultkeys = adeptkeys()
+            else: # linux
                 from wineutils import WineGetKeys
 
                 scriptpath = os.path.join(self.alfdir,u"adobekey.py")
                 defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
-            except:
-                pass
+
+            self.default_key = defaultkeys[0]
+        except:
+            print u"{0} v{1}: Exception when getting default Adobe Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+            traceback.print_exc()
+            self.default_key = u""
 
         newkeys = []
         for keyvalue in defaultkeys:
@@ -354,8 +433,10 @@ class DeDRM(FileTypePlugin):
 
                     # Give the user key, ebook and TemporaryPersistent file to the decryption function.
                     try:
-                        result = ineptepdf.decryptBook(userkey, inf.name, of.name)
+                        result = ineptpdf.decryptBook(userkey, path_to_ebook, of.name)
                     except:
+                        print u"{0} v{1}: Exception when decrypting after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                        traceback.print_exc()
                         result = 1
 
                     of.close()
@@ -367,7 +448,9 @@ class DeDRM(FileTypePlugin):
                         try:
                             dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex'))
                             dedrmprefs.writeprefs()
+                            print u"{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
                         except:
+                            print u"{0} v{1}: Exception when saving a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
                             traceback.print_exc()
                         # Return the modified PersistentTemporary file to calibre.
                         return of.name
@@ -378,7 +461,7 @@ class DeDRM(FileTypePlugin):
 
         # Something went wrong with decryption.
         print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
 
 
     def KindleMobiDecrypt(self,path_to_ebook):
@@ -417,6 +500,8 @@ class DeDRM(FileTypePlugin):
                     scriptpath = os.path.join(self.alfdir,u"kindlekey.py")
                     defaultkeys = WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix'])
             except:
+                print u"{0} v{1}: Exception when getting default Kindle Key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime)
+                traceback.print_exc()
                 pass
 
             newkeys = {}
@@ -439,8 +524,7 @@ class DeDRM(FileTypePlugin):
             if not decoded:
                 #if you reached here then no luck raise and exception
                 print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-                traceback.print_exc()
-                raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{4}” after {3:.1f} seconds with error: {2}\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, e.args[0],time.time()-self.starttime,os.path.basename(path_to_ebook)))
+                raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
 
         of = self.temporary_file(book.getBookExtension())
         book.getFile(of.name)
@@ -474,7 +558,7 @@ class DeDRM(FileTypePlugin):
             print u"{0} v{1}: Failed to decrypt with key {2:s} after {3:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,keyname_masked,time.time()-self.starttime)
 
         print u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)
-        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt “{2}” after {3:.1f} seconds.\nRead the FAQs at Alf's blog: http://apprenticealf.wordpress.com/".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook),time.time()-self.starttime))
+        raise DeDRMError(u"{0} v{1}: Ultimately failed to decrypt after {2:.1f} seconds.".format(PLUGIN_NAME, PLUGIN_VERSION, time.time()-self.starttime))
 
 
     def run(self, path_to_ebook):

DeDRM_calibre_plugin/DeDRM_plugin/activitybar.py

@@ -0,0 +1,75 @@
+import sys
+import Tkinter
+import Tkconstants
+
+class ActivityBar(Tkinter.Frame):
+
+    def __init__(self, master, length=300, height=20, barwidth=15, interval=50, bg='white', fillcolor='orchid1',\
+                 bd=2, relief=Tkconstants.GROOVE, *args, **kw):
+        Tkinter.Frame.__init__(self, master, bg=bg, width=length, height=height, *args, **kw)
+        self._master = master
+        self._interval = interval
+        self._maximum = length
+        self._startx = 0
+        self._barwidth = barwidth
+        self._bardiv = length / barwidth
+        if self._bardiv < 10:
+            self._bardiv = 10
+        stopx = self._startx + self._barwidth
+        if stopx > self._maximum:
+            stopx = self._maximum
+        # self._canv = Tkinter.Canvas(self, bg=self['bg'], width=self['width'], height=self['height'],\
+        #                             highlightthickness=0, relief='flat', bd=0)
+        self._canv = Tkinter.Canvas(self, bg=self['bg'], width=self['width'], height=self['height'],\
+                                    highlightthickness=0, relief=relief, bd=bd)
+        self._canv.pack(fill='both', expand=1)
+        self._rect = self._canv.create_rectangle(0, 0, self._canv.winfo_reqwidth(), self._canv.winfo_reqheight(), fill=fillcolor, width=0)
+
+        self._set()
+        self.bind('<Configure>', self._update_coords)
+        self._running = False
+
+    def _update_coords(self, event):
+        '''Updates the position of the rectangle inside the canvas when the size of
+        the widget gets changed.'''
+        # looks like we have to call update_idletasks() twice to make sure
+        # to get the results we expect
+        self._canv.update_idletasks()
+        self._maximum = self._canv.winfo_width()
+        self._startx = 0
+        self._barwidth = self._maximum / self._bardiv
+        if self._barwidth < 2:
+            self._barwidth = 2
+        stopx = self._startx + self._barwidth
+        if stopx > self._maximum:
+            stopx = self._maximum
+        self._canv.coords(self._rect, 0, 0, stopx, self._canv.winfo_height())
+        self._canv.update_idletasks()
+
+    def _set(self):
+        if self._startx < 0:
+            self._startx = 0
+        if self._startx > self._maximum:
+            self._startx = self._startx % self._maximum
+        stopx = self._startx + self._barwidth
+        if stopx > self._maximum:
+            stopx = self._maximum
+        self._canv.coords(self._rect, self._startx, 0, stopx, self._canv.winfo_height())
+        self._canv.update_idletasks()
+
+    def start(self):
+        self._running = True
+        self.after(self._interval, self._step)
+
+    def stop(self):
+        self._running = False
+        self._set()
+
+    def _step(self):
+        if self._running:
+            stepsize = self._barwidth / 4
+            if stepsize < 2:
+                stepsize = 2
+            self._startx += stepsize
+            self._set()
+            self.after(self._interval, self._step)

DeDRM_calibre_plugin/DeDRM_plugin/android.py

@@ -10,6 +10,7 @@ from cStringIO import StringIO
 from binascii import a2b_hex, b2a_hex
 
 STORAGE = 'AmazonSecureStorage.xml'
+STORAGE2 = 'map_data_storage.db'
 
 class AndroidObfuscation(object):
     '''AndroidObfuscation
@@ -76,13 +77,8 @@ def parse_preference(path):
 
 def get_serials(path=None):
     ''' get serials from android's shared preference xml '''
-    if path is None:
-        if not os.path.isfile(STORAGE):
-            if os.path.isfile("backup.ab"):
-                get_storage()
-            else:
-                return []
-        path = STORAGE
+    if path is None and os.path.isfile("backup.ab"):
+        return get_storage()
 
     if not os.path.isfile(path):
         return []
@@ -113,16 +109,27 @@ def get_serials(path=None):
     try:
         tokens = set(get_value('kindle.account.tokens').split(','))
     except:
-        return [dsnid]
+        return []
 
     serials = []
     for token in tokens:
         if token:
             serials.append('%s%s' % (dsnid, token))
-    serials.append(dsnid)
-    for token in tokens:
-        if token:
-            serials.append(token)
+    return serials
+
+def get_serials2(path=STORAGE2):
+    import sqlite3
+    connection = sqlite3.connect(path)
+    cursor = connection.cursor()
+    cursor.execute('''select userdata_value from userdata where userdata_key like '%/%token.device.deviceserialname%' ''')
+    dsns = [x[0].encode('utf8') for x in cursor.fetchall()]
+
+    cursor.execute('''select userdata_value from userdata where userdata_key like '%/%kindle.account.tokens%' ''')
+    tokens = [x[0].encode('utf8') for x in cursor.fetchall()]
+    serials = []
+    for x in dsns:
+        for y in tokens:
+            serials.append('%s%s' % (x, y))
     return serials
 
 def get_storage(path='backup.ab'):
@@ -130,25 +137,38 @@ def get_storage(path='backup.ab'):
     backup.ab can be get using adb command:
     shell> adb backup com.amazon.kindle
     '''
+    if not os.path.isfile(path):
+        serials = []
+        if os.path.isfile(STORAGE2):
+            serials.extend(get_serials2(STORAGE2))
+        if os.path.isfile(STORAGE):
+            serials.extend(get_serials(STORAGE))
+        return serials
     output = None
     read = open(path, 'rb')
     head = read.read(24)
-    if head == 'ANDROID BACKUP\n1\n1\nnone\n':
+    if head[:14] == 'ANDROID BACKUP':
         output = StringIO(zlib.decompress(read.read()))
     read.close()
 
     if not output:
-        return False
+        return []
 
+    serials = []
     tar = tarfile.open(fileobj=output)
     for member in tar.getmembers():
-        if member.name.strip().endswith(STORAGE):
+        if member.name.strip().endswith(STORAGE2):
+            write = open(STORAGE2, 'w')
+            write.write(tar.extractfile(member).read())
+            write.close()
+            serials.extend(get_serials2(STORAGE2))
+        elif member.name.strip().endswith(STORAGE):
             write = open(STORAGE, 'w')
             write.write(tar.extractfile(member).read())
             write.close()
-            break
+            serials.extend(get_serials(STORAGE))
 
-    return True
+    return serials
 
 __all__ = [ 'get_storage', 'get_serials', 'parse_preference',
             'AndroidObfuscation', 'AndroidObfuscationV2', 'STORAGE']

DeDRM_calibre_plugin/DeDRM_plugin/android_readme.txt

@@ -1,6 +1,7 @@
 1.1 get AmazonSecureStorage.xml from /data/data/com.amazon.kindle/shared_prefs/AmazonSecureStorage.xml
+    or map_data_storage.db from /data/data/com.amazon.kindle/databases/map_data_storage.db
 
 1.2 on android 4.0+, run `adb backup com.amazon.kindle` from PC will get backup.ab
-    now android.py can convert backup.ab to AmazonSecureStorage.xml
+    now android.py can convert backup.ab to AmazonSecureStorage.xml and map_data_storage.db
 
-2. run `k4mobidedrm.py -a AmazonSecureStorage.xml <infile> <outdir>'
+2. run `k4mobidedrm.py <infile> <outdir>'

DeDRM_calibre_plugin/DeDRM_plugin/argv_utils.py

@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import sys, os
+import locale
+import codecs
+
+# get sys.argv arguments and encode them into utf-8
+def unicode_argv():
+    if sys.platform.startswith('win'):
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.
+
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"DeDRM.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+
+def add_cp65001_codec():
+  try:
+    codecs.lookup('cp65001')
+  except LookupError:
+    codecs.register(
+        lambda name: name == 'cp65001' and codecs.lookup('utf-8') or None)
+  return
+
+
+def set_utf8_default_encoding():
+  if sys.getdefaultencoding() == 'utf-8':
+    return
+
+  # Regenerate setdefaultencoding.
+  reload(sys)
+  sys.setdefaultencoding('utf-8')
+
+  for attr in dir(locale):
+    if attr[0:3] != 'LC_':
+      continue
+    aref = getattr(locale, attr)
+    try:
+      locale.setlocale(aref, '')
+    except locale.Error:
+      continue
+    try:
+      lang = locale.getlocale(aref)[0]
+    except (TypeError, ValueError):
+      continue
+    if lang:
+      try:
+        locale.setlocale(aref, (lang, 'UTF-8'))
+      except locale.Error:
+        os.environ[attr] = lang + '.UTF-8'
+  try:
+    locale.setlocale(locale.LC_ALL, '')
+  except locale.Error:
+    pass
+  return
+
+

DeDRM_calibre_plugin/DeDRM_plugin/askfolder_ed.py

@@ -0,0 +1,211 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+# to work around tk_chooseDirectory not properly returning unicode paths on Windows
+# need to use a dialog that can be hacked up to actually return full unicode paths
+# originally based on AskFolder from EasyDialogs for Windows but modified to fix it
+# to actually use unicode for path
+
+# The original license for EasyDialogs is as follows
+#
+# Copyright (c) 2003-2005 Jimmy Retzlaff
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+"""
+AskFolder(...) -- Ask the user to select a folder Windows specific
+"""
+
+import os
+
+import ctypes
+from ctypes import POINTER, byref, cdll, c_int, windll
+from ctypes.wintypes import LPCWSTR, LPWSTR
+import ctypes.wintypes as wintypes
+
+
+__all__ = ['AskFolder']
+
+# Load required Windows DLLs
+ole32 = ctypes.windll.ole32
+shell32 = ctypes.windll.shell32
+user32 = ctypes.windll.user32
+
+
+# Windows Constants
+BFFM_INITIALIZED = 1
+BFFM_SETOKTEXT = 1129
+BFFM_SETSELECTIONA = 1126
+BFFM_SETSELECTIONW = 1127
+BIF_EDITBOX = 16
+BS_DEFPUSHBUTTON = 1
+CB_ADDSTRING = 323
+CB_GETCURSEL = 327
+CB_SETCURSEL = 334
+CDM_SETCONTROLTEXT = 1128
+EM_GETLINECOUNT = 186
+EM_GETMARGINS = 212
+EM_POSFROMCHAR = 214
+EM_SETSEL = 177
+GWL_STYLE = -16
+IDC_STATIC = -1
+IDCANCEL = 2
+IDNO = 7
+IDOK = 1
+IDYES = 6
+MAX_PATH = 260
+OFN_ALLOWMULTISELECT = 512
+OFN_ENABLEHOOK = 32
+OFN_ENABLESIZING = 8388608
+OFN_ENABLETEMPLATEHANDLE = 128
+OFN_EXPLORER = 524288
+OFN_OVERWRITEPROMPT = 2
+OPENFILENAME_SIZE_VERSION_400 = 76
+PBM_GETPOS = 1032
+PBM_SETMARQUEE = 1034
+PBM_SETPOS = 1026
+PBM_SETRANGE = 1025
+PBM_SETRANGE32 = 1030
+PBS_MARQUEE = 8
+PM_REMOVE = 1
+SW_HIDE = 0
+SW_SHOW = 5
+SW_SHOWNORMAL = 1
+SWP_NOACTIVATE = 16
+SWP_NOMOVE = 2
+SWP_NOSIZE = 1
+SWP_NOZORDER = 4
+VER_PLATFORM_WIN32_NT = 2
+WM_COMMAND = 273
+WM_GETTEXT = 13
+WM_GETTEXTLENGTH = 14
+WM_INITDIALOG = 272
+WM_NOTIFY = 78
+
+# Windows function prototypes
+BrowseCallbackProc = ctypes.WINFUNCTYPE(ctypes.c_int, wintypes.HWND, ctypes.c_uint, wintypes.LPARAM, wintypes.LPARAM)
+
+# Windows types
+LPCTSTR = ctypes.c_char_p
+LPTSTR = ctypes.c_char_p
+LPVOID = ctypes.c_voidp
+TCHAR = ctypes.c_char
+
+class BROWSEINFO(ctypes.Structure):
+    _fields_ = [
+                ("hwndOwner", wintypes.HWND),
+                ("pidlRoot", LPVOID),
+                ("pszDisplayName", LPTSTR),
+                ("lpszTitle", LPCTSTR),
+                ("ulFlags", ctypes.c_uint),
+                ("lpfn", BrowseCallbackProc),
+                ("lParam", wintypes.LPARAM),
+                ("iImage", ctypes.c_int)
+               ]
+
+
+# Utilities
+def CenterWindow(hwnd):
+    desktopRect = GetWindowRect(user32.GetDesktopWindow())
+    myRect = GetWindowRect(hwnd)
+    x = width(desktopRect) // 2 - width(myRect) // 2
+    y = height(desktopRect) // 2 - height(myRect) // 2
+    user32.SetWindowPos(hwnd, 0,
+                        desktopRect.left + x,
+                        desktopRect.top + y,
+                        0, 0,
+                        SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER
+                       )
+
+
+def GetWindowRect(hwnd):
+    rect = wintypes.RECT()
+    user32.GetWindowRect(hwnd, ctypes.byref(rect))
+    return rect
+
+def width(rect):
+    return rect.right-rect.left
+
+def height(rect):
+    return rect.bottom-rect.top
+
+
+def AskFolder(
+        message=None,
+        version=None,
+        defaultLocation=None,
+        location=None,
+        windowTitle=None,
+        actionButtonLabel=None,
+        cancelButtonLabel=None,
+        multiple=None):
+    """Display a dialog asking the user for select a folder.
+       modified to use unicode strings as much as possible
+       returns unicode path
+    """
+
+    def BrowseCallback(hwnd, uMsg, lParam, lpData):
+        if uMsg == BFFM_INITIALIZED:
+            if actionButtonLabel:
+                label = unicode(actionButtonLabel, errors='replace')
+                user32.SendMessageW(hwnd, BFFM_SETOKTEXT, 0, label)
+            if cancelButtonLabel:
+                label = unicode(cancelButtonLabel, errors='replace')
+                cancelButton = user32.GetDlgItem(hwnd, IDCANCEL)
+                if cancelButton:
+                    user32.SetWindowTextW(cancelButton, label)
+            if windowTitle:
+                title = unicode(windowTitle, erros='replace')
+                user32.SetWindowTextW(hwnd, title)
+            if defaultLocation:
+                user32.SendMessageW(hwnd, BFFM_SETSELECTIONW, 1, defaultLocation.replace('/', '\\'))
+            if location:
+                x, y = location
+                desktopRect = wintypes.RECT()
+                user32.GetWindowRect(0, ctypes.byref(desktopRect))
+                user32.SetWindowPos(hwnd, 0,
+                                  desktopRect.left + x,
+                                  desktopRect.top + y, 0, 0,
+                                  SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER)
+            else:
+                CenterWindow(hwnd)
+        return 0
+
+    # This next line is needed to prevent gc of the callback
+    callback = BrowseCallbackProc(BrowseCallback)
+
+    browseInfo = BROWSEINFO()
+    browseInfo.pszDisplayName = ctypes.c_char_p('\0' * (MAX_PATH+1))
+    browseInfo.lpszTitle = message
+    browseInfo.lpfn = callback
+
+    pidl = shell32.SHBrowseForFolder(ctypes.byref(browseInfo))
+    if not pidl:
+        result = None
+    else:
+        path = LPCWSTR(u" " * (MAX_PATH+1))
+        shell32.SHGetPathFromIDListW(pidl, path)
+        ole32.CoTaskMemFree(pidl)
+        result = path.value
+    return result
+
+
+
+

DeDRM_calibre_plugin/DeDRM_plugin/dialogs.py

@@ -0,0 +1,719 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+
+from __future__ import with_statement
+__license__ = 'GPL v3'
+
+# Standard Python modules.
+import os, sys, re, hashlib
+import json
+
+from PyQt4.Qt import (Qt, QWidget, QHBoxLayout, QVBoxLayout, QLabel, QListWidget, QListWidgetItem, QAbstractItemView, QLineEdit, QPushButton, QIcon, QGroupBox, QDialog, QDialogButtonBox, QUrl, QString)
+from PyQt4 import QtGui
+
+# calibre modules and constants.
+from calibre.gui2 import (error_dialog, question_dialog, info_dialog, open_url,
+                            choose_dir, choose_files)
+from calibre.utils.config import dynamic, config_dir, JSONConfig
+
+from calibre_plugins.dedrm.__init__ import PLUGIN_NAME, PLUGIN_VERSION
+from calibre_plugins.dedrm.utilities import (uStrCmp, DETAILED_MESSAGE, parseCustString)
+from calibre_plugins.dedrm.ignoblekeygen import generate_key as generate_bandn_key
+from calibre_plugins.dedrm.erdr2pml import getuser_key as generate_ereader_key
+from calibre_plugins.dedrm.adobekey import adeptkeys as retrieve_adept_keys
+from calibre_plugins.dedrm.kindlekey import kindlekeys as retrieve_kindle_keys
+
+class ManageKeysDialog(QDialog):
+    def __init__(self, parent, key_type_name, plugin_keys, create_key, keyfile_ext = u""):
+        QDialog.__init__(self,parent)
+        self.parent = parent
+        self.key_type_name = key_type_name
+        self.plugin_keys = plugin_keys
+        self.create_key = create_key
+        self.keyfile_ext = keyfile_ext
+        self.import_key = (keyfile_ext != u"")
+        self.binary_file = (key_type_name == u"Adobe Digital Editions Key")
+        self.json_file = (key_type_name == u"Kindle for Mac and PC Key")
+
+        self.setWindowTitle("{0} {1}: Manage {2}s".format(PLUGIN_NAME, PLUGIN_VERSION, self.key_type_name))
+
+        # Start Qt Gui dialog layout
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        help_layout = QHBoxLayout()
+        layout.addLayout(help_layout)
+        # Add hyperlink to a help file at the right. We will replace the correct name when it is clicked.
+        help_label = QLabel('<a href="http://www.foo.com/">Help</a>', self)
+        help_label.setTextInteractionFlags(Qt.LinksAccessibleByMouse | Qt.LinksAccessibleByKeyboard)
+        help_label.setAlignment(Qt.AlignRight)
+        help_label.linkActivated.connect(self.help_link_activated)
+        help_layout.addWidget(help_label)
+
+        keys_group_box = QGroupBox(_(u"{0}s".format(self.key_type_name)), self)
+        layout.addWidget(keys_group_box)
+        keys_group_box_layout = QHBoxLayout()
+        keys_group_box.setLayout(keys_group_box_layout)
+
+        self.listy = QListWidget(self)
+        self.listy.setToolTip(u"{0}s that will be used to decrypt ebooks".format(self.key_type_name))
+        self.listy.setSelectionMode(QAbstractItemView.SingleSelection)
+        self.populate_list()
+        keys_group_box_layout.addWidget(self.listy)
+
+        button_layout = QVBoxLayout()
+        keys_group_box_layout.addLayout(button_layout)
+        self._add_key_button = QtGui.QToolButton(self)
+        self._add_key_button.setToolTip(u"Create new {0}".format(self.key_type_name))
+        self._add_key_button.setIcon(QIcon(I('plus.png')))
+        self._add_key_button.clicked.connect(self.add_key)
+        button_layout.addWidget(self._add_key_button)
+
+        self._delete_key_button = QtGui.QToolButton(self)
+        self._delete_key_button.setToolTip(_(u"Delete highlighted key"))
+        self._delete_key_button.setIcon(QIcon(I('list_remove.png')))
+        self._delete_key_button.clicked.connect(self.delete_key)
+        button_layout.addWidget(self._delete_key_button)
+
+        if type(self.plugin_keys) == dict:
+            self._rename_key_button = QtGui.QToolButton(self)
+            self._rename_key_button.setToolTip(_(u"Rename highlighted key"))
+            self._rename_key_button.setIcon(QIcon(I('edit-select-all.png')))
+            self._rename_key_button.clicked.connect(self.rename_key)
+            button_layout.addWidget(self._rename_key_button)
+
+            self.export_key_button = QtGui.QToolButton(self)
+            self.export_key_button.setToolTip(u"Save highlighted key to a .{0} file".format(self.keyfile_ext))
+            self.export_key_button.setIcon(QIcon(I('save.png')))
+            self.export_key_button.clicked.connect(self.export_key)
+            button_layout.addWidget(self.export_key_button)
+        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        button_layout.addItem(spacerItem)
+
+        layout.addSpacing(5)
+        migrate_layout = QHBoxLayout()
+        layout.addLayout(migrate_layout)
+        if self.import_key:
+            migrate_layout.setAlignment(Qt.AlignJustify)
+            self.migrate_btn = QPushButton(u"Import Existing Keyfiles", self)
+            self.migrate_btn.setToolTip(u"Import *.{0} files (created using other tools).".format(self.keyfile_ext))
+            self.migrate_btn.clicked.connect(self.migrate_wrapper)
+            migrate_layout.addWidget(self.migrate_btn)
+        migrate_layout.addStretch()
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Close)
+        self.button_box.rejected.connect(self.close)
+        migrate_layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    def populate_list(self):
+        if type(self.plugin_keys) == dict:
+            for key in self.plugin_keys.keys():
+                self.listy.addItem(QListWidgetItem(key))
+        else:
+            for key in self.plugin_keys:
+                self.listy.addItem(QListWidgetItem(key))
+
+    def add_key(self):
+        d = self.create_key(self)
+        d.exec_()
+
+        if d.result() != d.Accepted:
+            # New key generation cancelled.
+            return
+        new_key_value = d.key_value
+        if type(self.plugin_keys) == dict:
+            if new_key_value in self.plugin_keys.values():
+                old_key_name = [name for name, value in self.plugin_keys.iteritems() if value == new_key_value][0]
+                info_dialog(None, "{0} {1}: Duplicate {2}".format(PLUGIN_NAME, PLUGIN_VERSION,self.key_type_name),
+                                    u"The new {1} is the same as the existing {1} named <strong>{0}</strong> and has not been added.".format(old_key_name,self.key_type_name), show=True)
+                return
+            self.plugin_keys[d.key_name] = new_key_value
+        else:
+            if new_key_value in self.plugin_keys:
+                info_dialog(None, "{0} {1}: Duplicate {2}".format(PLUGIN_NAME, PLUGIN_VERSION,self.key_type_name),
+                                    u"This {0} is already in the list of {0}s has not been added.".format(self.key_type_name), show=True)
+                return
+
+            self.plugin_keys.append(d.key_value)
+        self.listy.clear()
+        self.populate_list()
+
+    def rename_key(self):
+        if not self.listy.currentItem():
+            errmsg = u"No {0} selected to rename. Highlight a keyfile first.".format(self.key_type_name)
+            r = error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+            return
+
+        d = RenameKeyDialog(self)
+        d.exec_()
+
+        if d.result() != d.Accepted:
+            # rename cancelled or moot.
+            return
+        keyname = unicode(self.listy.currentItem().text().toUtf8(),'utf8')
+        if not question_dialog(self, "{0} {1}: Confirm Rename".format(PLUGIN_NAME, PLUGIN_VERSION), u"Do you really want to rename the {2} named <strong>{0}</strong> to <strong>{1}</strong>?".format(keyname,d.key_name,self.key_type_name), show_copy_button=False, default_yes=False):
+            return
+        self.plugin_keys[d.key_name] = self.plugin_keys[keyname]
+        del self.plugin_keys[keyname]
+
+        self.listy.clear()
+        self.populate_list()
+
+    def delete_key(self):
+        if not self.listy.currentItem():
+            return
+        keyname = unicode(self.listy.currentItem().text().toUtf8(), 'utf8')
+        if not question_dialog(self, "{0} {1}: Confirm Delete".format(PLUGIN_NAME, PLUGIN_VERSION), u"Do you really want to delete the {1} <strong>{0}</strong>?".format(keyname, self.key_type_name), show_copy_button=False, default_yes=False):
+            return
+        if type(self.plugin_keys) == dict:
+            del self.plugin_keys[keyname]
+        else:
+            self.plugin_keys.remove(keyname)
+
+        self.listy.clear()
+        self.populate_list()
+
+    def help_link_activated(self, url):
+        def get_help_file_resource():
+            # Copy the HTML helpfile to the plugin directory each time the
+            # link is clicked in case the helpfile is updated in newer plugins.
+            help_file_name = u"{0}_{1}_Help.htm".format(PLUGIN_NAME, self.key_type_name)
+            file_path = os.path.join(config_dir, u"plugins", u"DeDRM", u"help", help_file_name)
+            with open(file_path,'w') as f:
+                f.write(self.parent.load_resource(help_file_name))
+            return file_path
+        url = 'file:///' + get_help_file_resource()
+        open_url(QUrl(url))
+
+    def migrate_files(self):
+        dynamic[PLUGIN_NAME + u"config_dir"] = config_dir
+        files = choose_files(self, PLUGIN_NAME + u"config_dir",
+                u"Select {0} files to import".format(self.key_type_name), [(u"{0} files".format(self.key_type_name), [self.keyfile_ext])], False)
+        counter = 0
+        skipped = 0
+        if files:
+            for filename in files:
+                fpath = os.path.join(config_dir, filename)
+                filename = os.path.basename(filename)
+                new_key_name = os.path.splitext(os.path.basename(filename))[0]
+                with open(fpath,'rb') as keyfile:
+                    new_key_value = keyfile.read()
+                if self.binary_file:
+                    new_key_value = new_key_value.encode('hex')
+                elif self.json_file:
+                    new_key_value = json.loads(new_key_value)
+                match = False
+                for key in self.plugin_keys.keys():
+                    if uStrCmp(new_key_name, key, True):
+                        skipped += 1
+                        msg = u"A key with the name <strong>{0}</strong> already exists!\nSkipping key file  <strong>{1}</strong>.\nRename the existing key and import again".format(new_key_name,filename)
+                        inf = info_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                _(msg), show_copy_button=False, show=True)
+                        match = True
+                        break
+                if not match:
+                    if new_key_value in self.plugin_keys.values():
+                        old_key_name = [name for name, value in self.plugin_keys.iteritems() if value == new_key_value][0]
+                        skipped += 1
+                        info_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                            u"The key in file {0} is the same as the existing key <strong>{1}</strong> and has been skipped.".format(filename,old_key_name), show_copy_button=False, show=True)
+                    else:
+                        counter += 1
+                        self.plugin_keys[new_key_name] = new_key_value
+
+            msg = u""
+            if counter+skipped > 1:
+                if counter > 0:
+                    msg += u"Imported <strong>{0:d}</strong> key {1}. ".format(counter, u"file" if counter == 1 else u"files")
+                if skipped > 0:
+                    msg += u"Skipped <strong>{0:d}</strong> key {1}.".format(skipped, u"file" if counter == 1 else u"files")
+                inf = info_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(msg), show_copy_button=False, show=True)
+        return counter > 0
+
+    def migrate_wrapper(self):
+        if self.migrate_files():
+            self.listy.clear()
+            self.populate_list()
+
+    def export_key(self):
+        if not self.listy.currentItem():
+            errmsg = u"No keyfile selected to export. Highlight a keyfile first."
+            r = error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+            return
+        filter = QString(u"{0} Files (*.{1})".format(self.key_type_name, self.keyfile_ext))
+        keyname = unicode(self.listy.currentItem().text().toUtf8(), 'utf8')
+        if dynamic.get(PLUGIN_NAME + 'save_dir'):
+            defaultname = os.path.join(dynamic.get(PLUGIN_NAME + 'save_dir'), u"{0}.{1}".format(keyname , self.keyfile_ext))
+        else:
+            defaultname = os.path.join(os.path.expanduser('~'), u"{0}.{1}".format(keyname , self.keyfile_ext))
+        filename = unicode(QtGui.QFileDialog.getSaveFileName(self, u"Save {0} File as...".format(self.key_type_name), defaultname,
+                                            u"{0} Files (*.{1})".format(self.key_type_name,self.keyfile_ext), filter))
+        if filename:
+            dynamic[PLUGIN_NAME + 'save_dir'] = os.path.split(filename)[0]
+            with file(filename, 'w') as fname:
+                if self.binary_file:
+                    fname.write(self.plugin_keys[keyname].decode('hex'))
+                elif self.json_file:
+                    fname.write(json.dumps(self.plugin_keys[keyname]))
+                else:
+                    fname.write(self.plugin_keys[keyname])
+
+
+
+
+class RenameKeyDialog(QDialog):
+    def __init__(self, parent=None,):
+        print repr(self), repr(parent)
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle("{0} {1}: Rename {0}".format(PLUGIN_NAME, PLUGIN_VERSION, parent.key_type_name))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox('', self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        data_group_box_layout.addWidget(QLabel('New Key Name:', self))
+        self.key_ledit = QLineEdit(self.parent.listy.currentItem().text(), self)
+        self.key_ledit.setToolTip(u"Enter a new name for this existing {0}.".format(parent.key_type_name))
+        data_group_box_layout.addWidget(self.key_ledit)
+
+        layout.addSpacing(20)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    def accept(self):
+        if self.key_ledit.text().isEmpty() or unicode(self.key_ledit.text()).isspace():
+            errmsg = u"Key name field cannot be empty!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+        if len(self.key_ledit.text()) < 4:
+            errmsg = u"Key name must be at <i>least</i> 4 characters long!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+        if uStrCmp(self.key_ledit.text(), self.parent.listy.currentItem().text()):
+                # Same exact name ... do nothing.
+                return QDialog.reject(self)
+        for k in self.parent.plugin_keys.keys():
+            if (uStrCmp(self.key_ledit.text(), k, True) and
+                        not uStrCmp(k, self.parent.listy.currentItem().text(), True)):
+                errmsg = u"The key name <strong>{0}</strong> is already being used.".format(self.key_ledit.text())
+                return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(errmsg), show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+
+
+
+
+
+
+
+class AddBandNKeyDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Create New Barnes & Noble Key".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox(u"", self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"Unique Key Name:", self))
+        self.key_ledit = QLineEdit("", self)
+        self.key_ledit.setToolTip(_(u"<p>Enter an identifying name for this new key.</p>" +
+                                u"<p>It should be something that will help you remember " +
+                                u"what personal information was used to create it."))
+        key_group.addWidget(self.key_ledit)
+        key_label = QLabel(_(''), self)
+        key_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(key_label)
+
+        name_group = QHBoxLayout()
+        data_group_box_layout.addLayout(name_group)
+        name_group.addWidget(QLabel(u"Your Name:", self))
+        self.name_ledit = QLineEdit(u"", self)
+        self.name_ledit.setToolTip(_(u"<p>Enter your name as it appears in your B&N " +
+                                u"account or on your credit card.</p>" +
+                                u"<p>It will only be used to generate this " +
+                                u"one-time key and won\'t be stored anywhere " +
+                                u"in calibre or on your computer.</p>" +
+                                u"<p>(ex: Jonathan Smith)"))
+        name_group.addWidget(self.name_ledit)
+        name_disclaimer_label = QLabel(_(u"(Will not be saved in configuration data)"), self)
+        name_disclaimer_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(name_disclaimer_label)
+
+        ccn_group = QHBoxLayout()
+        data_group_box_layout.addLayout(ccn_group)
+        ccn_group.addWidget(QLabel(u"Credit Card#:", self))
+        self.cc_ledit = QLineEdit(u"", self)
+        self.cc_ledit.setToolTip(_(u"<p>Enter the full credit card number on record " +
+                                u"in your B&N account.</p>" +
+                                u"<p>No spaces or dashes... just the numbers. " +
+                                u"This number will only be used to generate this " +
+                                u"one-time key and won\'t be stored anywhere in " +
+                                u"calibre or on your computer."))
+        ccn_group.addWidget(self.cc_ledit)
+        ccn_disclaimer_label = QLabel(_('(Will not be saved in configuration data)'), self)
+        ccn_disclaimer_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(ccn_disclaimer_label)
+        layout.addSpacing(10)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return generate_bandn_key(self.user_name,self.cc_number)
+
+    @property
+    def user_name(self):
+        return unicode(self.name_ledit.text().toUtf8(), 'utf8').strip().lower().replace(' ','')
+
+    @property
+    def cc_number(self):
+        return unicode(self.cc_ledit.text().toUtf8(), 'utf8').strip().replace(' ', '').replace('-','')
+
+
+    def accept(self):
+        if len(self.key_name) == 0 or len(self.user_name) == 0 or len(self.cc_number) == 0 or self.key_name.isspace() or self.user_name.isspace() or self.cc_number.isspace():
+            errmsg = u"All fields are required!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if not self.cc_number.isdigit():
+            errmsg = u"Numbers only in the credit card number field!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) < 4:
+            errmsg = u"Key name must be at <i>least</i> 4 characters long!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+class AddEReaderDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Create New eReader Key".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox(u"", self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"Unique Key Name:", self))
+        self.key_ledit = QLineEdit("", self)
+        self.key_ledit.setToolTip(u"<p>Enter an identifying name for this new key.\nIt should be something that will help you remember what personal information was used to create it.")
+        key_group.addWidget(self.key_ledit)
+        key_label = QLabel(_(''), self)
+        key_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(key_label)
+
+        name_group = QHBoxLayout()
+        data_group_box_layout.addLayout(name_group)
+        name_group.addWidget(QLabel(u"Your Name:", self))
+        self.name_ledit = QLineEdit(u"", self)
+        self.name_ledit.setToolTip(u"Enter the name for this eReader key, usually the name on your credit card.\nIt will only be used to generate this one-time key and won\'t be stored anywhere in calibre or on your computer.\n(ex: Mr Jonathan Q Smith)")
+        name_group.addWidget(self.name_ledit)
+        name_disclaimer_label = QLabel(_(u"(Will not be saved in configuration data)"), self)
+        name_disclaimer_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(name_disclaimer_label)
+
+        ccn_group = QHBoxLayout()
+        data_group_box_layout.addLayout(ccn_group)
+        ccn_group.addWidget(QLabel(u"Credit Card#:", self))
+        self.cc_ledit = QLineEdit(u"", self)
+        self.cc_ledit.setToolTip(u"<p>Enter the last 8 digits of credit card number for this eReader key.\nThey will only be used to generate this one-time key and won\'t be stored anywhere in calibre or on your computer.")
+        ccn_group.addWidget(self.cc_ledit)
+        ccn_disclaimer_label = QLabel(_('(Will not be saved in configuration data)'), self)
+        ccn_disclaimer_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(ccn_disclaimer_label)
+        layout.addSpacing(10)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return generate_ereader_key(self.user_name,self.cc_number).encode('hex')
+
+    @property
+    def user_name(self):
+        return unicode(self.name_ledit.text().toUtf8(), 'utf8').strip().lower().replace(' ','')
+
+    @property
+    def cc_number(self):
+        return unicode(self.cc_ledit.text().toUtf8(), 'utf8').strip().replace(' ', '').replace('-','')
+
+
+    def accept(self):
+        if len(self.key_name) == 0 or len(self.user_name) == 0 or len(self.cc_number) == 0 or self.key_name.isspace() or self.user_name.isspace() or self.cc_number.isspace():
+            errmsg = u"All fields are required!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if not self.cc_number.isdigit():
+            errmsg = u"Numbers only in the credit card number field!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) < 4:
+            errmsg = u"Key name must be at <i>least</i> 4 characters long!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+
+class AddAdeptDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Getting Default Adobe Digital Editions Key".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        try:
+            self.default_key = retrieve_adept_keys()[0]
+        except:
+            self.default_key = u""
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+
+        if len(self.default_key)>0:
+            data_group_box = QGroupBox(u"", self)
+            layout.addWidget(data_group_box)
+            data_group_box_layout = QVBoxLayout()
+            data_group_box.setLayout(data_group_box_layout)
+
+            key_group = QHBoxLayout()
+            data_group_box_layout.addLayout(key_group)
+            key_group.addWidget(QLabel(u"Unique Key Name:", self))
+            self.key_ledit = QLineEdit("", self)
+            self.key_ledit.setToolTip(u"<p>Enter an identifying name for the current default Adobe Digital Editions key.")
+            key_group.addWidget(self.key_ledit)
+            key_label = QLabel(_(''), self)
+            key_label.setAlignment(Qt.AlignHCenter)
+            data_group_box_layout.addWidget(key_label)
+            self.button_box.accepted.connect(self.accept)
+        else:
+            default_key_error = QLabel(u"The default encryption key for Adobe Digital Editions could not be found.", self)
+            default_key_error.setAlignment(Qt.AlignHCenter)
+            layout.addWidget(default_key_error)
+            # if no default, bot buttons do the same
+            self.button_box.accepted.connect(self.reject)
+
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return self.default_key.encode('hex')
+
+
+    def accept(self):
+        if len(self.key_name) == 0 or self.key_name.isspace():
+            errmsg = u"All fields are required!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) < 4:
+            errmsg = u"Key name must be at <i>least</i> 4 characters long!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+
+class AddKindleDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Getting Default Kindle for Mac/PC Key".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        try:
+            self.default_key = retrieve_kindle_keys()[0]
+        except:
+            self.default_key = u""
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+
+        if len(self.default_key)>0:
+            data_group_box = QGroupBox(u"", self)
+            layout.addWidget(data_group_box)
+            data_group_box_layout = QVBoxLayout()
+            data_group_box.setLayout(data_group_box_layout)
+
+            key_group = QHBoxLayout()
+            data_group_box_layout.addLayout(key_group)
+            key_group.addWidget(QLabel(u"Unique Key Name:", self))
+            self.key_ledit = QLineEdit("", self)
+            self.key_ledit.setToolTip(u"<p>Enter an identifying name for the current default Kindle for Mac/PC key.")
+            key_group.addWidget(self.key_ledit)
+            key_label = QLabel(_(''), self)
+            key_label.setAlignment(Qt.AlignHCenter)
+            data_group_box_layout.addWidget(key_label)
+            self.button_box.accepted.connect(self.accept)
+        else:
+            default_key_error = QLabel(u"The default encryption key for Kindle for Mac/PC could not be found.", self)
+            default_key_error.setAlignment(Qt.AlignHCenter)
+            layout.addWidget(default_key_error)
+            # if no default, bot buttons do the same
+            self.button_box.accepted.connect(self.reject)
+
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return self.default_key
+
+
+    def accept(self):
+        if len(self.key_name) == 0 or self.key_name.isspace():
+            errmsg = u"All fields are required!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) < 4:
+            errmsg = u"Key name must be at <i>least</i> 4 characters long!"
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+
+class AddSerialDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Add New EInk Kindle Serial Number".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox(u"", self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"EInk Kindle Serial Number:", self))
+        self.key_ledit = QLineEdit("", self)
+        self.key_ledit.setToolTip(u"Enter an eInk Kindle serial number. EInk Kindle serial numbers are 16 characters long and usually start with a 'B' or a '9'. Kindle Serial Numbers are case-sensitive, so be sure to enter the upper and lower case letters unchanged.")
+        key_group.addWidget(self.key_ledit)
+        key_label = QLabel(_(''), self)
+        key_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(key_label)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    def accept(self):
+        if len(self.key_name) == 0 or self.key_name.isspace():
+            errmsg = u"Please enter an eInk Kindle Serial Number or click Cancel in the dialog."
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) != 16:
+            errmsg = u"EInk Kindle Serial Numbers must be 16 characters long. This is {0:d} characters long.".format(len(self.key_name))
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+
+class AddPIDDialog(QDialog):
+    def __init__(self, parent=None,):
+        QDialog.__init__(self, parent)
+        self.parent = parent
+        self.setWindowTitle(u"{0} {1}: Add New Mobipocket PID".format(PLUGIN_NAME, PLUGIN_VERSION))
+        layout = QVBoxLayout(self)
+        self.setLayout(layout)
+
+        data_group_box = QGroupBox(u"", self)
+        layout.addWidget(data_group_box)
+        data_group_box_layout = QVBoxLayout()
+        data_group_box.setLayout(data_group_box_layout)
+
+        key_group = QHBoxLayout()
+        data_group_box_layout.addLayout(key_group)
+        key_group.addWidget(QLabel(u"PID:", self))
+        self.key_ledit = QLineEdit("", self)
+        self.key_ledit.setToolTip(u"Enter a Mobipocket PID. Mobipocket PIDs are 8 or 10 characters long. Mobipocket PIDs are case-sensitive, so be sure to enter the upper and lower case letters unchanged.")
+        key_group.addWidget(self.key_ledit)
+        key_label = QLabel(_(''), self)
+        key_label.setAlignment(Qt.AlignHCenter)
+        data_group_box_layout.addWidget(key_label)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        self.resize(self.sizeHint())
+
+    @property
+    def key_name(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    @property
+    def key_value(self):
+        return unicode(self.key_ledit.text().toUtf8(), 'utf8').strip()
+
+    def accept(self):
+        if len(self.key_name) == 0 or self.key_name.isspace():
+            errmsg = u"Please enter a Mobipocket PID or click Cancel in the dialog."
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        if len(self.key_name) != 8 and len(self.key_name) != 10:
+            errmsg = u"Mobipocket PIDs must be 8 or 10 characters long. This is {0:d} characters long.".format(len(self.key_name))
+            return error_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION), errmsg, show=True, show_copy_button=False)
+        QDialog.accept(self)
+
+

DeDRM_calibre_plugin/DeDRM_plugin/ignoblekey.py

@@ -0,0 +1,335 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+# ignoblekey.py
+# Copyright © 2015 Apprentice Alf
+
+# Based on kindlekey.py, Copyright © 2010-2013 by some_updates and Apprentice Alf
+
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
+
+# Revision history:
+#   1.0 - Initial release
+
+"""
+Get Barnes & Noble EPUB user key from nook Studio log file
+"""
+
+__license__ = 'GPL v3'
+__version__ = "1.0"
+
+import sys
+import os
+import hashlib
+import getopt
+import re
+
+# Wrap a stream so that output gets flushed immediately
+# and also make sure that any unicode strings get
+# encoded using "replace" before writing them.
+class SafeUnbuffered:
+    def __init__(self, stream):
+        self.stream = stream
+        self.encoding = stream.encoding
+        if self.encoding == None:
+            self.encoding = "utf-8"
+    def write(self, data):
+        if isinstance(data,unicode):
+            data = data.encode(self.encoding,"replace")
+        self.stream.write(data)
+        self.stream.flush()
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.  So use shell32.GetCommandLineArgvW to get sys.argv
+        # as a list of Unicode strings and encode them as utf-8
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"ignoblekey.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+class DrmException(Exception):
+    pass
+
+# Locate all of the nookStudy/nook for PC/Mac log file and return as list
+def getNookLogFiles():
+    logFiles = []
+    found = False
+    if iswindows:
+        import _winreg as winreg
+
+        # some 64 bit machines do not have the proper registry key for some reason
+        # or the python interface to the 32 vs 64 bit registry is broken
+        paths = set()
+        if 'LOCALAPPDATA' in os.environ.keys():
+            # Python 2.x does not return unicode env. Use Python 3.x
+            path = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
+            if os.path.isdir(path):
+                paths.add(path)
+        if 'USERPROFILE' in os.environ.keys():
+            # Python 2.x does not return unicode env. Use Python 3.x
+            path = winreg.ExpandEnvironmentStrings(u"%USERPROFILE%")+u"\\AppData\\Local"
+            if os.path.isdir(path):
+                paths.add(path)
+            path = winreg.ExpandEnvironmentStrings(u"%USERPROFILE%")+u"\\AppData\\Roaming"
+            if os.path.isdir(path):
+                paths.add(path)
+        # User Shell Folders show take precedent over Shell Folders if present
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+ 
+        for path in paths:
+            # look for nookStudy log file
+            logpath = path +'\\Barnes & Noble\\NOOKstudy\\logs\\BNClientLog.txt'
+            if os.path.isfile(logpath):
+                found = True
+                print('Found nookStudy log file: ' + logpath.encode('ascii','ignore'))
+                logFiles.append(logpath)
+    else:
+        home = os.getenv('HOME')
+        # check for BNClientLog.txt in various locations
+        testpath = home + '/Library/Application Support/Barnes & Noble/DesktopReader/logs/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/DesktopReader/indices/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/BNDesktopReader/logs/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/BNDesktopReader/indices/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+
+    if not found:
+        print('No nook Study log files have been found.')
+    return logFiles
+
+
+# Extract CCHash key(s) from log file
+def getKeysFromLog(kLogFile):
+    keys = []
+    regex = re.compile("ccHash: \"(.{28})\"");
+    for line in open(kLogFile):
+        for m in regex.findall(line):
+            keys.append(m)
+    return keys
+
+# interface for calibre plugin
+def nookkeys(files = []):
+    keys = []
+    if files == []:
+        files = getNookLogFiles()
+    for file in files:
+        fileKeys = getKeysFromLog(file)
+        if fileKeys:
+            print u"Found {0} keys in the Nook Study log files".format(len(fileKeys))
+            keys.extend(fileKeys)
+    return keys
+
+# interface for Python DeDRM
+# returns single key or multiple keys, depending on path or file passed in
+def getkey(outpath, files=[]):
+    keys = nookkeys(files)
+    if len(keys) > 0:
+        if not os.path.isdir(outpath):
+            outfile = outpath
+            with file(outfile, 'w') as keyfileout:
+                keyfileout.write(keys[0])
+            print u"Saved a key to {0}".format(outfile)
+        else:
+            keycount = 0
+            for key in keys:
+                while True:
+                    keycount += 1
+                    outfile = os.path.join(outpath,u"nookkey{0:d}.b64".format(keycount))
+                    if not os.path.exists(outfile):
+                        break
+                with file(outfile, 'w') as keyfileout:
+                    keyfileout.write(key)
+                print u"Saved a key to {0}".format(outfile)
+        return True
+    return False
+
+def usage(progname):
+    print u"Finds the nook Study encryption keys."
+    print u"Keys are saved to the current directory, or a specified output directory."
+    print u"If a file name is passed instead of a directory, only the first key is saved, in that file."
+    print u"Usage:"
+    print u"    {0:s} [-h] [-k <logFile>] [<outpath>]".format(progname)
+
+
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
+    progname = os.path.basename(argv[0])
+    print u"{0} v{1}\nCopyright © 2015 Apprentice Alf".format(progname,__version__)
+
+    try:
+        opts, args = getopt.getopt(argv[1:], "hk:")
+    except getopt.GetoptError, err:
+        print u"Error in options or arguments: {0}".format(err.args[0])
+        usage(progname)
+        sys.exit(2)
+
+    files = []
+    for o, a in opts:
+        if o == "-h":
+            usage(progname)
+            sys.exit(0)
+        if o == "-k":
+            files = [a]
+
+    if len(args) > 1:
+        usage(progname)
+        sys.exit(2)
+
+    if len(args) == 1:
+        # save to the specified file or directory
+        outpath = args[0]
+        if not os.path.isabs(outpath):
+           outpath = os.path.abspath(outpath)
+    else:
+        # save to the same directory as the script
+        outpath = os.path.dirname(argv[0])
+
+    # make sure the outpath is the
+    outpath = os.path.realpath(os.path.normpath(outpath))
+
+    if not getkey(outpath, files):
+        print u"Could not retrieve nook Study key."
+    return 0
+
+
+def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import traceback
+    except:
+        return cli_main()
+
+    class ExceptionDialog(Tkinter.Frame):
+        def __init__(self, root, text):
+            Tkinter.Frame.__init__(self, root, border=5)
+            label = Tkinter.Label(self, text=u"Unexpected error:",
+                                  anchor=Tkconstants.W, justify=Tkconstants.LEFT)
+            label.pack(fill=Tkconstants.X, expand=0)
+            self.text = Tkinter.Text(self)
+            self.text.pack(fill=Tkconstants.BOTH, expand=1)
+
+            self.text.insert(Tkconstants.END, text)
+
+
+    argv=unicode_argv()
+    root = Tkinter.Tk()
+    root.withdraw()
+    progpath, progname = os.path.split(argv[0])
+    success = False
+    try:
+        keys = nookkeys()
+        keycount = 0
+        for key in keys:
+            print key
+            while True:
+                keycount += 1
+                outfile = os.path.join(progpath,u"nookkey{0:d}.b64".format(keycount))
+                if not os.path.exists(outfile):
+                    break
+
+            with file(outfile, 'w') as keyfileout:
+                keyfileout.write(key)
+            success = True
+            tkMessageBox.showinfo(progname, u"Key successfully retrieved to {0}".format(outfile))
+    except DrmException, e:
+        tkMessageBox.showerror(progname, u"Error: {0}".format(str(e)))
+    except Exception:
+        root.wm_state('normal')
+        root.title(progname)
+        text = traceback.format_exc()
+        ExceptionDialog(root, text).pack(fill=Tkconstants.BOTH, expand=1)
+        root.mainloop()
+    if not success:
+        return 1
+    return 0
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        sys.exit(cli_main())
+    sys.exit(gui_main())

DeDRM_calibre_plugin/DeDRM_plugin/ineptepub.py

@@ -37,13 +37,14 @@ from __future__ import with_statement
 #   5.9 - Fixed to retain zip file metadata (e.g. file modification date)
 #   6.0 - moved unicode_argv call inside main for Windows DeDRM compatibility
 #   6.1 - Work if TkInter is missing
+#   6.2 - Handle UTF-8 file names inside an ePub, fix by Jose Luis
 
 """
 Decrypt Adobe Digital Editions encrypted ePub books.
 """
 
 __license__ = 'GPL v3'
-__version__ = "6.1"
+__version__ = "6.2"
 
 import sys
 import os
@@ -366,7 +367,7 @@ class Decryptor(object):
         return bytes
 
     def decrypt(self, path, data):
-        if path in self._encrypted:
+        if path.encode('utf-8') in self._encrypted:
             data = self._aes.decrypt(data)[16:]
             data = data[:-ord(data[-1])]
             data = self.decompress(data)

DeDRM_calibre_plugin/DeDRM_plugin/scriptinterface.py

@@ -0,0 +1,176 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+import sys
+import os
+import re
+import ineptepub
+import ignobleepub
+import epubtest
+import zipfix
+import ineptpdf
+import erdr2pml
+import k4mobidedrm
+import traceback
+
+def decryptepub(infile, outdir, rscpath):
+    errlog = ''
+
+    # first fix the epub to make sure we do not get errors
+    name, ext = os.path.splitext(os.path.basename(infile))
+    bpath = os.path.dirname(infile)
+    zippath = os.path.join(bpath,name + '_temp.zip')
+    rv = zipfix.repairBook(infile, zippath)
+    if rv != 0:
+        print "Error while trying to fix epub"
+        return rv
+
+    # determine a good name for the output file
+    outfile = os.path.join(outdir, name + '_nodrm.epub')
+
+    rv = 1
+    # first try with the Adobe adept epub
+    if  ineptepub.adeptBook(zippath):
+        # try with any keyfiles (*.der) in the rscpath
+        files = os.listdir(rscpath)
+        filefilter = re.compile("\.der$", re.IGNORECASE)
+        files = filter(filefilter.search, files)
+        if files:
+            for filename in files:
+                keypath = os.path.join(rscpath, filename)
+                userkey = open(keypath,'rb').read()
+                try:
+                    rv = ineptepub.decryptBook(userkey, zippath, outfile)
+                    if rv == 0:
+                        print "Decrypted Adobe ePub with key file {0}".format(filename)
+                        break
+                except Exception, e:
+                    errlog += traceback.format_exc()
+                    errlog += str(e)
+                    rv = 1
+    # now try with ignoble epub
+    elif  ignobleepub.ignobleBook(zippath):
+        # try with any keyfiles (*.b64) in the rscpath
+        files = os.listdir(rscpath)
+        filefilter = re.compile("\.b64$", re.IGNORECASE)
+        files = filter(filefilter.search, files)
+        if files:
+            for filename in files:
+                keypath = os.path.join(rscpath, filename)
+                userkey = open(keypath,'r').read()
+                #print userkey
+                try:
+                    rv = ignobleepub.decryptBook(userkey, zippath, outfile)
+                    if rv == 0:
+                        print "Decrypted B&N ePub with key file {0}".format(filename)
+                        break
+                except Exception, e:
+                    errlog += traceback.format_exc()
+                    errlog += str(e)
+                    rv = 1
+    else:
+        encryption = epubtest.encryption(zippath)
+        if encryption == "Unencrypted":
+            print "{0} is not DRMed.".format(name)
+            rv = 0
+        else:
+            print "{0} has an unknown encryption.".format(name)
+
+    os.remove(zippath)
+    if rv != 0:
+        print errlog
+    return rv
+
+
+def decryptpdf(infile, outdir, rscpath):
+    errlog = ''
+    rv = 1
+
+    # determine a good name for the output file
+    name, ext = os.path.splitext(os.path.basename(infile))
+    outfile = os.path.join(outdir, name + '_nodrm.pdf')
+
+    # try with any keyfiles (*.der) in the rscpath
+    files = os.listdir(rscpath)
+    filefilter = re.compile("\.der$", re.IGNORECASE)
+    files = filter(filefilter.search, files)
+    if files:
+        for filename in files:
+            keypath = os.path.join(rscpath, filename)
+            userkey = open(keypath,'rb').read()
+            try:
+                rv = ineptpdf.decryptBook(userkey, infile, outfile)
+                if rv == 0:
+                    break
+            except Exception, e:
+                errlog += traceback.format_exc()
+                errlog += str(e)
+                rv = 1
+
+    if rv != 0:
+        print errlog
+    return rv
+
+
+def decryptpdb(infile, outdir, rscpath):
+    outname = os.path.splitext(os.path.basename(infile))[0] + ".pmlz"
+    outpath = os.path.join(outdir, outname)
+    rv = 1
+    socialpath = os.path.join(rscpath,'sdrmlist.txt')
+    if os.path.exists(socialpath):
+        keydata = file(socialpath,'r').read()
+        keydata = keydata.rstrip(os.linesep)
+        ar = keydata.split(',')
+        for i in ar:
+            try:
+                name, cc8 = i.split(':')
+            except ValueError:
+                print '   Error parsing user supplied social drm data.'
+                return 1
+            try:
+                rv = erdr2pml.decryptBook(infile, outpath, True, erdr2pml.getuser_key(name, cc8))
+            except Exception, e:
+                errlog += traceback.format_exc()
+                errlog += str(e)
+                rv = 1
+
+            if rv == 0:
+                break
+    return rv
+
+
+def decryptk4mobi(infile, outdir, rscpath):
+    rv = 1
+    pidnums = []
+    pidspath = os.path.join(rscpath,'pidlist.txt')
+    if os.path.exists(pidspath):
+        pidstr = file(pidspath,'r').read()
+        pidstr = pidstr.rstrip(os.linesep)
+        pidstr = pidstr.strip()
+        if pidstr != '':
+            pidnums = pidstr.split(',')
+    serialnums = []
+    serialnumspath = os.path.join(rscpath,'seriallist.txt')
+    if os.path.exists(serialnumspath):
+        serialstr = file(serialnumspath,'r').read()
+        serialstr = serialstr.rstrip(os.linesep)
+        serialstr = serialstr.strip()
+        if serialstr != '':
+            serialnums = serialstr.split(',')
+    kDatabaseFiles = []
+    files = os.listdir(rscpath)
+    filefilter = re.compile("\.k4i$", re.IGNORECASE)
+    files = filter(filefilter.search, files)
+    if files:
+        for filename in files:
+            dpath = os.path.join(rscpath,filename)
+            kDatabaseFiles.append(dpath)
+    try:
+        rv = k4mobidedrm.decryptBook(infile, outdir, kDatabaseFiles, serialnums, pidnums)
+    except Exception, e:
+        errlog += traceback.format_exc()
+        errlog += str(e)
+        rv = 1
+
+    return rv

DeDRM_calibre_plugin/DeDRM_plugin/scrolltextwidget.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+import Tkinter
+import Tkconstants
+
+# basic scrolled text widget
+class ScrolledText(Tkinter.Text):
+    def __init__(self, master=None, **kw):
+        self.frame = Tkinter.Frame(master)
+        self.vbar = Tkinter.Scrollbar(self.frame)
+        self.vbar.pack(side=Tkconstants.RIGHT, fill=Tkconstants.Y)
+        kw.update({'yscrollcommand': self.vbar.set})
+        Tkinter.Text.__init__(self, self.frame, **kw)
+        self.pack(side=Tkconstants.LEFT, fill=Tkconstants.BOTH, expand=True)
+        self.vbar['command'] = self.yview
+        # Copy geometry methods of self.frame without overriding Text
+        # methods = hack!
+        text_meths = vars(Tkinter.Text).keys()
+        methods = vars(Tkinter.Pack).keys() + vars(Tkinter.Grid).keys() + vars(Tkinter.Place).keys()
+        methods = set(methods).difference(text_meths)
+        for m in methods:
+            if m[0] != '_' and m != 'config' and m != 'configure':
+                setattr(self, m, getattr(self.frame, m))
+
+    def __str__(self):
+        return str(self.frame)

DeDRM_calibre_plugin/DeDRM_plugin/simpleprefs.py

@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
+
+import sys
+import os, os.path
+import shutil
+
+class SimplePrefsError(Exception):
+    pass
+
+class SimplePrefs(object):
+    def __init__(self, target, description):
+        self.prefs = {}
+        self.key2file={}
+        self.file2key={}
+        for keyfilemap in description:
+            [key, filename] = keyfilemap
+            self.key2file[key] = filename
+            self.file2key[filename] = key
+        self.target = target + 'Prefs'
+        if sys.platform.startswith('win'):
+            import _winreg as winreg
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            prefdir = path + os.sep + self.target
+        elif sys.platform.startswith('darwin'):
+            home = os.getenv('HOME')
+            prefdir = os.path.join(home,'Library','Preferences','org.' + self.target)
+        else:
+            # linux and various flavors of unix
+            home = os.getenv('HOME')
+            prefdir = os.path.join(home,'.' + self.target)
+        if not os.path.exists(prefdir):
+            os.makedirs(prefdir)
+        self.prefdir = prefdir
+        self.prefs['dir'] = self.prefdir
+        self._loadPreferences()
+
+    def _loadPreferences(self):
+        filenames = os.listdir(self.prefdir)
+        for filename in filenames:
+            if filename in self.file2key:
+                key = self.file2key[filename]
+                filepath = os.path.join(self.prefdir,filename)
+                if os.path.isfile(filepath):
+                    try :
+                        data = file(filepath,'rb').read()
+                        self.prefs[key] = data
+                    except Exception, e:
+                        pass
+
+    def getPreferences(self):
+        return self.prefs
+
+    def setPreferences(self, newprefs={}):
+        if 'dir' not in newprefs:
+            raise SimplePrefsError('Error: Attempt to Set Preferences in unspecified directory')
+        if newprefs['dir'] != self.prefs['dir']:
+            raise SimplePrefsError('Error: Attempt to Set Preferences in unspecified directory')
+        for key in newprefs:
+            if key != 'dir':
+                if key in self.key2file:
+                    filename = self.key2file[key]
+                    filepath = os.path.join(self.prefdir,filename)
+                    data = newprefs[key]
+                    if data != None:
+                        data = str(data)
+                    if data == None or data == '':
+                        if os.path.exists(filepath):
+                            os.remove(filepath)
+                    else:
+                        try:
+                            file(filepath,'wb').write(data)
+                        except Exception, e:
+                            pass
+        self.prefs = newprefs
+        return

DeDRM_calibre_plugin/DeDRM_plugin_ReadMe.txt

@@ -1,19 +1,19 @@
-DeDRM_plugin.zip
+DeDRM_plugin.zip
 ================
 
-This calibre plugin replaces all previous DRM removal plugins. When you install this plugin, the older separate plugins should be removed.
+This calibre plugin replaces all previous DRM removal plugins. Before you install this plugin, you should uninstall any older individual DRM removal plugins, e.g. K4MobiDeDRM.
 
-This plugin will remove the DRM from Amazon Kindle ebooks (Mobi, KF8, Topaz and Print Replica), Mobipocket, Adobe Digital Edition ePubs (including Sony and Kobo ePubs), Barnes and Noble ePubs, Adobe Digital Edition PDFs, and Fictionwise eReader ebooks.
+This plugin will remove the DRM from Amazon Kindle ebooks (Mobi, KF8, Topaz and Print Replica), Mobipocket, Adobe Digital Edition ePubs (including Sony and Kobo ePubs), Barnes and Noble (nook) ePubs, Adobe Digital Edition PDFs, and Fictionwise eReader ebooks.
 
 
 Installation
 ------------
-Do NOT select "Get plugins to enhance calibre" as this is reserved for 'official' calibre plugins, instead select "Change calibre behavior" to go to Calibre's Preferences page.  Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file (DeDRM_plugin.zip) and click the "Add" button. Click "Yes" in the the "Are you sure?" dialog. Click OK in the "Success" dialog.
+From the Preferences menu, do NOT select "Get plugins to enhance calibre" as this is reserved for 'official' calibre plugins. Instead select "Change calibre behavior" to go to Calibre's Preferences page.  Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file (DeDRM_plugin.zip) and click the "Add" button. Click "Yes" in the the "Are you sure?" dialog. Click OK in the "Success" dialog.
 
 
 Customization
 -------------
-The keys for ebooks downloaded using Kindle for Mac/PC and Adobe Digital Editions are automatically generated and saved when needed. If all your DRMed ebooks can be opened and read in Kindle for Mac/PC or Adobe Digital Editions on the same computer on which you are running calibre, you do not need to do any configuration of this plugin. (On Linux, Kindle for PC and Adobe Digital Editions along with Python and PyCrypto need to be installed under Wine for this to work, see the Linux section at the end.)
+The keys for ebooks downloaded using Kindle for Mac/PC, Adobe Digital Editions and NOOK Study are automatically generated and saved when needed. If all your DRMed ebooks can be downloaded and read in Kindle for Mac/PC, Adobe Digital Editions or NOOK Study on the same computer and user account on which you are running calibre, you do not need to do add any customisation data to this plugin. (Linux users should see the Linux section at the end of this ReadMe.)
 
 If you have books from other sources (e.g. from an eInk Kindle), highlight the plugin (DeDRM under the "File type plugins" category) and click the "Customize Plugin" button.
 
@@ -26,21 +26,19 @@ When you have finished entering your configuration information, you must click t
 
 Troubleshooting
 ---------------
-If you find that it's not working for you (imported ebooks still have DRM), you can save a lot of time and trouble by deleting the DRMed ebook from calibre and then trying to add the ebook to calibre in debug mode with the command line tools. This will print out a lot of helpful debugging info that can be copied into any online help requests.
+If you find that it's not working for you (imported ebooks still have DRM - that is, they won't convert or open in the calibre ebook viewer), you should make a log of import process by deleting the DRMed ebook from calibre and then adding the ebook to calibre when it's running in debug mode. This will generate a lot of helpful debugging info that can be copied into any online help requests. Here's how to do it:
 
-On Macintosh only you must first run calibre, open Preferences, open Miscellaneous, and click on the “Install command line tools” button. (On Windows and Linux the command line tools are installed automatically.)
-
-On Windows, open a terminal/command window. (Start/Run… and then type 'cmd' (without the 's) as the program to run).
+On Windows, open a terminal/command window. (Start/Run… and then type 'cmd.exe' (without the 's) as the program to run).
 On Macintosh, open the Terminal application (in your Utilities folder).
 On Linux open a command window. Hopefully all Linux users know how to do this.
 
 You should now have a text-based command-line window open.
 
-Type in "calibre-debug -g" (without the ") and press the return/enter key. Calibre will launch and run as normal, but with debugging information output to the terminal window.
+Type in "calibre-debug -g" (without the "s but with the space before the -g) and press the return/enter key. Calibre will launch and run as normal, but with debugging information output to the terminal window.
 
-Import the drmed eBook into calibre in any of the the normal ways. (I usually drag&drop onto the calibre window.)
+Import the DRMed eBook into calibre in any of the the normal ways. (I usually drag&drop onto the calibre window.)
 
-More debug information will be written to the terminal window.
+Debug information will be written to the terminal window.
 
 Copy the output from the terminal window.
 On Windows, you must use the window menu (little icon at left of window bar) to select all the text and then to copy it.
@@ -51,15 +49,18 @@ Paste the information into a comment at my blog, http://apprenticealf.wordpress.
 
 Credits
 -------
-The mobidedrm and erdr2pml scripts were created by The Dark Reverser
-The ignobleepub, ignoblekeygen, ineptepub and adobe key scripts were created by i♥cabbages
-The k4mobidedrm script and supporting scripts were written by some_updates with help from DiapDealer and Apprentice Alf, based on code by Bart Simpson (aka Skindle), CMBDTC and clarknova
-The alfcrypto library was created by some_updates
-The ePub encryption detection script was adapted by Apprentice Alf from a script by Paul Durrant
-The DeDRM all-in-one AppleScript was created by Apprentice Alf
-The DeDRM all-in-one python script was created by some_updates and Apprentice Alf
+The original inept and ignoble scripts were by i♥cabbages
+The original mobidedrm and erdr2pml scripts were by The Dark Reverser
+The original topaz DRM removal script was by CMBDTC
+The original topaz format conversion scripts were by some_updates, clarknova and Bart Simpson
+The original obok script was by Physisticated
 
+The alfcrypto library is by some_updates
+The ePub encryption detection script is by Apprentice Alf, adapted from a script by Paul Durrant
+The ignoblekey script is by Apprentice Harper
+The DeDRM plugin was based on plugins by DiapDealer and is maintained by Apprentice Alf and Apprentice Harper
 
+Many fixes, updates and enhancements to the scripts and applicatons have been made by many other people. For more details, see the commments in the individual scripts.
 
 
 Linux Systems Only

Obok_calibre_plugin/obok_plugin_ReadMe.txt

@@ -0,0 +1,52 @@
+obok_plugin.zip
+================
+
+This plugin will remove the DRM from Kobo ebooks download on Mac or Windows using the Kobo desktop application.
+
+
+Installation
+------------
+Do NOT select "Get plugins to enhance calibre" as this is reserved for 'official' calibre plugins, instead select "Change calibre behavior" to go to Calibre's Preferences page.  Under "Advanced" click on the Plugins button. Use the "Load plugin from file" button to select the plugin's zip file (obok_plugin.zip) and click the "Add" button. Click "Yes" in the the "Are you sure?" dialog. Click OK in the "Success" dialog.
+
+
+Customization
+-------------
+No customization is required, except choosing which menus will show the plugin.
+
+
+Using the plugin
+----------------
+
+Select the plugin's menu or icon from whichever part of the calibre interface you have chosen to have it. Follow the instructions in the dialog that appears.
+
+
+Troubleshooting
+---------------
+If you find that it's not working for you (imported ebooks still have DRM - that is, they won't convert or open in the calibre ebook viewer), you should make a log of import process by deleting the DRMed ebook from calibre and then adding the ebook to calibre when it's running in debug mode. This will generate a lot of helpful debugging info that can be copied into any online help requests. Here's how to do it:
+
+On Windows, open a terminal/command window. (Start/Run… and then type 'cmd.exe' (without the 's) as the program to run).
+On Macintosh, open the Terminal application (in your Utilities folder).
+On Linux open a command window. Hopefully all Linux users know how to do this.
+
+You should now have a text-based command-line window open.
+
+Type in "calibre-debug -g" (without the "s but with the space before the -g) and press the return/enter key. Calibre will launch and run as normal, but with debugging information output to the terminal window.
+
+Import the DRMed eBook into calibre in any of the the normal ways. (I usually drag&drop onto the calibre window.)
+
+Debug information will be written to the terminal window.
+
+Copy the output from the terminal window.
+On Windows, you must use the window menu (little icon at left of window bar) to select all the text and then to copy it.
+On Macintosh and Linux, just use the normal text select and copy commands.
+
+Paste the information into a comment at my blog, http://apprenticealf.wordpress.com/ describing your problem.
+
+
+Credits
+-------
+The original obok script was by Physisticated
+The plugin conversion was done anonymously.
+
+Improvements to the script and the plugin adaption have been by numerous people since.
+

Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw

@@ -0,0 +1,335 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+# ignoblekey.py
+# Copyright © 2015 Apprentice Alf
+
+# Based on kindlekey.py, Copyright © 2010-2013 by some_updates and Apprentice Alf
+
+# Released under the terms of the GNU General Public Licence, version 3
+# <http://www.gnu.org/licenses/>
+
+# Revision history:
+#   1.0 - Initial release
+
+"""
+Get Barnes & Noble EPUB user key from nook Studio log file
+"""
+
+__license__ = 'GPL v3'
+__version__ = "1.0"
+
+import sys
+import os
+import hashlib
+import getopt
+import re
+
+# Wrap a stream so that output gets flushed immediately
+# and also make sure that any unicode strings get
+# encoded using "replace" before writing them.
+class SafeUnbuffered:
+    def __init__(self, stream):
+        self.stream = stream
+        self.encoding = stream.encoding
+        if self.encoding == None:
+            self.encoding = "utf-8"
+    def write(self, data):
+        if isinstance(data,unicode):
+            data = data.encode(self.encoding,"replace")
+        self.stream.write(data)
+        self.stream.flush()
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
+
+try:
+    from calibre.constants import iswindows, isosx
+except:
+    iswindows = sys.platform.startswith('win')
+    isosx = sys.platform.startswith('darwin')
+
+def unicode_argv():
+    if iswindows:
+        # Uses shell32.GetCommandLineArgvW to get sys.argv as a list of Unicode
+        # strings.
+
+        # Versions 2.x of Python don't support Unicode in sys.argv on
+        # Windows, with the underlying Windows API instead replacing multi-byte
+        # characters with '?'.  So use shell32.GetCommandLineArgvW to get sys.argv
+        # as a list of Unicode strings and encode them as utf-8
+
+        from ctypes import POINTER, byref, cdll, c_int, windll
+        from ctypes.wintypes import LPCWSTR, LPWSTR
+
+        GetCommandLineW = cdll.kernel32.GetCommandLineW
+        GetCommandLineW.argtypes = []
+        GetCommandLineW.restype = LPCWSTR
+
+        CommandLineToArgvW = windll.shell32.CommandLineToArgvW
+        CommandLineToArgvW.argtypes = [LPCWSTR, POINTER(c_int)]
+        CommandLineToArgvW.restype = POINTER(LPWSTR)
+
+        cmd = GetCommandLineW()
+        argc = c_int(0)
+        argv = CommandLineToArgvW(cmd, byref(argc))
+        if argc.value > 0:
+            # Remove Python executable and commands if present
+            start = argc.value - len(sys.argv)
+            return [argv[i] for i in
+                    xrange(start, argc.value)]
+        # if we don't have any arguments at all, just pass back script name
+        # this should never happen
+        return [u"ignoblekey.py"]
+    else:
+        argvencoding = sys.stdin.encoding
+        if argvencoding == None:
+            argvencoding = "utf-8"
+        return [arg if (type(arg) == unicode) else unicode(arg,argvencoding) for arg in sys.argv]
+
+class DrmException(Exception):
+    pass
+
+# Locate all of the nookStudy/nook for PC/Mac log file and return as list
+def getNookLogFiles():
+    logFiles = []
+    found = False
+    if iswindows:
+        import _winreg as winreg
+
+        # some 64 bit machines do not have the proper registry key for some reason
+        # or the python interface to the 32 vs 64 bit registry is broken
+        paths = set()
+        if 'LOCALAPPDATA' in os.environ.keys():
+            # Python 2.x does not return unicode env. Use Python 3.x
+            path = winreg.ExpandEnvironmentStrings(u"%LOCALAPPDATA%")
+            if os.path.isdir(path):
+                paths.add(path)
+        if 'USERPROFILE' in os.environ.keys():
+            # Python 2.x does not return unicode env. Use Python 3.x
+            path = winreg.ExpandEnvironmentStrings(u"%USERPROFILE%")+u"\\AppData\\Local"
+            if os.path.isdir(path):
+                paths.add(path)
+            path = winreg.ExpandEnvironmentStrings(u"%USERPROFILE%")+u"\\AppData\\Roaming"
+            if os.path.isdir(path):
+                paths.add(path)
+        # User Shell Folders show take precedent over Shell Folders if present
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+        try:
+            regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
+            path = winreg.QueryValueEx(regkey, 'AppData')[0]
+            if os.path.isdir(path):
+                paths.add(path)
+        except WindowsError:
+            pass
+ 
+        for path in paths:
+            # look for nookStudy log file
+            logpath = path +'\\Barnes & Noble\\NOOKstudy\\logs\\BNClientLog.txt'
+            if os.path.isfile(logpath):
+                found = True
+                print('Found nookStudy log file: ' + logpath.encode('ascii','ignore'))
+                logFiles.append(logpath)
+    else:
+        home = os.getenv('HOME')
+        # check for BNClientLog.txt in various locations
+        testpath = home + '/Library/Application Support/Barnes & Noble/DesktopReader/logs/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/DesktopReader/indices/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/BNDesktopReader/logs/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+        testpath = home + '/Library/Application Support/Barnes & Noble/BNDesktopReader/indices/BNClientLog.txt'
+        if os.path.isfile(testpath):
+            logFiles.append(testpath)
+            print('Found nookStudy log file: ' + testpath)
+            found = True
+
+    if not found:
+        print('No nook Study log files have been found.')
+    return logFiles
+
+
+# Extract CCHash key(s) from log file
+def getKeysFromLog(kLogFile):
+    keys = []
+    regex = re.compile("ccHash: \"(.{28})\"");
+    for line in open(kLogFile):
+        for m in regex.findall(line):
+            keys.append(m)
+    return keys
+
+# interface for calibre plugin
+def nookkeys(files = []):
+    keys = []
+    if files == []:
+        files = getNookLogFiles()
+    for file in files:
+        fileKeys = getKeysFromLog(file)
+        if fileKeys:
+            print u"Found {0} keys in the Nook Study log files".format(len(fileKeys))
+            keys.extend(fileKeys)
+    return keys
+
+# interface for Python DeDRM
+# returns single key or multiple keys, depending on path or file passed in
+def getkey(outpath, files=[]):
+    keys = nookkeys(files)
+    if len(keys) > 0:
+        if not os.path.isdir(outpath):
+            outfile = outpath
+            with file(outfile, 'w') as keyfileout:
+                keyfileout.write(keys[0])
+            print u"Saved a key to {0}".format(outfile)
+        else:
+            keycount = 0
+            for key in keys:
+                while True:
+                    keycount += 1
+                    outfile = os.path.join(outpath,u"nookkey{0:d}.b64".format(keycount))
+                    if not os.path.exists(outfile):
+                        break
+                with file(outfile, 'w') as keyfileout:
+                    keyfileout.write(key)
+                print u"Saved a key to {0}".format(outfile)
+        return True
+    return False
+
+def usage(progname):
+    print u"Finds the nook Study encryption keys."
+    print u"Keys are saved to the current directory, or a specified output directory."
+    print u"If a file name is passed instead of a directory, only the first key is saved, in that file."
+    print u"Usage:"
+    print u"    {0:s} [-h] [-k <logFile>] [<outpath>]".format(progname)
+
+
+def cli_main():
+    sys.stdout=SafeUnbuffered(sys.stdout)
+    sys.stderr=SafeUnbuffered(sys.stderr)
+    argv=unicode_argv()
+    progname = os.path.basename(argv[0])
+    print u"{0} v{1}\nCopyright © 2015 Apprentice Alf".format(progname,__version__)
+
+    try:
+        opts, args = getopt.getopt(argv[1:], "hk:")
+    except getopt.GetoptError, err:
+        print u"Error in options or arguments: {0}".format(err.args[0])
+        usage(progname)
+        sys.exit(2)
+
+    files = []
+    for o, a in opts:
+        if o == "-h":
+            usage(progname)
+            sys.exit(0)
+        if o == "-k":
+            files = [a]
+
+    if len(args) > 1:
+        usage(progname)
+        sys.exit(2)
+
+    if len(args) == 1:
+        # save to the specified file or directory
+        outpath = args[0]
+        if not os.path.isabs(outpath):
+           outpath = os.path.abspath(outpath)
+    else:
+        # save to the same directory as the script
+        outpath = os.path.dirname(argv[0])
+
+    # make sure the outpath is the
+    outpath = os.path.realpath(os.path.normpath(outpath))
+
+    if not getkey(outpath, files):
+        print u"Could not retrieve nook Study key."
+    return 0
+
+
+def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+        import traceback
+    except:
+        return cli_main()
+
+    class ExceptionDialog(Tkinter.Frame):
+        def __init__(self, root, text):
+            Tkinter.Frame.__init__(self, root, border=5)
+            label = Tkinter.Label(self, text=u"Unexpected error:",
+                                  anchor=Tkconstants.W, justify=Tkconstants.LEFT)
+            label.pack(fill=Tkconstants.X, expand=0)
+            self.text = Tkinter.Text(self)
+            self.text.pack(fill=Tkconstants.BOTH, expand=1)
+
+            self.text.insert(Tkconstants.END, text)
+
+
+    argv=unicode_argv()
+    root = Tkinter.Tk()
+    root.withdraw()
+    progpath, progname = os.path.split(argv[0])
+    success = False
+    try:
+        keys = nookkeys()
+        keycount = 0
+        for key in keys:
+            print key
+            while True:
+                keycount += 1
+                outfile = os.path.join(progpath,u"nookkey{0:d}.b64".format(keycount))
+                if not os.path.exists(outfile):
+                    break
+
+            with file(outfile, 'w') as keyfileout:
+                keyfileout.write(key)
+            success = True
+            tkMessageBox.showinfo(progname, u"Key successfully retrieved to {0}".format(outfile))
+    except DrmException, e:
+        tkMessageBox.showerror(progname, u"Error: {0}".format(str(e)))
+    except Exception:
+        root.wm_state('normal')
+        root.title(progname)
+        text = traceback.format_exc()
+        ExceptionDialog(root, text).pack(fill=Tkconstants.BOTH, expand=1)
+        root.mainloop()
+    if not success:
+        return 1
+    return 0
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        sys.exit(cli_main())
+    sys.exit(gui_main())

Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/Notes on the Patch.txt

@@ -0,0 +1,11 @@
+Notes from UE01 about this patch:
+
+1. Revised the “Other_Tools/Kindle_for_Android_Patches/” for Kindle 4.8.1.10
+2. Built Kindle 4.8.1.10 with the PID List added to the About activity
+3. Uninstalled the Amazon/Play-store version and installed the patched version
+4. Signed in to Amazon
+5. Opened the book
+6. Did Info > About > PID List and copied the PIDs to Calibre’s Plugins>File type > DeDRM > Mobipocket dialog
+7. **Crucial** copied the PRC file to the PC (because the file’s checksum has changed since it was last copied)
+8. In Calibre, Add Books (from a single directory)
+

Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/kindle4.8.1.10.patch

@@ -0,0 +1,157 @@
+diff --git a/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali b/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali
+index 8ea400e..3aefad2 100644
+--- a/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali
++++ b/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali
+@@ -41,6 +41,8 @@
+ 
+ .field private security:Lcom/mobipocket/android/library/reader/AndroidSecurity;
+ 
++.field private pidList:Ljava/lang/String;
++
+ .field private totalMemory:J
+ 
+ 
+@@ -74,6 +76,10 @@
+     .line 133
+     iput-object p1, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->security:Lcom/mobipocket/android/library/reader/AndroidSecurity;
+ 
++    const-string v0, "Open DRMed book to show PID list."
++
++    iput-object v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
++
+     .line 134
+     sget-object v0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->TAG:Ljava/lang/String;
+ 
+@@ -1339,3 +1345,26 @@
+ 
+     return-wide v0
+ .end method
++
++.method public getPidList()Ljava/lang/String;
++    .locals 1
++
++    .prologue
++    .line 15
++    iget-object v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
++
++    return-object v0
++.end method
++
++.method public setPidList(Ljava/lang/String;)V
++    .locals 0
++    .param p1, "value"
++
++    .prologue
++    .line 11
++    iput-object p1, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
++
++    .line 12
++    return-void
++.end method
++
+diff --git a/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali b/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali
+index e4a3523..2269fab 100644
+--- a/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali
++++ b/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali
+@@ -30,3 +30,9 @@
+ 
+ .method public abstract getPid()Ljava/lang/String;
+ .end method
++
++.method public abstract getPidList()Ljava/lang/String;
++.end method
++
++.method public abstract setPidList(Ljava/lang/String;)V
++.end method
+diff --git a/smali/com/amazon/kcp/info/AboutActivity.smali b/smali/com/amazon/kcp/info/AboutActivity.smali
+index 5640e9e..e298341 100644
+--- a/smali/com/amazon/kcp/info/AboutActivity.smali
++++ b/smali/com/amazon/kcp/info/AboutActivity.smali
+@@ -493,6 +493,57 @@
+     return-void
+ .end method
+ 
++.method private populatePIDList()V
++    .locals 7
++
++    .prologue
++    .line 313
++    invoke-static {}, Lcom/amazon/kcp/application/DeviceInformationProviderFactory;->getProvider()Lcom/amazon/kcp/application/IDeviceInformationProvider;
++
++    move-result-object v0
++
++    invoke-interface {v0}, Lcom/amazon/kcp/application/IDeviceInformationProvider;->getPidList()Ljava/lang/String;
++
++    move-result-object v1
++
++    .line 314
++    .local v1, "PidList":Ljava/lang/String;
++    iget-object v3, p0, Lcom/amazon/kcp/info/AboutActivity;->groupItemList:Ljava/util/List;
++
++    new-instance v4, Lcom/amazon/kcp/info/AboutActivity$GroupItem;
++
++    const-string v5, "PID List"
++
++    const v6, 0x1
++
++    invoke-direct {v4, p0, v5, v6}, Lcom/amazon/kcp/info/AboutActivity$GroupItem;-><init>(Lcom/amazon/kcp/info/AboutActivity;Ljava/lang/String;Z)V
++
++    invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
++
++    .line 315
++    new-instance v2, Ljava/util/ArrayList;
++
++    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
++
++    .line 316
++    .local v2, "children":Ljava/util/List;,"Ljava/util/List<Lcom/amazon/kcp/info/AboutActivity$DetailItem;>;"
++    new-instance v3, Lcom/amazon/kcp/info/AboutActivity$DetailItem;
++
++    const-string v4, "PIDs"
++
++    invoke-direct {v3, p0, v4, v1}, Lcom/amazon/kcp/info/AboutActivity$DetailItem;-><init>(Lcom/amazon/kcp/info/AboutActivity;Ljava/lang/String;Ljava/lang/String;)V
++
++    invoke-interface {v2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
++
++    .line 317
++    iget-object v3, p0, Lcom/amazon/kcp/info/AboutActivity;->detailItemList:Ljava/util/List;
++
++    invoke-interface {v3, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
++
++    .line 318
++    return-void
++.end method
++
+ .method private populateDisplayItems()V
+     .locals 1
+ 
+@@ -538,6 +589,8 @@
+     .line 173
+     invoke-direct {p0}, Lcom/amazon/kcp/info/AboutActivity;->populateDisplayInformation()V
+ 
++    invoke-direct {p0}, Lcom/amazon/kcp/info/AboutActivity;->populatePIDList()V
++
+     .line 174
+     return-void
+ 
+diff --git a/smali/com/amazon/system/security/Security.smali b/smali/com/amazon/system/security/Security.smali
+index 04ea997..e88fe08 100644
+--- a/smali/com/amazon/system/security/Security.smali
++++ b/smali/com/amazon/system/security/Security.smali
+@@ -940,6 +940,16 @@
+ 
+     aput-object v0, v6, v8
+ 
++    invoke-static {}, Lcom/amazon/kcp/application/DeviceInformationProviderFactory;->getProvider()Lcom/amazon/kcp/application/IDeviceInformationProvider;
++
++    move-result-object v5
++
++    invoke-static {v6}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
++
++    move-result-object v2
++
++    invoke-interface {v5, v2}, Lcom/amazon/kcp/application/IDeviceInformationProvider;->setPidList(Ljava/lang/String;)V
++
+     .line 347
+     return-object v6
+ .end method

Other_Tools/Kobo/obok.py

@@ -0,0 +1,490 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Version 3.1.2 January 2015
+# Add coding, version number and version announcement
+#
+# Version 3.05 October 2014
+# Identifies DRM-free books in the dialog
+#
+# Version 3.04 September 2014
+# Handles DRM-free books as well (sometimes Kobo Library doesn't
+# show download link for DRM-free books)
+#
+# Version 3.03 August 2014
+# If PyCrypto is unavailable try to use libcrypto for AES_ECB.
+#
+# Version 3.02 August 2014
+# Relax checking of application/xhtml+xml  and image/jpeg content.
+#
+# Version 3.01 June 2014
+# Check image/jpeg as well as application/xhtml+xml content. Fix typo
+# in Windows ipconfig parsing.
+#
+# Version 3.0 June 2014
+# Made portable for Mac and Windows, and the only module dependency
+# not part of python core is PyCrypto. Major code cleanup/rewrite.
+# No longer tries the first MAC address; tries them all if it detects
+# the decryption failed.
+#
+# Updated September 2013 by Anon
+# Version 2.02
+# Incorporated minor fixes posted at Apprentice Alf's.
+#
+# Updates July 2012 by Michael Newton
+# PWSD ID is no longer a MAC address, but should always
+# be stored in the registry. Script now works with OS X
+# and checks plist for values instead of registry. Must
+# have biplist installed for OS X support.
+#
+# Original comments left below; note the "AUTOPSY" is inaccurate. See
+# KoboLibrary.userkeys and KoboFile.decrypt()
+#
+##########################################################
+#                    KOBO DRM CRACK BY                   #
+#                      PHYSISTICATED                     #
+##########################################################
+# This app was made for Python 2.7 on Windows 32-bit
+#
+# This app needs pycrypto - get from here:
+# http://www.voidspace.org.uk/python/modules.shtml
+#
+# Usage: obok.py
+# Choose the book you want to decrypt
+#
+# Shouts to my krew - you know who you are - and one in
+# particular who gave me a lot of help with this - thank
+# you so much!
+#
+# Kopimi /K\
+# Keep sharing, keep copying, but remember that nothing is
+# for free - make sure you compensate your favorite
+# authors - and cut out the middle man whenever possible
+# ;) ;) ;)
+#
+# DRM AUTOPSY
+# The Kobo DRM was incredibly easy to crack, but it took
+# me months to get around to making this. Here's the
+# basics of how it works:
+# 1: Get MAC address of first NIC in ipconfig (sometimes
+# stored in registry as pwsdid)
+# 2: Get user ID (stored in tons of places, this gets it
+# from HKEY_CURRENT_USER\Software\Kobo\Kobo Desktop
+# Edition\Browser\cookies)
+# 3: Concatenate and SHA256, take the second half - this
+# is your master key
+# 4: Open %LOCALAPPDATA%\Kobo Desktop Editions\Kobo.sqlite
+# and dump content_keys
+# 5: Unbase64 the keys, then decode these with the master
+# key - these are your page keys
+# 6: Unzip EPUB of your choice, decrypt each page with its
+# page key, then zip back up again
+#
+# WHY USE THIS WHEN INEPT WORKS FINE? (adobe DRM stripper)
+# Inept works very well, but authors on Kobo can choose
+# what DRM they want to use - and some have chosen not to
+# let people download them with Adobe Digital Editions -
+# they would rather lock you into a single platform.
+#
+# With Obok, you can sync Kobo Desktop, decrypt all your
+# ebooks, and then use them on whatever device you want
+# - you bought them, you own them, you can do what you
+# like with them.
+#
+# Obok is Kobo backwards, but it is also means "next to"
+# in Polish.
+# When you buy a real book, it is right next to you. You
+# can read it at home, at work, on a train, you can lend
+# it to a friend, you can scribble on it, and add your own
+# explanations/translations.
+#
+# Obok gives you this power over your ebooks - no longer
+# are you restricted to one device. This allows you to
+# embed foreign fonts into your books, as older Kobo's
+# can't display them properly. You can read your books
+# on your phones, in different PC readers, and different
+# ereader devices. You can share them with your friends
+# too, if you like - you can do that with a real book
+# after all.
+#
+"""Manage all Kobo books, either encrypted or DRM-free."""
+
+__version__ = '3.1.1'
+
+import sys
+import os
+import subprocess
+import sqlite3
+import base64
+import binascii
+import re
+import zipfile
+import hashlib
+import xml.etree.ElementTree as ET
+import string
+import shutil
+
+class ENCRYPTIONError(Exception):
+    pass
+
+def _load_crypto_libcrypto():
+    from ctypes import CDLL, POINTER, c_void_p, c_char_p, c_int, c_long, \
+        Structure, c_ulong, create_string_buffer, cast
+    from ctypes.util import find_library
+
+    if sys.platform.startswith('win'):
+        libcrypto = find_library('libeay32')
+    else:
+        libcrypto = find_library('crypto')
+
+    if libcrypto is None:
+        raise ENCRYPTIONError('libcrypto not found')
+    libcrypto = CDLL(libcrypto)
+
+    AES_MAXNR = 14
+
+    c_char_pp = POINTER(c_char_p)
+    c_int_p = POINTER(c_int)
+
+    class AES_KEY(Structure):
+        _fields_ = [('rd_key', c_long * (4 * (AES_MAXNR + 1))),
+                    ('rounds', c_int)]
+    AES_KEY_p = POINTER(AES_KEY)
+
+    def F(restype, name, argtypes):
+        func = getattr(libcrypto, name)
+        func.restype = restype
+        func.argtypes = argtypes
+        return func
+
+    AES_set_decrypt_key = F(c_int, 'AES_set_decrypt_key',
+                            [c_char_p, c_int, AES_KEY_p])
+    AES_ecb_encrypt = F(None, 'AES_ecb_encrypt',
+                        [c_char_p, c_char_p, AES_KEY_p, c_int])
+
+    class AES(object):
+        def __init__(self, userkey):
+            self._blocksize = len(userkey)
+            if (self._blocksize != 16) and (self._blocksize != 24) and (self._blocksize != 32) :
+                raise ENCRYPTIONError(_('AES improper key used'))
+                return
+            key = self._key = AES_KEY()
+            rv = AES_set_decrypt_key(userkey, len(userkey) * 8, key)
+            if rv < 0:
+                raise ENCRYPTIONError(_('Failed to initialize AES key'))
+
+        def decrypt(self, data):
+            clear = ''
+            for i in range(0, len(data), 16):
+                out = create_string_buffer(16)
+                rv = AES_ecb_encrypt(data[i:i+16], out, self._key, 0)
+                if rv == 0:
+                    raise ENCRYPTIONError(_('AES decryption failed'))
+                clear += out.raw
+            return clear
+
+    return AES
+
+def _load_crypto_pycrypto():
+    from Crypto.Cipher import AES as _AES
+    class AES(object):
+        def __init__(self, key):
+            self._aes = _AES.new(key, _AES.MODE_ECB)
+
+        def decrypt(self, data):
+            return self._aes.decrypt(data)
+
+    return AES
+
+def _load_crypto():
+    AES = None
+    cryptolist = (_load_crypto_pycrypto, _load_crypto_libcrypto)
+    for loader in cryptolist:
+        try:
+            AES = loader()
+            break
+        except (ImportError, ENCRYPTIONError):
+            pass
+    return AES
+
+AES = _load_crypto()
+
+class KoboLibrary(object):
+    """The Kobo library.
+
+    This class represents all the information available from the data
+    written by the Kobo Desktop Edition application, including the list
+    of books, their titles, and the user's encryption key(s)."""
+
+    def __init__ (self):
+        print u"Obok v{0}\nCopyright © 2012-2014 Physisticated et al.".format(__version__)
+        if sys.platform.startswith('win'):
+            if sys.getwindowsversion().major > 5:
+                self.kobodir = os.environ['LOCALAPPDATA']
+            else:
+                self.kobodir = os.path.join(os.environ['USERPROFILE'], 'Local Settings', 'Application Data')
+            self.kobodir = os.path.join(self.kobodir, 'Kobo', 'Kobo Desktop Edition')
+        elif sys.platform.startswith('darwin'):
+            self.kobodir = os.path.join(os.environ['HOME'], 'Library', 'Application Support', 'Kobo', 'Kobo Desktop Edition')
+        self.bookdir = os.path.join(self.kobodir, 'kepub')
+        kobodb = os.path.join(self.kobodir, 'Kobo.sqlite')
+        self.__sqlite = sqlite3.connect(kobodb)
+        self.__cursor = self.__sqlite.cursor()
+        self._userkeys = []
+        self._books = []
+        self._volumeID = []
+
+    def close (self):
+        """Closes the database used by the library."""
+        self.__cursor.close()
+        self.__sqlite.close()
+
+    @property
+    def userkeys (self):
+        """The list of potential userkeys being used by this library.
+        Only one of these will be valid.
+        """
+        if len(self._userkeys) != 0:
+            return self._userkeys
+        userid = self.__getuserid()
+        for macaddr in self.__getmacaddrs():
+            self._userkeys.append(self.__getuserkey(macaddr, userid))
+        return self._userkeys
+
+    @property
+    def books (self):
+        """The list of KoboBook objects in the library."""
+        if len(self._books) != 0:
+            return self._books
+        """Drm-ed kepub"""
+        for row in self.__cursor.execute('SELECT DISTINCT volumeid, Title, Attribution, Series FROM content_keys, content WHERE contentid = volumeid'):
+            self._books.append(KoboBook(row[0], row[1], self.__bookfile(row[0]), 'kepub', self.__cursor, author=row[2], series=row[3]))
+            self._volumeID.append(row[0])
+        """Drm-free"""
+        for f in os.listdir(self.bookdir):
+            if(f not in self._volumeID):
+                row = self.__cursor.execute("SELECT Title, Attribution, Series FROM content WHERE ContentID = '" + f + "'").fetchone()
+                if row is not None:
+                    fTitle = row[0]
+                    self._books.append(KoboBook(f, fTitle, self.__bookfile(f), 'drm-free', self.__cursor, author=row[1], series=row[2]))
+                    self._volumeID.append(f)
+        """Sort"""
+        self._books.sort(key=lambda x: x.title)
+        return self._books
+
+    def __bookfile (self, volumeid):
+        """The filename needed to open a given book."""
+        return os.path.join(self.kobodir, 'kepub', volumeid)
+
+    def __getmacaddrs (self):
+        """The list of all MAC addresses on this machine."""
+        macaddrs = []
+        if sys.platform.startswith('win'):
+            c = re.compile('\s(' + '[0-9a-f]{2}-' * 5 + '[0-9a-f]{2})(\s|$)', re.IGNORECASE)
+            for line in os.popen('ipconfig /all'):
+                m = c.search(line)
+                if m:
+                    macaddrs.append(re.sub("-", ":", m.group(1)).upper())
+        elif sys.platform.startswith('darwin'):
+            c = re.compile('\s(' + '[0-9a-f]{2}:' * 5 + '[0-9a-f]{2})(\s|$)', re.IGNORECASE)
+            output = subprocess.check_output('/sbin/ifconfig -a', shell=True)
+            matches = c.findall(output)
+            for m in matches:
+                # print "m:",m[0]
+                macaddrs.append(m[0].upper())
+        return macaddrs
+
+    def __getuserid (self):
+        return self.__cursor.execute('SELECT UserID FROM user WHERE HasMadePurchase = "true"').fetchone()[0]
+
+    def __getuserkey (self, macaddr, userid):
+        deviceid = hashlib.sha256('NoCanLook' + macaddr).hexdigest()
+        userkey = hashlib.sha256(deviceid + userid).hexdigest()
+        return binascii.a2b_hex(userkey[32:])
+
+class KoboBook(object):
+    """A Kobo book.
+
+    A Kobo book contains a number of unencrypted and encrypted files.
+    This class provides a list of the encrypted files.
+
+    Each book has the following instance variables:
+    volumeid - a UUID which uniquely refers to the book in this library.
+    title - the human-readable book title.
+    filename - the complete path and filename of the book.
+    type - either kepub or drm-free"""
+    def __init__ (self, volumeid, title, filename, type, cursor, author=None, series=None):
+        self.volumeid = volumeid
+        self.title = title
+        self.author = author
+        self.series = series
+        self.series_index = None
+        self.filename = filename
+        self.type = type
+        self.__cursor = cursor
+        self._encryptedfiles = {}
+
+    @property
+    def encryptedfiles (self):
+        """A dictionary of KoboFiles inside the book.
+
+        The dictionary keys are the relative pathnames, which are
+        the same as the pathnames inside the book 'zip' file."""
+        if (self.type == 'drm-free'):
+            return self._encryptedfiles
+        if len(self._encryptedfiles) != 0:
+            return self._encryptedfiles
+        # Read the list of encrypted files from the DB
+        for row in self.__cursor.execute('SELECT elementid,elementkey FROM content_keys,content WHERE volumeid = ? AND volumeid = contentid',(self.volumeid,)):
+            self._encryptedfiles[row[0]] = KoboFile(row[0], None, base64.b64decode(row[1]))
+
+        # Read the list of files from the kepub OPF manifest so that
+        # we can get their proper MIME type.
+        # NOTE: this requires that the OPF file is unencrypted!
+        zin = zipfile.ZipFile(self.filename, "r")
+        xmlns = {
+            'ocf': 'urn:oasis:names:tc:opendocument:xmlns:container',
+            'opf': 'http://www.idpf.org/2007/opf'
+        }
+        ocf = ET.fromstring(zin.read('META-INF/container.xml'))
+        opffile = ocf.find('.//ocf:rootfile', xmlns).attrib['full-path']
+        basedir = re.sub('[^/]+$', '', opffile)
+        opf = ET.fromstring(zin.read(opffile))
+        zin.close()
+
+        c = re.compile('/')
+        for item in opf.findall('.//opf:item', xmlns):
+            mimetype = item.attrib['media-type']
+
+            # Convert relative URIs
+            href = item.attrib['href']
+            if not c.match(href):
+                href = string.join((basedir, href), '')
+
+            # Update books we've found from the DB.
+            if href in self._encryptedfiles:
+                self._encryptedfiles[href].mimetype = mimetype
+        return self._encryptedfiles
+
+    @property
+    def has_drm (self):
+        return not self.type == 'drm-free'
+
+
+class KoboFile(object):
+    """An encrypted file in a KoboBook.
+
+    Each file has the following instance variables:
+    filename - the relative pathname inside the book zip file.
+    mimetype - the file's MIME type, e.g. 'image/jpeg'
+    key - the encrypted page key."""
+
+    def __init__ (self, filename, mimetype, key):
+        self.filename = filename
+        self.mimetype = mimetype
+        self.key = key
+    def decrypt (self, userkey, contents):
+        """
+        Decrypt the contents using the provided user key and the
+        file page key. The caller must determine if the decrypted
+        data is correct."""
+        # The userkey decrypts the page key (self.key)
+        keyenc = AES(userkey)
+        decryptedkey = keyenc.decrypt(self.key)
+        # The decrypted page key decrypts the content
+        pageenc = AES(decryptedkey)
+        return self.__removeaespadding(pageenc.decrypt(contents))
+
+    def check (self, contents):
+        """
+        If the contents uses some known MIME types, check if it
+        conforms to the type. Throw a ValueError exception if not.
+        If the contents uses an uncheckable MIME type, don't check
+        it and don't throw an exception.
+        Returns True if the content was checked, False if it was not
+        checked."""
+        if self.mimetype == 'application/xhtml+xml':
+            if contents[:5]=="<?xml":
+                return True
+            else:
+                print "Bad XML: ",contents[:5]
+                raise ValueError
+        if self.mimetype == 'image/jpeg':
+            if contents[:3] == '\xff\xd8\xff':
+                return True
+            else:
+                print "Bad JPEG: ", contents[:3].encode('hex')
+                raise ValueError()
+        return False
+
+    def __removeaespadding (self, contents):
+        """
+        Remove the trailing padding, using what appears to be the CMS
+        algorithm from RFC 5652 6.3"""
+        lastchar = binascii.b2a_hex(contents[-1:])
+        strlen = int(lastchar, 16)
+        padding = strlen
+        if strlen == 1:
+            return contents[:-1]
+        if strlen < 16:
+            for i in range(strlen):
+                testchar = binascii.b2a_hex(contents[-strlen:-(strlen-1)])
+                if testchar != lastchar:
+                    padding = 0
+        if padding > 0:
+            contents = contents[:-padding]
+        return contents
+
+if __name__ == '__main__':
+
+    lib = KoboLibrary()
+
+    for i, book in enumerate(lib.books):
+        print ('%d: %s' % (i + 1, book.title)).encode('ascii', 'ignore')
+
+    num_string = raw_input("Convert book number... ")
+    try:
+        num = int(num_string)
+        book = lib.books[num - 1]
+    except (ValueError, IndexError):
+        exit()
+
+    print "Converting", book.title
+
+    zin = zipfile.ZipFile(book.filename, "r")
+    # make filename out of Unicode alphanumeric and whitespace equivalents from title
+    outname = "%s.epub" % (re.sub('[^\s\w]', '', book.title, 0, re.UNICODE))
+
+    if (book.type == 'drm-free'):
+        print "DRM-free book, conversion is not needed"
+        shutil.copyfile(book.filename, outname)
+        print "Book saved as", os.path.join(os.getcwd(), outname)
+        exit(0)
+
+    result = 1
+    for userkey in lib.userkeys:
+        # print "Trying key: ",userkey.encode('hex_codec')
+        confirmedGood = False
+        try:
+            zout = zipfile.ZipFile(outname, "w", zipfile.ZIP_DEFLATED)
+            for filename in zin.namelist():
+                contents = zin.read(filename)
+                if filename in book.encryptedfiles:
+                    file = book.encryptedfiles[filename]
+                    contents = file.decrypt(userkey, contents)
+                    # Parse failures mean the key is probably wrong.
+                    if not confirmedGood:
+                        confirmedGood = file.check(contents)
+                zout.writestr(filename, contents)
+            zout.close()
+            print "Book saved as", os.path.join(os.getcwd(), outname)
+            result = 0
+            break
+        except ValueError:
+            print "Decryption failed, trying next key"
+            zout.close()
+            os.remove(outname)
+
+    zin.close()
+    lib.close()
+    exit(result)

Other_Tools/Kobo/obok_2.01.py

@@ -1,231 +0,0 @@
-#!/usr/bin/env python
-#
-# Updated September 2013 by Anon
-# Version 2.01
-# Incorporated minor fixes posted at Apprentice Alf's.
-#
-# Updates July 2012 by Michael Newton
-# PWSD ID is no longer a MAC address, but should always
-# be stored in the registry. Script now works with OS X
-# and checks plist for values instead of registry. Must
-# have biplist installed for OS X support.
-#
-##########################################################
-#                    KOBO DRM CRACK BY                   #
-#                      PHYSISTICATED                     #
-##########################################################
-# This app was made for Python 2.7 on Windows 32-bit
-#
-# This app needs pycrypto - get from here:
-# http://www.voidspace.org.uk/python/modules.shtml
-#
-# Usage: obok.py
-# Choose the book you want to decrypt
-#
-# Shouts to my krew - you know who you are - and one in
-# particular who gave me a lot of help with this - thank
-# you so much!
-#
-# Kopimi /K\
-# Keep sharing, keep copying, but remember that nothing is
-# for free - make sure you compensate your favorite
-# authors - and cut out the middle man whenever possible
-# ;) ;) ;)
-#
-# DRM AUTOPSY
-# The Kobo DRM was incredibly easy to crack, but it took
-# me months to get around to making this. Here's the
-# basics of how it works:
-# 1: Get MAC address of first NIC in ipconfig (sometimes 
-# stored in registry as pwsdid)
-# 2: Get user ID (stored in tons of places, this gets it
-# from HKEY_CURRENT_USER\Software\Kobo\Kobo Desktop 
-# Edition\Browser\cookies)
-# 3: Concatenate and SHA256, take the second half - this
-# is your master key
-# 4: Open %LOCALAPPDATA%\Kobo Desktop Editions\Kobo.sqlite
-# and dump content_keys
-# 5: Unbase64 the keys, then decode these with the master
-# key - these are your page keys
-# 6: Unzip EPUB of your choice, decrypt each page with its
-# page key, then zip back up again
-#
-# WHY USE THIS WHEN INEPT WORKS FINE? (adobe DRM stripper)
-# Inept works very well, but authors on Kobo can choose
-# what DRM they want to use - and some have chosen not to
-# let people download them with Adobe Digital Editions -
-# they would rather lock you into a single platform.
-#
-# With Obok, you can sync Kobo Desktop, decrypt all your
-# ebooks, and then use them on whatever device you want
-# - you bought them, you own them, you can do what you
-# like with them.
-#
-# Obok is Kobo backwards, but it is also means "next to"
-# in Polish.
-# When you buy a real book, it is right next to you. You
-# can read it at home, at work, on a train, you can lend
-# it to a friend, you can scribble on it, and add your own
-# explanations/translations.
-#
-# Obok gives you this power over your ebooks - no longer
-# are you restricted to one device. This allows you to
-# embed foreign fonts into your books, as older Kobo's
-# can't display them properly. You can read your books
-# on your phones, in different PC readers, and different
-# ereader devices. You can share them with your friends
-# too, if you like - you can do that with a real book
-# after all.
-# 
-"""
-Decrypt Kobo encrypted EPUB books.
-"""
-
-import os
-import sys
-if sys.platform.startswith('win'):
-    import _winreg
-elif sys.platform.startswith('darwin'):
-    from biplist import readPlist
-import re
-import string
-import hashlib
-import sqlite3
-import base64
-import binascii
-import zipfile
-from Crypto.Cipher import AES
-
-def SHA256(raw):
-    return hashlib.sha256(raw).hexdigest()
-
-def RemoveAESPadding(contents):
-    lastchar = binascii.b2a_hex(contents[-1:])
-    strlen = int(lastchar, 16)
-    padding = strlen
-    if(strlen == 1):
-        return contents[:-1]
-    if(strlen < 16):
-        for i in range(strlen):
-            testchar = binascii.b2a_hex(contents[-strlen:-(strlen-1)])
-            if(testchar != lastchar):
-                padding = 0
-    if(padding > 0):
-        contents = contents[:-padding]
-    return contents
-
-def GetVolumeKeys(dbase, enc):
-    volumekeys = {}
-    for row in dbase.execute("SELECT * from content_keys"):
-        if(row[0] not in volumekeys):
-            volumekeys[row[0]] = {}
-        volumekeys[row[0]][row[1]] = {}
-        volumekeys[row[0]][row[1]]["encryptedkey"] = base64.b64decode(row[2])
-        volumekeys[row[0]][row[1]]["decryptedkey"] = enc.decrypt(volumekeys[row[0]][row[1]]["encryptedkey"])
-    # get book name
-    for key in volumekeys.keys():
-        volumekeys[key]["title"] = dbase.execute("SELECT Title from content where ContentID = '%s'" % (key)).fetchone()[0]
-    return volumekeys
-
-def ByteArrayToString(bytearr):
-    wincheck = re.match("@ByteArray\\((.+)\\)", bytearr)
-    if wincheck:
-        return wincheck.group(1)
-    return bytearr
-
-def GetUserHexKey(prefs = ""):
-    "find wsuid and pwsdid"
-    wsuid = ""
-    pwsdid = ""
-    if sys.platform.startswith('win'):
-        regkey_browser = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, "Software\\Kobo\\Kobo Desktop Edition\\Browser")
-        cookies = _winreg.QueryValueEx(regkey_browser, "cookies")
-        bytearrays = cookies[0]
-    elif sys.platform.startswith('darwin'):
-        cookies = readPlist(prefs)
-        bytearrays = cookies["Browser.cookies"]
-    for bytearr in bytearrays:
-        cookie = ByteArrayToString(bytearr)
-        print cookie
-        wsuidcheck = re.match("^wsuid=([0-9a-f-]+)", cookie)
-        if(wsuidcheck):
-            wsuid = wsuidcheck.group(1)
-        pwsdidcheck = re.match("^pwsdid=([0-9a-f-]+)", cookie)
-        if (pwsdidcheck):
-            pwsdid = pwsdidcheck.group(1)
-
-    if(wsuid == "" or pwsdid == ""):
-        print "wsuid or pwsdid key not found :/"
-        exit()
-    preuserkey = string.join((pwsdid, wsuid), "")
-    print SHA256(pwsdid)
-    userkey = SHA256(preuserkey)
-    return userkey[32:]
-
-# get dirs
-if sys.platform.startswith('win'):
-    delim = "\\"
-    if (sys.getwindowsversion().major > 5):
-        kobodir = string.join((os.environ['LOCALAPPDATA'], "Kobo\\Kobo Desktop Edition"), delim)
-    else:
-        kobodir = string.join((os.environ['USERPROFILE'], "Local Settings\\Application Data\\Kobo\\Kobo Desktop Edition"), delim)
-    prefs = ""
-elif sys.platform.startswith('darwin'):
-    delim = "/"
-    kobodir = string.join((os.environ['HOME'], "Library/Application Support/Kobo/Kobo Desktop Edition"), delim)
-    prefs = string.join((os.environ['HOME'], "Library/Preferences/com.kobo.Kobo Desktop Edition.plist"), delim)
-sqlitefile = string.join((kobodir, "Kobo.sqlite"), delim)
-bookdir = string.join((kobodir, "kepub"), delim)
-
-# get key
-userkeyhex = GetUserHexKey(prefs)
-# load into AES
-userkey = binascii.a2b_hex(userkeyhex)
-enc = AES.new(userkey, AES.MODE_ECB)
-
-# open sqlite
-conn = sqlite3.connect(sqlitefile)
-dbcursor = conn.cursor()
-# get volume keys
-volumekeys = GetVolumeKeys(dbcursor, enc)
-
-# choose a volumeID
-
-volumeid = ""
-print "Choose a book to decrypt:"
-i = 1
-for key in volumekeys.keys():
-    print "%d: %s" % (i, volumekeys[key]["title"])
-    i += 1
-
-num = input("...")
-
-i = 1
-for key in volumekeys.keys():
-    if(i == num):
-        volumeid = key
-    i += 1
-
-if(volumeid == ""):
-    exit()
-
-zippath = string.join((bookdir, volumeid), delim)
-
-z = zipfile.ZipFile(zippath, "r")
-# make filename out of Unicode alphanumeric and whitespace equivalents from title
-outname = "%s.epub" % (re.sub("[^\s\w]", "", volumekeys[volumeid]["title"], 0, re.UNICODE))
-zout = zipfile.ZipFile(outname, "w", zipfile.ZIP_DEFLATED)
-for filename in z.namelist():
-    #print filename
-    # read in and decrypt
-    if(filename in volumekeys[volumeid]):
-        # do decrypted version
-        pagekey = volumekeys[volumeid][filename]["decryptedkey"]
-        penc = AES.new(pagekey, AES.MODE_ECB)
-        contents = RemoveAESPadding(penc.decrypt(z.read(filename)))
-        # need to fix padding
-        zout.writestr(filename, contents)
-    else:
-        zout.writestr(filename, z.read(filename))
-
-print "Book saved as %s%s%s" % (os.getcwd(), delim, outname)

ReadMe_First.txt

@@ -1,13 +1,14 @@
-Welcome to the tools!
+Welcome to the tools!
 =====================
 
-This ReadMe_First.txt is meant to give users a quick overview of what is available and how to get started. This document is part of the Tools v6.1.0 archive from Apprentice Alf's Blog: http://apprenticealf.wordpress.com/
+This ReadMe_First.txt is meant to give users a quick overview of what is available and how to get started. This document is part of the Tools v6.2.0 archive from Apprentice Alf's Blog: http://apprenticealf.wordpress.com/
 
 The is archive includes tools to remove DRM from:
 
  - Kindle ebooks (Mobi, Topaz, Print Replica and KF8).
- - Barnes and Noble ePubs
- - Adobe Digital Editions ePubs (including Sony and Kobo ePubs downloaded to ADE)
+ - Barnes and Noble ePubs downloaded through NOOK Study
+ - Adobe Digital Editions ePubs (including Kobo and Google ePubs downloaded to ADE)
+ - Kobo kePubs from the Kobo Desktop application
  - Adobe Digital Editions PDFs
  - Mobipocket ebooks
  - eReader PDB books
@@ -18,41 +19,26 @@ These tools do NOT work with Apple's iBooks FairPlay DRM (see end of this file.)
 
 About the tools
 ---------------
-These tools have been updated and maintained by Apprentice Alf, DiapDealer and some_updates. You can find the latest updates and get support at Apprentice Alf's blog: http://www.apprenticealf.wordpress.com/
+These tools are updated and maintained by Apprentice Alf and Apprentice Harper. You can find the latest updates and get support at Apprentice Alf's blog: http://www.apprenticealf.wordpress.com/
 If you re-post these tools, a link to the blog would be appreciated.
 
-The original inept and ignoble scripts were by i♥cabbages
-The original mobidedrm and erdr2pml scripts were by The Dark Reverser
-The original topaz DRM removal script was by CMBDTC
-The original topaz format conversion scripts were by some_updates, clarknova and Bart Simpson
-The Scuolabooks tool is by Hex
-The calibre plugin conversions were originally by DiapDealer
-
-The DeDRM plugin is by Apprentice Alf based on plugins by DiapDealer
-The DeDRM AppleScript application is by Apprentice Alf
-The DeDRM python GUI is by some_updates and Apprentice Alf
-
-Many fixes, updates and enhancements to the scripts and applicatons have been by Apprentice Alf, some_updates and DiapDealer and others.
-
 
 DeDRM plugin for calibre (Mac OS X, Windows, and Linux)
 -------------------------------------------------------
 If you already use calibre, the quickest and easiest way, especially on Windows, to remove DRM from your ebooks is to install the DeDRM plugin from the DeDRM_calibre_plugin folder, following the instructions and configuration directions provided in the ReadMe and the help links.
 
-Once installed and configured, you can simply add a DRM book to calibre and the DeDRMed version will be imported into the calibre database. Note that DRM removal ONLY occurs on import. If you have already imported DRM books you'll need to remove them from calibre and re-import them.
+Once installed and configured, you can simply add a DRM book to calibre and the DeDRMed version will be imported into the calibre database. Note that DRM removal only occurs on IMPORT not on CONVERSION or at any other time, not even conversion to other formats. If you have already imported DRM books you'll need to remove them from calibre and re-import them.
 
-These plugins work for Windows, Mac OS X and Linux. For ebooks from Kindle 4 PC and Adobe Digital Editions, Linux users should read the section at the end the DeDRM_plugin_ReadMe.txt file.
+Linux users should read the section at the end the DeDRM_plugin_ReadMe.txt file.
 
 
 DeDRM application for Mac OS X users: (Mac OS X 10.4 and above)
 ---------------------------------------------------------------
-This application is a stand-alone application for Mac OS X users.
+This application is a stand-alone DRM removal application for Mac OS X users.
 
-Drag the "DeDRM.app" application from the DeDRM_Macintosh_Application folder to your Desktop (or your Applications Folder, or anywhere else you find convenient). Double-click on the application to run it and you will be able to enter any configuration data needed to remove DRM from  your type of DRMed ebooks.
+For instructions, see the "DeDRM ReadMe.rtf" file in the DeDRM_Application_Macintosh folder.
 
-To use the DeDRM application simply drag ebooks and/or folders containing ebooks onto the DeDRM application and it will remove the DRM and save DRM-free versions of the books wherever you selected in the Output Folder configuration dialog.
-
-For more detailed instructions, see the "DeDRM ReadMe.rtf" file in the DeDRM_Application_Macintosh folder, including details of the extra step that Mac OS X 10.4 users need to take to use the application.
+N.B. Mac OS X 10.4 users need to take extra steps befor using the application, see the ReadMe.
 
 
 DeDRM application for Windows users: (Windows XP through Windows 8)
@@ -62,44 +48,46 @@ DeDRM application for Windows users: (Windows XP through Windows 8)
 
 This application is a stand-alone application for Windows users.
 
-Drag the DeDRM_App folder that's in the DeDRM_Windows_Application folder, to your "My Documents" folder (or anywhere else you find convenient). Make a short-cut on your Desktop of the DeDRM_Drop_Target.bat file that's in the DeDRM_App folder. Double-click on the shortcut and the DeDRM application will run and you will be able to enter any configuration data needed to remove DRM from  your type of DRMed ebooks.
+For instructions, see the DeDRM_App_ReadMe.txt file in the DeDRM_Windows_Applications folder.
 
-To use the DeDRM application simply drag ebooks or folders containing ebooks onto the DeDRM_Drop_Target.bat shortcut and it will remove the DRM and save DRM-free versions of the books wherever you selected in the Output Folder configuration dialog.
 
-For more detailed instructions, see the DeDRM_App_ReadMe.txt file in the DeDRM_Windows_Applications folder.
+Obok plugin for calibre (Mac OS X, Windows)
+-------------------------------------------
+This plugin allows you to import kePub ebooks from your kobo desktop application. It is separate from the DeDRM application because it has to work in a different way. It will find all the books downloaded to your kobo desktop application, and let you choose which ones to import, removing the DRM as they are imported.
+
+For instructions, see the obok_plugin_ReadMe.txt file in the Obok_calibre_plugin folder.
 
 
 Other_Tools
 -----------
-This is now a separate archive and includes other tools that may be useful for DRMed ebooks from certain sources or for Linux users. Most users won't need any of these tools.
-
-Key_Generation_Scripts
-This folder contains python scripts that creates a keyfiles for Barnes and Noble ePubs, Adobe Digital Editions ePubs and Kindle for Mac/PC ebooks.
-
-Kindle_for_Android_Patches
-Definitely only for the adventurous, this folder contains information on how to modify the Kindel for Android app to b able to get a PID for use with the other Kindle tools (DeDRM apps and calibre plugin).
+This is folder other tools that may be useful for DRMed ebooks from certain sources or for Linux users. Most users won't need any of these tools.
 
 B&N_Download_Helper
 A Javascript to enable a download button at the B&N website for ebooks that normally won't download to your PC. Another one only for the adventurous.
 
-Scuolabook_DRM
-A windows-only application (including source code) for removing DRM from ScuolaBooks PDFs, created by "Hex" and included with permission.
+DRM_Key_Scripts
+This folder contains python scripts that create or extract encryption keyfiles for Barnes and Noble ePubs, Adobe Digital Editions ePubs and Kindle for Mac/PC ebooks.
+
+Kindle_for_Android_Patches
+Definitely only for the adventurous, this folder contains information on how to modify the Kindel for Android app to b able to get a PID for use with the other Kindle tools (DeDRM apps and calibre plugin).
+
+Kobo
+Contains the standalone obok python script for removing DRM from kePubs downloaded using the kobo desktop application.
 
 Rocket_ebooks
 Information about the now-obsolete Rocket ebook format and DRM, along with source for a tool to remove the DRM.
 
-
+Scuolabook_DRM
+A windows-only application (including source code) for removing DRM from ScuolaBooks PDFs, created by "Hex" and included with permission.
 
 
 Windows and Python
 ------------------
-We **strongly** recommend ActiveState's Active Python 2.7 Community Edition for Windows (x86) 32 bits. This can be downloaded for free from:
+We **strongly** recommend ActiveState's Active Python 2.7 Community Edition for Windows. This can be downloaded for free from:
 
 http://www.activestate.com/activepython/downloads
 
-We do **NOT** recommend the version of Python from python.org.
-
-The version from python.org is not as complete as most normal Python installations on Linux and even Mac OS X. It is missing various Windows specific libraries, does not install the default Tk Widget kit (for graphical user interfaces) unless you select it as an option in the installer, and does not properly update the system PATH environment variable. Therefore using the default python.org build on Windows is simply an exercise in frustration for most Windows users.
+We do **NOT** recommend the version of Python from python.org as it is missing various Windows specific libraries, does not install the Tk Widget kit (for graphical user interfaces) by default, and does not properly update the system PATH environment variable. Therefore using the default python.org build on Windows is simply an exercise in frustration for most Windows users.
 
 In addition, Windows Users need one of PyCrypto OR OpenSSL. Because of potential conflicts with other software, we recommend using PyCrypto.
 
@@ -109,7 +97,7 @@ For PyCrypto:
 
     http://www.voidspace.org.uk/python/modules.shtml
 
-    Please get the latest PyCrypto meant for Windows 32 bit that matches the version of Python you installed (2.7)
+    Please get the latest (currently 2.6) PyCrypto meant for Windows Python version 2.7
 
 For OpenSSL:
 
@@ -122,7 +110,7 @@ For OpenSSL:
     Visual C++ 2008 Redistributables (1.7Mb)
     http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF
 
-Once Windows users have installed Python 2.X for 32 bits, and the matching OpenSSL OR PyCrypto pieces, they too are ready to run a DeDRM application.
+Once Windows users have installed Python 2.7, and the matching OpenSSL OR PyCrypto pieces, they are ready to run the DeDRM application or individual scripts.
 
 
 
@@ -147,3 +135,23 @@ MD5: 1636862796d573c693d56bcc526b60bd
 If you have any problems with Requiem, I suggest you contact Brahms directly through their Tor website.
 
 No support for requiem is provided at Apprentice Alf's blog.
+
+
+Credits
+-------
+The original inept and ignoble scripts were by i♥cabbages
+The original mobidedrm and erdr2pml scripts were by The Dark Reverser
+The original topaz DRM removal script was by CMBDTC
+The original topaz format conversion scripts were by some_updates, clarknova and Bart Simpson
+The original obok script was by Physisticated
+
+The alfcrypto library is by some_updates
+The ePub encryption detection script is by Apprentice Alf, adapted from a script by Paul Durrant
+The ignoblekey script is by Apprentice Harper
+The DeDRM plugin was based on plugins by DiapDealer and is maintained by Apprentice Alf and Apprentice Harper
+The DeDRM AppleScript was by Paul Durrant and is maintained by Apprentice Alf and Apprentice Harper
+The DeDRM python GUI was by some_updates and is maintained by Apprentice Alf and Apprentice Harper
+
+The Scuolabooks tool is by Hex
+
+Many fixes, updates and enhancements to the scripts and applicatons have been made by many other people. For more details, see the commments in the individual scripts.