Starting to move ignoblekeyfetch into all tools.

DeDRM_calibre_plugin/DeDRM_plugin/androidkindlekey.py

@@ -11,7 +11,9 @@ from __future__ import with_statement
 # Revision history:
 #  1.0   - AmazonSecureStorage.xml decryption to serial number
 #  1.1   - map_data_storage.db decryption to serial number
-#  1.2   - BugFix
+#  1.2   - Changed to be callable from AppleScript by returning only serial number
+#        - and changed name to androidkindlekey.py
+#        - and added in unicode command line support
 #  1.3   - added in TkInter interface, output to a file and attempt to get backup from a connected android device.
 
 """

DeDRM_calibre_plugin/DeDRM_plugin/ignoblekeyfetch.py

@@ -12,14 +12,11 @@ from __future__ import with_statement
 # Based on discoveries by "Nobody You Know"
 
 # Windows users: Before running this program, you must first install Python.
-#   We recommend ActiveState Python 2.7.X for Windows (x86) from
+#   We recommend ActiveState Python 2.7.X for Windows from
 #   http://www.activestate.com/activepython/downloads.
-#   You must also install PyCrypto from
-#   http://www.voidspace.org.uk/python/modules.shtml#pycrypto
-#   (make certain to install the version for Python 2.7).
-#   Then save this script file as ignoblekeygen.pyw and double-click on it to run it.
+#   Then save this script file as ignoblekeyfetch.pyw and double-click on it to run it.
 #
-# Mac OS X users: Save this script file as ignoblekeygen.pyw.  You can run this
+# Mac OS X users: Save this script file as ignoblekeyfetch.pyw.  You can run this
 #   program from the command line (python ignoblekeygen.pyw) or by double-clicking
 #   it when it has been associated with PythonLauncher.
 
@@ -122,6 +119,7 @@ def fetch_key(email, password):
         req = urllib2.Request(fetch_url)
         response = urllib2.urlopen(req)
         the_page = response.read()
+        #print the_page
         
         import re
         
@@ -221,8 +219,11 @@ def gui_main():
             except Exception, e:
                 self.status['text'] = u"Error: {0}".format(e.args[0])
                 return
-            open(keypath,'wb').write(userkey)
-            self.status['text'] = u"Keyfile successfully generated"
+            if len(userkey) == 28:
+                open(keypath,'wb').write(userkey)
+                self.status['text'] = u"Keyfile fetched successfully"
+            else:
+                self.status['text'] = u"Keyfile fetch failed."
 
     root = Tkinter.Tk()
     root.title(u"Barnes & Noble ePub Keyfile Fetch v.{0}".format(__version__))