Change to ineptpdf.py, so that we throw an exception for DRM-free PDFs, rather than...

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
index a507eb9a9d82246d0dc54e73cb76af085c6404b8..c56ce166425adb1ff1fd80215c1933b893a66812 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
+++ b/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.5.0 Written 2010–2016 by Apprentice Alf et al.</string>
+       <string>DeDRM AppleScript 6.5.1 Written 2010–2016 by Apprentice Alf et al.</string>
        <key>CFBundleIconFile</key>
        <string>DeDRM</string>
        <key>CFBundleIdentifier</key>
@@ -36,7 +36,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.5.0</string>
+       <string>6.5.1</string>
        <key>CFBundleSignature</key>
        <string>dplt</string>
        <key>LSRequiresCarbon</key>

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py
index dd3da8817a4aaadbbb338ea6ba9247befe26bbee..d15eddb3a8b3d653f59486edd7b47542163fdd2c 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py
@@ -54,6 +54,7 @@ __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
 
 
 """
@@ -61,7 +62,7 @@ Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 5, 0)
+PLUGIN_VERSION_TUPLE = (6, 5, 1)
 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/ineptpdf.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py
index 0e25d2975c9902470aff55b8d5fad7a79d2f0ed6..6de86719cd576227461f56d5f24ec914edf97114 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py
@@ -57,6 +57,7 @@ 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
 
 
 """
@@ -64,7 +65,7 @@ Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0.4"
+__version__ = "8.0.5"
 
 import sys
 import os
@@ -1468,6 +1469,7 @@ 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'])
@@ -2180,11 +2182,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

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 50584764f947a519d932b07e0a93d0e3982a1925..e9d71656608acea18e22de839ff7fe2966dddf51 100644 (file)
--- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw
+++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw
@@ -26,8 +26,9 @@
 #   6.4.2 - Fix for new tags in Topaz ebooks, and very small Topaz ebooks
 #   6.4.3 - Version bump to match plugin & Mac app
 #   6.5.0 - Fix for some new tags in Topaz ebooks
+#   6.5.1 - Version bump to match plugin & Mac app
 
-__version__ = '6.5.0'
+__version__ = '6.5.1'
 
 import sys
 import os, os.path

diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py
index dd3da8817a4aaadbbb338ea6ba9247befe26bbee..d15eddb3a8b3d653f59486edd7b47542163fdd2c 100644 (file)
--- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py
+++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py
@@ -54,6 +54,7 @@ __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
 
 
 """
@@ -61,7 +62,7 @@ Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 5, 0)
+PLUGIN_VERSION_TUPLE = (6, 5, 1)
 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_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py
index 0e25d2975c9902470aff55b8d5fad7a79d2f0ed6..6de86719cd576227461f56d5f24ec914edf97114 100644 (file)
--- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py
+++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py
@@ -57,6 +57,7 @@ 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
 
 
 """
@@ -64,7 +65,7 @@ Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0.4"
+__version__ = "8.0.5"
 
 import sys
 import os
@@ -1468,6 +1469,7 @@ 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'])
@@ -2180,11 +2182,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

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin.zip b/DeDRM_calibre_plugin/DeDRM_plugin.zip
index 7cb560a187a9c16c117a049a7a543842059eae45..3f6c98803cb00289dbadcc5211bdbaf78a0b9eb7 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 dd3da8817a4aaadbbb338ea6ba9247befe26bbee..d15eddb3a8b3d653f59486edd7b47542163fdd2c 100644 (file)
--- a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
@@ -54,6 +54,7 @@ __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
 
 
 """
@@ -61,7 +62,7 @@ Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 5, 0)
+PLUGIN_VERSION_TUPLE = (6, 5, 1)
 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/ineptpdf.py b/DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py
index 0e25d2975c9902470aff55b8d5fad7a79d2f0ed6..6de86719cd576227461f56d5f24ec914edf97114 100644 (file)
--- a/DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py
@@ -57,6 +57,7 @@ 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
 
 
 """
@@ -64,7 +65,7 @@ Decrypts Adobe ADEPT-encrypted PDF files.
 """
 
 __license__ = 'GPL v3'
-__version__ = "8.0.4"
+__version__ = "8.0.5"
 
 import sys
 import os
@@ -1468,6 +1469,7 @@ 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'])
@@ -2180,11 +2182,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

diff --git a/ReadMe_First.txt b/ReadMe_First.txt
index 0b9f7a72e842cf0d58d5b5d2a1168d38d86339d3..57124271bba687ef7626d0afb4f0dce3b7ed34b5 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.5.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.5.1 archive from Apprentice Alf's Blog: http://apprenticealf.wordpress.com/
 
 The is archive includes tools to remove DRM from: