Remove debugging dialog from Mac App. Update version to 6.5.1

diff --git a/DeDRM_Macintosh_Application/DeDRM.app.txt b/DeDRM_Macintosh_Application/DeDRM.app.txt
index dc1947e2313752901d6db03a68b8a72076d4e72a..0a99f89d501c2b6ae3408f0687a79904ab88855d 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 c56ce166425adb1ff1fd80215c1933b893a66812..aaef3367fe6a12ef65d01cc74a782161a52f36e6 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
@@ -56,9 +56,9 @@
                <key>name</key>
                <string>ScriptWindowState</string>
                <key>positionOfDivider</key>
-               <real>652</real>
+               <real>651</real>
                <key>savedFrame</key>
-               <string>0 36 1680 991 0 0 1680 1027 </string>
+               <string>0 37 1680 990 0 0 1680 1027 </string>
                <key>selectedTab</key>
                <string>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 3acdb1f60830c651ec1842031d6d3eede2195bb5..202f41cc1442445d26c68fcd7c08adfe6840e5a6 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/__init__.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py
index d15eddb3a8b3d653f59486edd7b47542163fdd2c..dd3da8817a4aaadbbb338ea6ba9247befe26bbee 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py
@@ -54,7 +54,6 @@ __docformat__ = 'restructuredtext en'
 #   6.5.0 - Big update to Macintosh app
 #           Fix for some more 'new' tags in Topaz ebooks.
 #           Fix an error in wineutils.py
-#   6.5.1 - Updated version number, added PDF check for DRM-free documents
 
 
 """
@@ -62,7 +61,7 @@ Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 5, 1)
+PLUGIN_VERSION_TUPLE = (6, 5, 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'

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 e9c3bc1acd13a0f97fcb22075d300a59fe6e8548..2ce2259dbd3678fd2f25e78d003a99c1bb042708 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\cocoartf1348\cocoasubrtf170
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
 {\fonttbl}
 {\colortbl;\red255\green255\blue255;}
 }
\ No newline at end of file

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py
index 6de86719cd576227461f56d5f24ec914edf97114..0e25d2975c9902470aff55b8d5fad7a79d2f0ed6 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py
@@ -57,7 +57,6 @@ from __future__ import with_statement
 #   8.0.2 - Add additional check on DER file sanity
 #   8.0.3 - Remove erroneous check on DER file sanity
 #   8.0.4 - Completely remove erroneous check on DER file sanity
-#   8.0.5 - Do not process DRM-free documents
 
 
 """
@@ -65,7 +64,7 @@ Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0.5"
+__version__ = "8.0.4"
 
 import sys
 import os
@@ -1469,7 +1468,6 @@ class PDFDocument(object):
         if not self.encryption:
             self.is_printable = self.is_modifiable = self.is_extractable = True
             self.ready = True
-            raise PDFEncryptionError('Document is not encrypted.')
             return
         (docid, param) = self.encryption
         type = literal_name(param['Filter'])
@@ -2182,11 +2180,11 @@ def decryptBook(userkey, inpath, outpath):
     if RSA is None:
         raise ADEPTError(u"PyCrypto or OpenSSL must be installed.")
     with open(inpath, 'rb') as inf:
-        #try:
-        serializer = PDFSerializer(inf, userkey)
-        #except:
-        #    print u"Error serializing pdf {0}. Probably wrong key.".format(os.path.basename(inpath))
-        #    return 2
+        try:
+            serializer = PDFSerializer(inf, userkey)
+        except:
+            print u"Error serializing pdf {0}. Probably wrong key.".format(os.path.basename(inpath))
+            return 2
         # hope this will fix the 'bad file descriptor' problem
         with open(outpath, 'wb') as outf:
             # help construct to make sure the method runs to the end