tools v6.0.3

diff --git a/DeDRM_Macintosh_Application/DeDRM.app.txt b/DeDRM_Macintosh_Application/DeDRM.app.txt
index 249a927fa61fe57dcfbe09527ed5c84cd8679d9e..f2d1384ca9c3b1f50184dc99b62f8c27266ce219 100644 (file)
Binary files a/DeDRM_Macintosh_Application/DeDRM.app.txt and b/DeDRM_Macintosh_Application/DeDRM.app.txt differ

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
index 26f91e954eeec4b0f7f65cd37fc2d0860f083b92..68ef7de0ac5374cb065179e08c2a71758820a88e 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
@@ -24,9 +24,11 @@
        <key>CFBundleExecutable</key>
        <string>droplet</string>
        <key>CFBundleGetInfoString</key>
-       <string>DeDRM AppleScript 6.0.2. Written 2010–2013 by Apprentice Alf and others.</string>
+       <string>DeDRM AppleScript 6.0.3. 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>
        <key>CFBundleName</key>
@@ -34,7 +36,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.0.2</string>
+       <string>6.0.3</string>
        <key>CFBundleSignature</key>
        <string>dplt</string>
        <key>LSRequiresCarbon</key>
@@ -48,9 +50,9 @@
                <key>name</key>
                <string>ScriptWindowState</string>
                <key>positionOfDivider</key>
-               <real>0</real>
+               <real>0.0</real>
                <key>savedFrame</key>
-               <string>1616 -35 765 818 1440 -180 1920 1080 </string>
+               <string>320 125 1002 753 0 0 1440 878 </string>
                <key>selectedTabView</key>
                <string>event log</string>
        </dict>

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/Scripts/main.scpt b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/Scripts/main.scpt
index 868ae102d6cbe832e9a62b742c3ddd97ccd3f6d9..f1f8656e3b33b54865c7d07af3ce54dd6876321b 100644 (file)
Binary files a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/Scripts/main.scpt and b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/Scripts/main.scpt differ

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf
index cbc6490b2aaafb44e0f5bb0c9f2d79900ff70357..d868171ea3f409e1b69165a5f2de469199c962d7 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
 {\fonttbl}
 {\colortbl;\red255\green255\blue255;}
 }
\ No newline at end of file

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py
index c84c458f898487d31bb53b9e0b3ca7222911cc5c..f58e973414e7aeaa590d5eff87bd2b9953899357 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py
@@ -18,6 +18,7 @@ from __future__ import with_statement
 #  1.5   - moved unicode_argv call inside main for Windows DeDRM compatibility
 #  1.6   - Fixed a problem getting the disk serial numbers
 #  1.7   - Work if TkInter is missing
+#  1.8   - Fixes for Kindle for Mac, and non-ascii in Windows user names
 
 
 """
@@ -25,7 +26,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '1.7'
+__version__ = '1.8'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -1142,7 +1143,7 @@ if iswindows:
                 DB[keyname] = cleartext
 
         if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-            print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName())
+            print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName().decode("latin-1"))
             # store values used in decryption
             DB['IDString'] = GetIDString()
             DB['UserName'] = GetUserName()
@@ -1521,20 +1522,32 @@ elif isosx:
             kInfoFiles.append(testpath)
             print('Found k4Mac kinf2011 file: ' + testpath)
             found = True
-        # check for  .kinf2011 files
+        # check for  .kinf2011 files from 1.10
         testpath = home + '/Library/Application Support/Kindle/storage/.kinf2011'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac kinf2011 file: ' + testpath)
             found = True
-        # check for  .rainier-2.1.1-kinf files
+        # check for  .rainier-2.1.1-kinf files from 1.6
         testpath = home + '/Library/Application Support/Kindle/storage/.rainier-2.1.1-kinf'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac rainier file: ' + testpath)
             found = True
-        # check for  .kindle-info files
+        # check for  .kindle-info files from 1.4
         testpath = home + '/Library/Application Support/Kindle/storage/.kindle-info'
+        if os.path.isfile(testpath):
+            kInfoFiles.append(testpath)
+            print('Found k4Mac kindle-info file: ' + testpath)
+            found = True
+        # check for  .kindle-info file from 1.2.2
+        testpath = home + '/Library/Application Support/Amazon/Kindle/storage/.kindle-info'
+        if os.path.isfile(testpath):
+            kInfoFiles.append(testpath)
+            print('Found k4Mac kindle-info file: ' + testpath)
+            found = True
+        # check for  .kindle-info file from 1.0 beta 1 (27214)
+        testpath = home + '/Library/Application Support/Amazon/Kindle for Mac/storage/.kindle-info'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac kindle-info file: ' + testpath)

diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw
index 95ab638c8747d4e7250c5d2983bd22262a6dd4a7..de650c98b8448fbade577b18c586ca647e0a95ea 100644 (file)
--- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw
+++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw
@@ -7,9 +7,10 @@
 # Revision history:
 #   6.0.0 - Release along with unified plugin
 #   6.0.1 - Bug Fixes for Windows App
-#   6.0.2 - Changes only in the plugin so far
+#   6.0.2 - Fixed problem with spaces in paths and the bat file
+#   6.0.3 - Fix for Windows non-ascii user names
 
-__version__ = '6.0.2'
+__version__ = '6.0.3'
 
 import sys
 import os, os.path

diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py
index c84c458f898487d31bb53b9e0b3ca7222911cc5c..f58e973414e7aeaa590d5eff87bd2b9953899357 100644 (file)
--- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py
+++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py
@@ -18,6 +18,7 @@ from __future__ import with_statement
 #  1.5   - moved unicode_argv call inside main for Windows DeDRM compatibility
 #  1.6   - Fixed a problem getting the disk serial numbers
 #  1.7   - Work if TkInter is missing
+#  1.8   - Fixes for Kindle for Mac, and non-ascii in Windows user names
 
 
 """
