tools v6.0.7

(Only the plugin seems to have been updated for the 6.0.6 release.)

DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist

@@ -24,19 +24,19 @@
 	<key>CFBundleExecutable</key>
 	<string>droplet</string>
 	<key>CFBundleGetInfoString</key>
-	<string>DeDRM AppleScript 6.0.3. Written 2010–2013 by Apprentice Alf and others.</string>
+	<string>DeDRM AppleScript 6.0.7. Written 2010–2013 by Apprentice Alf and others.</string>
 	<key>CFBundleIconFile</key>
 	<string>DeDRM</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.apple.ScriptEditor.id.707CCCD5-0C6C-4BEB-B67C-B6E866ADE85A</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>6.0.7</string>
 	<key>CFBundleName</key>
 	<string>DeDRM</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0.3</string>
+	<string>6.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>dplt</string>
 	<key>LSRequiresCarbon</key>
@@ -52,7 +52,7 @@
 		<key>positionOfDivider</key>
 		<real>0.0</real>
 		<key>savedFrame</key>
-		<string>320 125 1002 753 0 0 1440 878 </string>
+		<string>85 100 1002 753 0 0 1440 878 </string>
 		<key>selectedTabView</key>
 		<string>event log</string>
 	</dict>

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

@@ -27,14 +27,18 @@ __docformat__ = 'restructuredtext en'
 # Revision history:
 #   6.0.0 - Initial release
 #   6.0.1 - Bug Fixes for Windows App, Kindle for Mac and Windows Adobe Digital Editions
-#   6.0.2 - Restored call to Wine to get Kindle for PC keys
+#   6.0.2 - Restored call to Wine to get Kindle for PC keys, added for ADE
+#   6.0.3 - Fixes for Kindle for Mac and Windows non-ascii user names
+#   6.0.4 - Fixes for stand-alone scripts and applications
+#           and pdb files in plugin and initial conversion of prefs.
+#   6.0.6 - Fix up an incorrect function call
 
 """
 Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 0, 2)
+PLUGIN_VERSION_TUPLE = (6, 0, 7)
 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'
@@ -213,10 +217,10 @@ class DeDRM(FileTypePlugin):
                 else: # linux
                     from wineutils import WineGetKeys
 
-                    scriptpath = os.join(self.alfdir,u"adobekey.py")
+                    scriptpath = os.path.join(self.alfdir,u"adobekey.py")
                     defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
 
-                self.default_key = default_keys[0]
+                self.default_key = defaultkeys[0]
             except:
                 traceback.print_exc()
                 self.default_key = u""
@@ -308,7 +312,7 @@ class DeDRM(FileTypePlugin):
                 try:
                     from wineutils import WineGetKeys
 
-                    scriptpath = os.join(self.alfdir,u"adobekey.py")
+                    scriptpath = os.path.join(self.alfdir,u"adobekey.py")
                     defaultkeys = self.WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
                 except:
                     pass
@@ -386,7 +390,7 @@ class DeDRM(FileTypePlugin):
                 else: # linux
                     from wineutils import WineGetKeys
 
-                    scriptpath = os.join(self.alfdir,u"kindlekey.py")
+                    scriptpath = os.path.join(self.alfdir,u"kindlekey.py")
                     defaultkeys = self.WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix'])
             except:
                 pass
@@ -426,7 +430,7 @@ class DeDRM(FileTypePlugin):
         import calibre_plugins.dedrm.prefs as prefs
         import calibre_plugins.dedrm.erdr2pml
 
-        dedrmrefs = prefs.DeDRM_Prefs()
+        dedrmprefs = prefs.DeDRM_Prefs()
         # Attempt to decrypt epub with each encryption key (generated or provided).
         for keyname, userkey in dedrmprefs['ereaderkeys'].items():
             keyname_masked = u"".join((u'X' if (x.isdigit()) else x) for x in keyname)

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

@@ -6,7 +6,7 @@ from __future__ import with_statement
 __license__ = 'GPL v3'
 
 # Standard Python modules.
-import os, traceback
+import os, traceback, json
 
 # PyQT4 modules (part of calibre).
 from PyQt4.Qt import (Qt, QWidget, QHBoxLayout, QVBoxLayout, QLabel, QLineEdit,
@@ -178,8 +178,8 @@ class ManageKeysDialog(QDialog):
         self.create_key = create_key
         self.keyfile_ext = keyfile_ext
         self.import_key = (keyfile_ext != u"")
-        self.binary_file = (keyfile_ext == u".der")
-        self.json_file = (keyfile_ext == u".k4i")
+        self.binary_file = (keyfile_ext == u"der")
+        self.json_file = (keyfile_ext == u"k4i")
         self.wineprefix = wineprefix
 
         self.setWindowTitle("{0} {1}: Manage {2}s".format(PLUGIN_NAME, PLUGIN_VERSION, self.key_type_name))
@@ -676,7 +676,7 @@ class AddAdeptDialog(QDialog):
                 from calibre_plugins.dedrm.adobekey import adeptkeys
 
                 defaultkeys = adeptkeys()
-            else: # linux
+            else:  # linux
                 from wineutils import WineGetKeys
 
                 scriptpath = os.path.join(parent.parent.alfdir,u"adobekey.py")

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

@@ -3,7 +3,7 @@
 
 from __future__ import with_statement
 
-# ineptepub.pyw, version 5.9
+# ineptepub.pyw, version 6.1
 # Copyright © 2009-2010 by i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3

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

@@ -51,14 +51,15 @@ from __future__ import with_statement
 #   7.12 - Revised to allow use in calibre plugins to eliminate need for duplicate code
 #   7.13 - Fixed erroneous mentions of ineptepub
 #   7.14 - moved unicode_argv call inside main for Windows DeDRM compatibility
-#   8.0 - Work if TkInter is missing
+#   8.0  - Work if TkInter is missing
+#   8.0.1 - Broken Metadata fix.
 
 """
 Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0"