@@ -25,7 +26,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '1.7'
+__version__ = '1.8'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -1142,7 +1143,7 @@ if iswindows:
                 DB[keyname] = cleartext
 
         if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-            print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName())
+            print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName().decode("latin-1"))
             # store values used in decryption
             DB['IDString'] = GetIDString()
             DB['UserName'] = GetUserName()
@@ -1521,20 +1522,32 @@ elif isosx:
             kInfoFiles.append(testpath)
             print('Found k4Mac kinf2011 file: ' + testpath)
             found = True
-        # check for  .kinf2011 files
+        # check for  .kinf2011 files from 1.10
         testpath = home + '/Library/Application Support/Kindle/storage/.kinf2011'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac kinf2011 file: ' + testpath)
             found = True
-        # check for  .rainier-2.1.1-kinf files
+        # check for  .rainier-2.1.1-kinf files from 1.6
         testpath = home + '/Library/Application Support/Kindle/storage/.rainier-2.1.1-kinf'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac rainier file: ' + testpath)
             found = True
-        # check for  .kindle-info files
+        # check for  .kindle-info files from 1.4
         testpath = home + '/Library/Application Support/Kindle/storage/.kindle-info'
+        if os.path.isfile(testpath):
+            kInfoFiles.append(testpath)
+            print('Found k4Mac kindle-info file: ' + testpath)
+            found = True
+        # check for  .kindle-info file from 1.2.2
+        testpath = home + '/Library/Application Support/Amazon/Kindle/storage/.kindle-info'
+        if os.path.isfile(testpath):
+            kInfoFiles.append(testpath)
+            print('Found k4Mac kindle-info file: ' + testpath)
+            found = True
+        # check for  .kindle-info file from 1.0 beta 1 (27214)
+        testpath = home + '/Library/Application Support/Amazon/Kindle for Mac/storage/.kindle-info'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac kindle-info file: ' + testpath)

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin.zip b/DeDRM_calibre_plugin/DeDRM_plugin.zip
index 1868b8139d9136cf1c04b90bb44274d39382b7ed..8025aba272028f2513be36170df0c41bf23353e7 100644 (file)
Binary files a/DeDRM_calibre_plugin/DeDRM_plugin.zip and b/DeDRM_calibre_plugin/DeDRM_plugin.zip differ

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py b/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
index ce72c8de4882bfc7fc5eca5b8334b09cd00a2181..9c62f40885c15845c71e8e8da9f64381533f80d1 100644 (file)
--- a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
@@ -27,14 +27,15 @@ __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
 
 """
 Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 0, 2)
+PLUGIN_VERSION_TUPLE = (6, 0, 3)
 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'

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/kgenpids.py b/DeDRM_calibre_plugin/DeDRM_plugin/kgenpids.py
index c84c458f898487d31bb53b9e0b3ca7222911cc5c..f58e973414e7aeaa590d5eff87bd2b9953899357 100644 (file)
--- a/DeDRM_calibre_plugin/DeDRM_plugin/kgenpids.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/kgenpids.py
@@ -18,6 +18,7 @@ from __future__ import with_statement
 #  1.5   - moved unicode_argv call inside main for Windows DeDRM compatibility
 #  1.6   - Fixed a problem getting the disk serial numbers
 #  1.7   - Work if TkInter is missing
+#  1.8   - Fixes for Kindle for Mac, and non-ascii in Windows user names
 
 
 """
@@ -25,7 +26,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '1.7'
+__version__ = '1.8'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -1142,7 +1143,7 @@ if iswindows:
                 DB[keyname] = cleartext
 
         if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-            print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName())
+            print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName().decode("latin-1"))
             # store values used in decryption
             DB['IDString'] = GetIDString()
             DB['UserName'] = GetUserName()
@@ -1521,20 +1522,32 @@ elif isosx:
             kInfoFiles.append(testpath)
             print('Found k4Mac kinf2011 file: ' + testpath)
             found = True
-        # check for  .kinf2011 files
+        # check for  .kinf2011 files from 1.10
         testpath = home + '/Library/Application Support/Kindle/storage/.kinf2011'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac kinf2011 file: ' + testpath)
             found = True