+__version__ = "8.0.1"
 
 import sys
 import os
@@ -949,8 +950,11 @@ class PSStackParser(PSBaseParser):
                 try:
                     (pos, objs) = self.end_type('d')
                     if len(objs) % 2 != 0:
-                        raise PSSyntaxError(
-                            'Invalid dictionary construct: %r' % objs)
+                        print "Incomplete dictionary construct"
+                        objs.append("") # this isn't necessary.
+                        # temporary fix. is this due to rental books?
+                        # raise PSSyntaxError(
+                        #     'Invalid dictionary construct: %r' % objs)
                     d = dict((literal_name(k), v) \
                                  for (k,v) in choplist(2, objs))
                     self.push((pos, d))

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

@@ -54,8 +54,9 @@ from __future__ import with_statement
 #  5.0 - Extraction of info from Kindle for PC/Mac moved into kindlekey.py
 #      - tweaked GetDecryptedBook interface to leave passed parameters unchanged
 #  5.1 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  5.2 - Fixed error in command line processing of unicode arguments
 
-__version__ = '5.1'
+__version__ = '5.2'
 
 
 import sys, os, re
@@ -187,7 +188,7 @@ def unescape(text):
 def GetDecryptedBook(infile, kDatabases, serials, pids, starttime = time.time()):
     # handle the obvious cases at the beginning
     if not os.path.isfile(infile):
-        raise DRMException (u"Input file does not exist.")
+        raise DrmException(u"Input file does not exist.")
 
     mobi = True
     magic3 = open(infile,'rb').read(3)
@@ -283,7 +284,7 @@ def cli_main():
     print u"K4MobiDeDrm v{0}.\nCopyright © 2008-2013 The Dark Reverser et al.".format(__version__)
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
+        opts, args = getopt.getopt(argv[1:], "k:p:s:")
     except getopt.GetoptError, err:
         print u"Error in options or arguments: {0}".format(err.args[0])
         usage(progname)

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

@@ -68,9 +68,10 @@
 #  0.38 - Unicode used wherever possible, cope with absent alfcrypto
 #  0.39 - Fixed problem with TEXtREAd and getBookType interface
 #  0.40 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  0.41 - Fixed potential unicode problem in command line calls
 
 
-__version__ = u"0.40"
+__version__ = u"0.41"
 
 import sys
 import os
@@ -514,7 +515,7 @@ def cli_main():
         print u"MobiDeDrm v{0}.\nCopyright © 2008-2012 The Dark Reverser et al.".format(__version__)
         print u"Removes protection from Kindle/Mobipocket, Kindle/KF8 and Kindle/Print Replica ebooks"
         print u"Usage:"
-        print u"    {0} <infile> <outfile> [<Comma separated list of PIDs to try>]".format(os.path.basename(sys.argv[0]))
+        print u"    {0} <infile> <outfile> [<Comma separated list of PIDs to try>]".format(progname)
         return 1
     else:
         infile = argv[1]

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

@@ -114,7 +114,7 @@ def convertprefs(always = False):
                 # Generate eReader user key from name and credit card number.
                 keyname = u"{0}_{1}".format(name.strip(),cc.strip()[-4:])
                 keyvalue = getuser_key(name,cc).encode('hex')
-                userkeysappend([keyname,keyvalue])
+                userkeys.append([keyname,keyvalue])
             except Exception, e:
                 traceback.print_exc()
                 print e.args[0]
@@ -231,21 +231,20 @@ def convertprefs(always = False):
         dedrmprefs.addnamedvaluetoprefs('bandnkeys', name, value)
     addedkeycount = len(dedrmprefs['bandnkeys'])-priorkeycount
     if addedkeycount > 0:
-        print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, ignoblecount, u"key file" if ignoblecount==1 else u"key files")
+        print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"key file" if addedkeycount==1 else u"key files")
     # Make the json write all the prefs to disk
     dedrmprefs.writeprefs(False)
 
     # get any .der files in the config dir
     priorkeycount = len(dedrmprefs['adeptkeys'])
     adeptfilekeys = getConfigFiles('.der','hex')
-    ineptcount = addConfigFiles('.der', 'adeptkeys')
     for keypair in adeptfilekeys:
         name = keypair[0]
         value = keypair[1]
         dedrmprefs.addnamedvaluetoprefs('adeptkeys', name, value)
     addedkeycount = len(dedrmprefs['adeptkeys'])-priorkeycount
     if addedkeycount > 0:
-        print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, ineptcount, u"keyfile" if ineptcount==1 else u"keyfiles")
+        print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"keyfile" if addedkeycount==1 else u"keyfiles")
     # Make the json write all the prefs to disk
     dedrmprefs.writeprefs(False)
 
@@ -280,7 +279,7 @@ def convertprefs(always = False):
     if addedserialcount > 0:
         print u"{0} v{1}: {2:d} {3} imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, addedserialcount, u"serial number" if addedserialcount==1 else u"serial numbers")
     try:
-        if kindleprefs['wineprefix'] != "":
+        if 'wineprefix' in kindleprefs and kindleprefs['wineprefix'] != "":
             dedrmprefs.set('adobewineprefix',kindleprefs['wineprefix'])
             dedrmprefs.set('kindlewineprefix',kindleprefs['wineprefix'])
             print u"{0} v{1}: WINEPREFIX ‘(2)’ imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, kindleprefs['wineprefix'])

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

@@ -6,8 +6,9 @@
 
 # Changelog
 #  4.9  - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  5.0  - Fixed potential unicode problem with command line interface
 
-__version__ = '4.9'
+__version__ = '5.0'
 
 import sys
 import os, csv, getopt
@@ -451,7 +452,7 @@ def cli_main():
     print u"TopazExtract v{0}.".format(__version__)
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:x")
+        opts, args = getopt.getopt(argv[1:], "k:p:s:x")
     except getopt.GetoptError, err:
         print u"Error in options or arguments: {0}".format(err.args[0])
         usage(progname)

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

@@ -24,7 +24,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
 
     outdirpath = os.path.join(basepath, u"winekeysdir")
     if not os.path.exists(outdirpath):
-        os.mkdir(outdirpath)
+        os.makedirs(outdirpath)
 
     if wineprefix != "" and os.path.exists(wineprefix):
          cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw

@@ -9,8 +9,10 @@
 #   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
 
-__version__ = '6.0.3'
+__version__ = '6.0.7'
 
 import sys
 import os, os.path

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py

@@ -27,14 +27,18 @@ __docformat__ = 'restructuredtext en'
 # Revision history:
 #   6.0.0 - Initial release
 #   6.0.1 - Bug Fixes for Windows App, Kindle for Mac and Windows Adobe Digital Editions
-#   6.0.2 - Restored call to Wine to get Kindle for PC keys
+#   6.0.2 - Restored call to Wine to get Kindle for PC keys, added for ADE
+#   6.0.3 - Fixes for Kindle for Mac and Windows non-ascii user names
+#   6.0.4 - Fixes for stand-alone scripts and applications
+#           and pdb files in plugin and initial conversion of prefs.
+#   6.0.6 - Fix up an incorrect function call
 
 """
 Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 0, 2)
+PLUGIN_VERSION_TUPLE = (6, 0, 7)
 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'
@@ -213,10 +217,10 @@ class DeDRM(FileTypePlugin):
                 else: # linux
                     from wineutils import WineGetKeys
 
-                    scriptpath = os.join(self.alfdir,u"adobekey.py")
+                    scriptpath = os.path.join(self.alfdir,u"adobekey.py")
                     defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
 
-                self.default_key = default_keys[0]
+                self.default_key = defaultkeys[0]
             except:
                 traceback.print_exc()
                 self.default_key = u""
@@ -308,7 +312,7 @@ class DeDRM(FileTypePlugin):
                 try:
                     from wineutils import WineGetKeys
 
-                    scriptpath = os.join(self.alfdir,u"adobekey.py")
+                    scriptpath = os.path.join(self.alfdir,u"adobekey.py")
                     defaultkeys = self.WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
                 except:
                     pass
@@ -386,7 +390,7 @@ class DeDRM(FileTypePlugin):
                 else: # linux
                     from wineutils import WineGetKeys
 
-                    scriptpath = os.join(self.alfdir,u"kindlekey.py")
+                    scriptpath = os.path.join(self.alfdir,u"kindlekey.py")
                     defaultkeys = self.WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix'])
             except:
                 pass
@@ -426,7 +430,7 @@ class DeDRM(FileTypePlugin):
         import calibre_plugins.dedrm.prefs as prefs
         import calibre_plugins.dedrm.erdr2pml
 
-        dedrmrefs = prefs.DeDRM_Prefs()
+        dedrmprefs = prefs.DeDRM_Prefs()
         # Attempt to decrypt epub with each encryption key (generated or provided).
         for keyname, userkey in dedrmprefs['ereaderkeys'].items():
             keyname_masked = u"".join((u'X' if (x.isdigit()) else x) for x in keyname)

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/config.py

@@ -6,7 +6,7 @@ from __future__ import with_statement
 __license__ = 'GPL v3'
 
 # Standard Python modules.
-import os, traceback
+import os, traceback, json
 
 # PyQT4 modules (part of calibre).
 from PyQt4.Qt import (Qt, QWidget, QHBoxLayout, QVBoxLayout, QLabel, QLineEdit,
@@ -178,8 +178,8 @@ class ManageKeysDialog(QDialog):
         self.create_key = create_key
         self.keyfile_ext = keyfile_ext
         self.import_key = (keyfile_ext != u"")
-        self.binary_file = (keyfile_ext == u".der")
-        self.json_file = (keyfile_ext == u".k4i")
+        self.binary_file = (keyfile_ext == u"der")
+        self.json_file = (keyfile_ext == u"k4i")
         self.wineprefix = wineprefix
 
         self.setWindowTitle("{0} {1}: Manage {2}s".format(PLUGIN_NAME, PLUGIN_VERSION, self.key_type_name))
@@ -676,7 +676,7 @@ class AddAdeptDialog(QDialog):
                 from calibre_plugins.dedrm.adobekey import adeptkeys
 
                 defaultkeys = adeptkeys()
-            else: # linux
+            else:  # linux
                 from wineutils import WineGetKeys
 
                 scriptpath = os.path.join(parent.parent.alfdir,u"adobekey.py")

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py

@@ -3,7 +3,7 @@
 
 from __future__ import with_statement
 
-# ineptepub.pyw, version 5.9
+# ineptepub.pyw, version 6.1
 # Copyright © 2009-2010 by i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py

@@ -51,14 +51,15 @@ from __future__ import with_statement
 #   7.12 - Revised to allow use in calibre plugins to eliminate need for duplicate code
 #   7.13 - Fixed erroneous mentions of ineptepub
 #   7.14 - moved unicode_argv call inside main for Windows DeDRM compatibility
-#   8.0 - Work if TkInter is missing
+#   8.0  - Work if TkInter is missing
+#   8.0.1 - Broken Metadata fix.
 
 """
 Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0"
+__version__ = "8.0.1"
 
 import sys
 import os
@@ -949,8 +950,11 @@ class PSStackParser(PSBaseParser):
                 try:
                     (pos, objs) = self.end_type('d')
                     if len(objs) % 2 != 0:
-                        raise PSSyntaxError(
-                            'Invalid dictionary construct: %r' % objs)
+                        print "Incomplete dictionary construct"
+                        objs.append("") # this isn't necessary.
+                        # temporary fix. is this due to rental books?
+                        # raise PSSyntaxError(
+                        #     'Invalid dictionary construct: %r' % objs)
                     d = dict((literal_name(k), v) \
                                  for (k,v) in choplist(2, objs))
                     self.push((pos, d))

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4mobidedrm.py

@@ -54,8 +54,9 @@ from __future__ import with_statement
 #  5.0 - Extraction of info from Kindle for PC/Mac moved into kindlekey.py
 #      - tweaked GetDecryptedBook interface to leave passed parameters unchanged
 #  5.1 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  5.2 - Fixed error in command line processing of unicode arguments
 
-__version__ = '5.1'
+__version__ = '5.2'
 
 
 import sys, os, re
@@ -187,7 +188,7 @@ def unescape(text):
 def GetDecryptedBook(infile, kDatabases, serials, pids, starttime = time.time()):
     # handle the obvious cases at the beginning
     if not os.path.isfile(infile):
-        raise DRMException (u"Input file does not exist.")
+        raise DrmException(u"Input file does not exist.")
 
     mobi = True
     magic3 = open(infile,'rb').read(3)
@@ -283,7 +284,7 @@ def cli_main():
     print u"K4MobiDeDrm v{0}.\nCopyright © 2008-2013 The Dark Reverser et al.".format(__version__)
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
+        opts, args = getopt.getopt(argv[1:], "k:p:s:")
     except getopt.GetoptError, err:
         print u"Error in options or arguments: {0}".format(err.args[0])
         usage(progname)

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/mobidedrm.py

@@ -68,9 +68,10 @@
 #  0.38 - Unicode used wherever possible, cope with absent alfcrypto
 #  0.39 - Fixed problem with TEXtREAd and getBookType interface
 #  0.40 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  0.41 - Fixed potential unicode problem in command line calls
 
 
-__version__ = u"0.40"
+__version__ = u"0.41"
 
 import sys
 import os
@@ -514,7 +515,7 @@ def cli_main():
         print u"MobiDeDrm v{0}.\nCopyright © 2008-2012 The Dark Reverser et al.".format(__version__)
         print u"Removes protection from Kindle/Mobipocket, Kindle/KF8 and Kindle/Print Replica ebooks"
         print u"Usage:"
-        print u"    {0} <infile> <outfile> [<Comma separated list of PIDs to try>]".format(os.path.basename(sys.argv[0]))
+        print u"    {0} <infile> <outfile> [<Comma separated list of PIDs to try>]".format(progname)
         return 1
     else:
         infile = argv[1]

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/prefs.py

@@ -114,7 +114,7 @@ def convertprefs(always = False):
                 # Generate eReader user key from name and credit card number.
                 keyname = u"{0}_{1}".format(name.strip(),cc.strip()[-4:])
                 keyvalue = getuser_key(name,cc).encode('hex')
-                userkeysappend([keyname,keyvalue])
+                userkeys.append([keyname,keyvalue])
             except Exception, e:
                 traceback.print_exc()
                 print e.args[0]
@@ -231,21 +231,20 @@ def convertprefs(always = False):
         dedrmprefs.addnamedvaluetoprefs('bandnkeys', name, value)
     addedkeycount = len(dedrmprefs['bandnkeys'])-priorkeycount
     if addedkeycount > 0:
-        print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, ignoblecount, u"key file" if ignoblecount==1 else u"key files")
+        print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"key file" if addedkeycount==1 else u"key files")
     # Make the json write all the prefs to disk
     dedrmprefs.writeprefs(False)
 
     # get any .der files in the config dir
     priorkeycount = len(dedrmprefs['adeptkeys'])
     adeptfilekeys = getConfigFiles('.der','hex')
-    ineptcount = addConfigFiles('.der', 'adeptkeys')
     for keypair in adeptfilekeys:
         name = keypair[0]
         value = keypair[1]
         dedrmprefs.addnamedvaluetoprefs('adeptkeys', name, value)
     addedkeycount = len(dedrmprefs['adeptkeys'])-priorkeycount
     if addedkeycount > 0:
-        print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, ineptcount, u"keyfile" if ineptcount==1 else u"keyfiles")
+        print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"keyfile" if addedkeycount==1 else u"keyfiles")
     # Make the json write all the prefs to disk
     dedrmprefs.writeprefs(False)
 
@@ -280,7 +279,7 @@ def convertprefs(always = False):
     if addedserialcount > 0:
         print u"{0} v{1}: {2:d} {3} imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, addedserialcount, u"serial number" if addedserialcount==1 else u"serial numbers")
     try:
-        if kindleprefs['wineprefix'] != "":
+        if 'wineprefix' in kindleprefs and kindleprefs['wineprefix'] != "":
             dedrmprefs.set('adobewineprefix',kindleprefs['wineprefix'])
             dedrmprefs.set('kindlewineprefix',kindleprefs['wineprefix'])
             print u"{0} v{1}: WINEPREFIX ‘(2)’ imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, kindleprefs['wineprefix'])

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/topazextract.py

@@ -6,8 +6,9 @@
 
 # Changelog
 #  4.9  - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  5.0  - Fixed potential unicode problem with command line interface
 
-__version__ = '4.9'
+__version__ = '5.0'
 
 import sys
 import os, csv, getopt
@@ -451,7 +452,7 @@ def cli_main():
     print u"TopazExtract v{0}.".format(__version__)
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:x")
+        opts, args = getopt.getopt(argv[1:], "k:p:s:x")
     except getopt.GetoptError, err:
         print u"Error in options or arguments: {0}".format(err.args[0])
         usage(progname)

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/wineutils.py

@@ -24,7 +24,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
 
     outdirpath = os.path.join(basepath, u"winekeysdir")
     if not os.path.exists(outdirpath):
-        os.mkdir(outdirpath)
+        os.makedirs(outdirpath)
 
     if wineprefix != "" and os.path.exists(wineprefix):
          cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)

DeDRM_calibre_plugin/DeDRM_plugin/__init__.py

@@ -29,13 +29,16 @@ __docformat__ = 'restructuredtext en'
 #   6.0.1 - Bug Fixes for Windows App, Kindle for Mac and Windows Adobe Digital Editions
 #   6.0.2 - Restored call to Wine to get Kindle for PC keys, added for ADE
 #   6.0.3 - Fixes for Kindle for Mac and Windows non-ascii user names
+#   6.0.4 - Fixes for stand-alone scripts and applications
+#           and pdb files in plugin and initial conversion of prefs.
+#   6.0.6 - Fix up an incorrect function call
 
 """
 Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 0, 3)
+PLUGIN_VERSION_TUPLE = (6, 0, 7)
 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'
@@ -214,10 +217,10 @@ class DeDRM(FileTypePlugin):
                 else: # linux
                     from wineutils import WineGetKeys
 
-                    scriptpath = os.join(self.alfdir,u"adobekey.py")
+                    scriptpath = os.path.join(self.alfdir,u"adobekey.py")
                     defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
 
-                self.default_key = default_keys[0]
+                self.default_key = defaultkeys[0]
             except:
                 traceback.print_exc()
                 self.default_key = u""
@@ -309,7 +312,7 @@ class DeDRM(FileTypePlugin):
                 try:
                     from wineutils import WineGetKeys
 
-                    scriptpath = os.join(self.alfdir,u"adobekey.py")
+                    scriptpath = os.path.join(self.alfdir,u"adobekey.py")
                     defaultkeys = self.WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
                 except:
                     pass
@@ -387,7 +390,7 @@ class DeDRM(FileTypePlugin):
                 else: # linux
                     from wineutils import WineGetKeys
 
-                    scriptpath = os.join(self.alfdir,u"kindlekey.py")
+                    scriptpath = os.path.join(self.alfdir,u"kindlekey.py")
                     defaultkeys = self.WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix'])
             except:
                 pass
@@ -427,7 +430,7 @@ class DeDRM(FileTypePlugin):
         import calibre_plugins.dedrm.prefs as prefs
         import calibre_plugins.dedrm.erdr2pml
 
-        dedrmrefs = prefs.DeDRM_Prefs()
+        dedrmprefs = prefs.DeDRM_Prefs()
         # Attempt to decrypt epub with each encryption key (generated or provided).
         for keyname, userkey in dedrmprefs['ereaderkeys'].items():
             keyname_masked = u"".join((u'X' if (x.isdigit()) else x) for x in keyname)

DeDRM_calibre_plugin/DeDRM_plugin/config.py

@@ -6,7 +6,7 @@ from __future__ import with_statement
 __license__ = 'GPL v3'
 
 # Standard Python modules.
-import os, traceback
+import os, traceback, json
 
 # PyQT4 modules (part of calibre).
 from PyQt4.Qt import (Qt, QWidget, QHBoxLayout, QVBoxLayout, QLabel, QLineEdit,
@@ -178,8 +178,8 @@ class ManageKeysDialog(QDialog):
         self.create_key = create_key
         self.keyfile_ext = keyfile_ext
         self.import_key = (keyfile_ext != u"")
-        self.binary_file = (keyfile_ext == u".der")
-        self.json_file = (keyfile_ext == u".k4i")
+        self.binary_file = (keyfile_ext == u"der")
+        self.json_file = (keyfile_ext == u"k4i")
         self.wineprefix = wineprefix
 
         self.setWindowTitle("{0} {1}: Manage {2}s".format(PLUGIN_NAME, PLUGIN_VERSION, self.key_type_name))
@@ -676,7 +676,7 @@ class AddAdeptDialog(QDialog):
                 from calibre_plugins.dedrm.adobekey import adeptkeys
 
                 defaultkeys = adeptkeys()
-            else: # linux
+            else:  # linux
                 from wineutils import WineGetKeys
 
                 scriptpath = os.path.join(parent.parent.alfdir,u"adobekey.py")

DeDRM_calibre_plugin/DeDRM_plugin/ignoblekeygen.py

@@ -3,7 +3,7 @@
 
 from __future__ import with_statement
 
-# ineptepub.pyw, version 5.9
+# ineptepub.pyw, version 6.1
 # Copyright © 2009-2010 by i♥cabbages
 
 # Released under the terms of the GNU General Public Licence, version 3

DeDRM_calibre_plugin/DeDRM_plugin/ineptepub.py

@@ -51,14 +51,15 @@ from __future__ import with_statement
 #   7.12 - Revised to allow use in calibre plugins to eliminate need for duplicate code
 #   7.13 - Fixed erroneous mentions of ineptepub
 #   7.14 - moved unicode_argv call inside main for Windows DeDRM compatibility
-#   8.0 - Work if TkInter is missing
+#   8.0  - Work if TkInter is missing
+#   8.0.1 - Broken Metadata fix.
 
 """
 Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0"