-        # check for  .rainier-2.1.1-kinf files
+        # check for  .rainier-2.1.1-kinf files from 1.6
         testpath = home + '/Library/Application Support/Kindle/storage/.rainier-2.1.1-kinf'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac rainier file: ' + testpath)
             found = True
-        # check for  .kindle-info files
+        # check for  .kindle-info files from 1.4
         testpath = home + '/Library/Application Support/Kindle/storage/.kindle-info'
+        if os.path.isfile(testpath):
+            kInfoFiles.append(testpath)
+            print('Found k4Mac kindle-info file: ' + testpath)
+            found = True
+        # check for  .kindle-info file from 1.2.2
+        testpath = home + '/Library/Application Support/Amazon/Kindle/storage/.kindle-info'
+        if os.path.isfile(testpath):
+            kInfoFiles.append(testpath)
+            print('Found k4Mac kindle-info file: ' + testpath)
+            found = True
+        # check for  .kindle-info file from 1.0 beta 1 (27214)
+        testpath = home + '/Library/Application Support/Amazon/Kindle for Mac/storage/.kindle-info'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac kindle-info file: ' + testpath)

diff --git a/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw b/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
index c84c458f898487d31bb53b9e0b3ca7222911cc5c..f58e973414e7aeaa590d5eff87bd2b9953899357 100644 (file)
--- a/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
+++ b/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
@@ -18,6 +18,7 @@ from __future__ import with_statement
 #  1.5   - moved unicode_argv call inside main for Windows DeDRM compatibility
 #  1.6   - Fixed a problem getting the disk serial numbers
 #  1.7   - Work if TkInter is missing
+#  1.8   - Fixes for Kindle for Mac, and non-ascii in Windows user names
 
 
 """
@@ -25,7 +26,7 @@ Retrieve Kindle for PC/Mac user key.
 """
 
 __license__ = 'GPL v3'
-__version__ = '1.7'
+__version__ = '1.8'
 
 import sys, os, re
 from struct import pack, unpack, unpack_from
@@ -1142,7 +1143,7 @@ if iswindows:
                 DB[keyname] = cleartext
 
         if 'MazamaRandomNumber' in DB and 'kindle.account.tokens' in DB:
-            print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName())
+            print u"Decrypted key file using IDString '{0:s}' and UserName '{1:s}'".format(GetIDString(), GetUserName().decode("latin-1"))
             # store values used in decryption
             DB['IDString'] = GetIDString()
             DB['UserName'] = GetUserName()
@@ -1521,20 +1522,32 @@ elif isosx:
             kInfoFiles.append(testpath)
             print('Found k4Mac kinf2011 file: ' + testpath)
             found = True
-        # check for  .kinf2011 files
+        # check for  .kinf2011 files from 1.10
         testpath = home + '/Library/Application Support/Kindle/storage/.kinf2011'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac kinf2011 file: ' + testpath)
             found = True
-        # check for  .rainier-2.1.1-kinf files
+        # check for  .rainier-2.1.1-kinf files from 1.6
         testpath = home + '/Library/Application Support/Kindle/storage/.rainier-2.1.1-kinf'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac rainier file: ' + testpath)
             found = True
-        # check for  .kindle-info files
+        # check for  .kindle-info files from 1.4
         testpath = home + '/Library/Application Support/Kindle/storage/.kindle-info'
+        if os.path.isfile(testpath):
+            kInfoFiles.append(testpath)
+            print('Found k4Mac kindle-info file: ' + testpath)
+            found = True
+        # check for  .kindle-info file from 1.2.2
+        testpath = home + '/Library/Application Support/Amazon/Kindle/storage/.kindle-info'
+        if os.path.isfile(testpath):
+            kInfoFiles.append(testpath)
+            print('Found k4Mac kindle-info file: ' + testpath)
+            found = True
+        # check for  .kindle-info file from 1.0 beta 1 (27214)
+        testpath = home + '/Library/Application Support/Amazon/Kindle for Mac/storage/.kindle-info'
         if os.path.isfile(testpath):
             kInfoFiles.append(testpath)
             print('Found k4Mac kindle-info file: ' + testpath)

diff --git a/ReadMe_First.txt b/ReadMe_First.txt
index f3779d92639e012d8bbfb0b779a96628e2d37b6e..af344c93885fb28d75f967dcccfe039bfed8a38b 100644 (file)
--- a/ReadMe_First.txt
+++ b/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.2 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.3 archive from Apprentice Alf's Blog: http://apprenticealf.wordpress.com/
 
 The is archive includes tools to remove DRM from:
 
@@ -85,6 +85,9 @@ A Javascript to enable a download button at the B&N website for ebooks that norm
 Scuolabook_DRM
 A windows-only application (including source code) for removing DRM from ScuolaBooks PDFs, created by "Hex" and included with permission.
 
+Rocket_ebooks
+Information about the now-obsolete Rocket ebook format and DRM, along with source for a tool to remove the DRM.
+