+__version__ = "8.0.1"
 
 import sys
 import os
@@ -949,8 +950,11 @@ class PSStackParser(PSBaseParser):
                 try:
                     (pos, objs) = self.end_type('d')
                     if len(objs) % 2 != 0:
-                        raise PSSyntaxError(
-                            'Invalid dictionary construct: %r' % objs)
+                        print "Incomplete dictionary construct"
+                        objs.append("") # this isn't necessary.
+                        # temporary fix. is this due to rental books?
+                        # raise PSSyntaxError(
+                        #     'Invalid dictionary construct: %r' % objs)
                     d = dict((literal_name(k), v) \
                                  for (k,v) in choplist(2, objs))
                     self.push((pos, d))

DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py

@@ -54,8 +54,9 @@ from __future__ import with_statement
 #  5.0 - Extraction of info from Kindle for PC/Mac moved into kindlekey.py
 #      - tweaked GetDecryptedBook interface to leave passed parameters unchanged
 #  5.1 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  5.2 - Fixed error in command line processing of unicode arguments
 
-__version__ = '5.1'
+__version__ = '5.2'
 
 
 import sys, os, re
@@ -187,7 +188,7 @@ def unescape(text):
 def GetDecryptedBook(infile, kDatabases, serials, pids, starttime = time.time()):
     # handle the obvious cases at the beginning
     if not os.path.isfile(infile):
-        raise DRMException (u"Input file does not exist.")
+        raise DrmException(u"Input file does not exist.")
 
     mobi = True
     magic3 = open(infile,'rb').read(3)
@@ -283,7 +284,7 @@ def cli_main():
     print u"K4MobiDeDrm v{0}.\nCopyright © 2008-2013 The Dark Reverser et al.".format(__version__)
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:")
+        opts, args = getopt.getopt(argv[1:], "k:p:s:")
     except getopt.GetoptError, err:
         print u"Error in options or arguments: {0}".format(err.args[0])
         usage(progname)

DeDRM_calibre_plugin/DeDRM_plugin/libalfcrypto64.so

@@ -68,9 +68,10 @@
 #  0.38 - Unicode used wherever possible, cope with absent alfcrypto
 #  0.39 - Fixed problem with TEXtREAd and getBookType interface
 #  0.40 - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  0.41 - Fixed potential unicode problem in command line calls
 
 
-__version__ = u"0.40"
+__version__ = u"0.41"
 
 import sys
 import os
@@ -514,7 +515,7 @@ def cli_main():
         print u"MobiDeDrm v{0}.\nCopyright © 2008-2012 The Dark Reverser et al.".format(__version__)
         print u"Removes protection from Kindle/Mobipocket, Kindle/KF8 and Kindle/Print Replica ebooks"
         print u"Usage:"
-        print u"    {0} <infile> <outfile> [<Comma separated list of PIDs to try>]".format(os.path.basename(sys.argv[0]))
+        print u"    {0} <infile> <outfile> [<Comma separated list of PIDs to try>]".format(progname)
         return 1
     else:
         infile = argv[1]

DeDRM_calibre_plugin/DeDRM_plugin/plugin-import-name-dedrm.txt

@@ -114,7 +114,7 @@ def convertprefs(always = False):
                 # Generate eReader user key from name and credit card number.
                 keyname = u"{0}_{1}".format(name.strip(),cc.strip()[-4:])
                 keyvalue = getuser_key(name,cc).encode('hex')
-                userkeysappend([keyname,keyvalue])
+                userkeys.append([keyname,keyvalue])
             except Exception, e:
                 traceback.print_exc()
                 print e.args[0]
@@ -231,21 +231,20 @@ def convertprefs(always = False):
         dedrmprefs.addnamedvaluetoprefs('bandnkeys', name, value)
     addedkeycount = len(dedrmprefs['bandnkeys'])-priorkeycount
     if addedkeycount > 0:
-        print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, ignoblecount, u"key file" if ignoblecount==1 else u"key files")
+        print u"{0} v{1}: {2:d} Barnes and Noble {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"key file" if addedkeycount==1 else u"key files")
     # Make the json write all the prefs to disk
     dedrmprefs.writeprefs(False)
 
     # get any .der files in the config dir
     priorkeycount = len(dedrmprefs['adeptkeys'])
     adeptfilekeys = getConfigFiles('.der','hex')
-    ineptcount = addConfigFiles('.der', 'adeptkeys')
     for keypair in adeptfilekeys:
         name = keypair[0]
         value = keypair[1]
         dedrmprefs.addnamedvaluetoprefs('adeptkeys', name, value)
     addedkeycount = len(dedrmprefs['adeptkeys'])-priorkeycount
     if addedkeycount > 0:
-        print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, ineptcount, u"keyfile" if ineptcount==1 else u"keyfiles")
+        print u"{0} v{1}: {2:d} Adobe Adept {3} imported from config folder.".format(PLUGIN_NAME, PLUGIN_VERSION, addedkeycount, u"keyfile" if addedkeycount==1 else u"keyfiles")
     # Make the json write all the prefs to disk
     dedrmprefs.writeprefs(False)
 
@@ -280,7 +279,7 @@ def convertprefs(always = False):
     if addedserialcount > 0:
         print u"{0} v{1}: {2:d} {3} imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, addedserialcount, u"serial number" if addedserialcount==1 else u"serial numbers")
     try:
-        if kindleprefs['wineprefix'] != "":
+        if 'wineprefix' in kindleprefs and kindleprefs['wineprefix'] != "":
             dedrmprefs.set('adobewineprefix',kindleprefs['wineprefix'])
             dedrmprefs.set('kindlewineprefix',kindleprefs['wineprefix'])
             print u"{0} v{1}: WINEPREFIX ‘(2)’ imported from Kindle plugin preferences".format(PLUGIN_NAME, PLUGIN_VERSION, kindleprefs['wineprefix'])

DeDRM_calibre_plugin/DeDRM_plugin/utilities.py

@@ -6,8 +6,9 @@
 
 # Changelog
 #  4.9  - moved unicode_argv call inside main for Windows DeDRM compatibility
+#  5.0  - Fixed potential unicode problem with command line interface
 
-__version__ = '4.9'
+__version__ = '5.0'
 
 import sys
 import os, csv, getopt
@@ -451,7 +452,7 @@ def cli_main():
     print u"TopazExtract v{0}.".format(__version__)
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "k:p:s:x")
+        opts, args = getopt.getopt(argv[1:], "k:p:s:x")
     except getopt.GetoptError, err:
         print u"Error in options or arguments: {0}".format(err.args[0])
         usage(progname)

DeDRM_calibre_plugin/DeDRM_plugin/zipfix.py

@@ -24,7 +24,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
 
     outdirpath = os.path.join(basepath, u"winekeysdir")
     if not os.path.exists(outdirpath):
-        os.mkdir(outdirpath)
+        os.makedirs(outdirpath)
 
     if wineprefix != "" and os.path.exists(wineprefix):
          cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)

Other_Tools/DRM_Key_Scripts/Kindle_for_iOS/kindleiospidgen.py

@@ -0,0 +1,275 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+# kindleforios4key.py
+# Copyright © 2013 by Apprentice Alf
+# Portions Copyright © 2007, 2009 Igor Skochinsky <skochinsky@mail.ru>
+
+# Revision history:
+#  1.0   - Generates fixed PID for Kindle for iOS 3.1.1 running on iOS 4.x
+
+
+"""
+Generate fixed PID for Kindle for iOS 3.1.1
+"""
+
+__license__ = 'GPL v3'
+__version__ = '1.0'
+
+import sys, os
+import getopt
+import binascii
+
+# 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)
+
+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 '?'.
+
+
+        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"mobidedrm.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]
+
+import hashlib
+
+def SHA256(message):
+    ctx = hashlib.sha256()
+    ctx.update(message)
+    return ctx.digest()
+
+def crc32(s):
+    return (~binascii.crc32(s,-1))&0xFFFFFFFF
+
+letters = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
+
+def checksumPid(s):
+    crc = crc32(s)
+    crc = crc ^ (crc >> 16)
+    res = s
+    l = len(letters)
+    for i in (0,1):
+        b = crc & 0xff
+        pos = (b // l) ^ (b % l)
+        res += letters[pos%l]
+        crc >>= 8
+
+    return res
+
+def pidFromSerial(s, l):
+    crc = crc32(s)
+
+    arr1 = [0]*l
+    for i in xrange(len(s)):
+        arr1[i%l] ^= ord(s[i])
+
+    crc_bytes = [crc >> 24 & 0xff, crc >> 16 & 0xff, crc >> 8 & 0xff, crc & 0xff]
+    for i in xrange(l):
+        arr1[i] ^= crc_bytes[i&3]
+
+    pid = ''
+    for i in xrange(l):
+        b = arr1[i] & 0xff
+        pid+=letters[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))]
+
+    return pid
+
+def generatekeys(email, mac):
+    keys = []
+    email = email.encode('utf-8').lower()
+    mac = mac.encode('utf-8').lower()
+    cleanmac = "".join(c if (c in "0123456789abcdef") else "" for c in mac)
+    lowermac = cleanmac.lower()
+    #print lowermac
+    keyseed = lowermac + email.encode('utf-8')
+    #print keyseed
+    keysha256 = SHA256(keyseed)
+    keybase64 = keysha256.encode('base64')
+    #print keybase64
+    cleankeybase64 = "".join(c if (c in "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") else "0" for c in keybase64)
+    #print cleankeybase64
+    pseudoudid = cleankeybase64[:40]
+    #print pseudoudid
+    keys.append(pidFromSerial(pseudoudid.encode("utf-8"),8))
+    return keys
+
+# interface for Python DeDRM
+# returns single key or multiple keys, depending on path or file passed in
+def getkey(email, mac, outpath):
+    keys = generatekeys(email,mac)
+    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"kindleios{0:d}.pid".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"Generates the key for Kindle for iOS 3.1.1"
+    print u"Requires email address of Amazon acccount"
+    print u"And MAC address for iOS device’s wifi"
+    print u"Outputs to a file or to stdout"
+    print u"Usage:"
+    print u"    {0:s} [-h] <email address> <MAC address> [<outfile>]".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 © 2013 Apprentice Alf".format(progname,__version__)
+
+    try:
+        opts, args = getopt.getopt(argv[1:], "h")
+    except getopt.GetoptError, err:
+        print u"Error in options or arguments: {0}".format(err.args[0])
+        usage(progname)
+        sys.exit(2)
+
+    for o, a in opts:
+        if o == "-h":
+            usage(progname)
+            sys.exit(0)
+
+
+    if len(args) < 2 or len(args) > 3:
+        usage(progname)
+        sys.exit(2)
+
+    if len(args) == 3:
+        # save to the specified file or folder
+        getkey(args[0],args[1],args[2])
+    else:
+        keys = generatekeys(args[0],args[1])
+        for key in keys:
+            print key
+
+    return 0
+
+
+def gui_main():
+    try:
+        import Tkinter
+        import Tkconstants
+        import tkMessageBox
+    except:
+        print "Tkinter not installed"
+        return cli_main()
+
+    class DecryptionDialog(Tkinter.Frame):
+        def __init__(self, root):
+            Tkinter.Frame.__init__(self, root, border=5)
+            self.status = Tkinter.Label(self, text=u"Enter parameters")
+            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=u"Amazon email address").grid(row=0)
+            self.email = Tkinter.Entry(body, width=40)
+            self.email.grid(row=0, column=1, sticky=sticky)
+            Tkinter.Label(body, text=u"iOS  MAC address").grid(row=1)
+            self.mac = Tkinter.Entry(body, width=40)
+            self.mac.grid(row=1, column=1, sticky=sticky)
+            buttons = Tkinter.Frame(self)
+            buttons.pack()
+            button = Tkinter.Button(
+                buttons, text=u"Generate", width=10, command=self.generate)
+            button.pack(side=Tkconstants.LEFT)
+            Tkinter.Frame(buttons, width=10).pack(side=Tkconstants.LEFT)
+            button = Tkinter.Button(
+                buttons, text=u"Quit", width=10, command=self.quit)
+            button.pack(side=Tkconstants.RIGHT)
+
+        def generate(self):
+            email = self.email.get()
+            mac = self.mac.get()
+            if not email:
+                self.status['text'] = u"Email not specified"
+                return
+            if not mac:
+                self.status['text'] = u"MAC not specified"
+                return
+            self.status['text'] = u"Generating..."
+            try:
+                keys = generatekeys(email, mac)
+            except Exception, e:
+                self.status['text'] = u"Error: (0}".format(e.args[0])
+                return
+            self.status['text'] = ", ".join(key for key in keys)
+
+    root = Tkinter.Tk()
+    root.title(u"Kindle for iOS PID Generator v.{0}".format(__version__))
+    root.resizable(True, False)
+    root.minsize(300, 0)
+    DecryptionDialog(root).pack(fill=Tkconstants.X, expand=1)
+    root.mainloop()
+    return 0
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        sys.exit(cli_main())
+    sys.exit(gui_main())

ReadMe_First.txt

@@ -1,7 +1,7 @@
 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.0.3 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.0.5 archive from Apprentice Alf's Blog: http://apprenticealf.wordpress.com/
 
 The is archive includes tools to remove DRM from: