Miroirs/noDRM_DeDRM_tools
1
0
Fork 0
mirror of https://github.com/noDRM/DeDRM_tools synced 2024-12-27 21:59:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove debugging dialog from Mac App. Update version to 6.5.1

Browse source
This commit is contained in:
Apprentice Harper 2016-08-12 06:30:48 +01:00
parent c2615c4d3b
commit 34231cc252
6 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
DeDRM_Macintosh_Application/DeDRM.app.txt
View file

Binary file not shown.

4
DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
View file

@ -56,9 +56,9 @@
<key>name</key> <key>name</key>
<string>ScriptWindowState</string> <string>ScriptWindowState</string>
<key>positionOfDivider</key> <key>positionOfDivider</key>
<real>652</real> <real>651</real>
<key>savedFrame</key> <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> <key>selectedTab</key>
<string>log</string> <string>log</string>
</dict> </dict>

BIN
DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/Scripts/main.scpt
View file

Binary file not shown.

3
DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py
View file

@ -54,7 +54,6 @@ __docformat__ = 'restructuredtext en'
# 6.5.0 - Big update to Macintosh app # 6.5.0 - Big update to Macintosh app
# Fix for some more 'new' tags in Topaz ebooks. # Fix for some more 'new' tags in Topaz ebooks.
# Fix an error in wineutils.py # 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_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]) 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. # Include an html helpfile in the plugin's zipfile with the following name.
RESOURCE_NAME = PLUGIN_NAME + '_Help.htm' RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'

2
DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf
View file

@ -1,4 +1,4 @@
{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170 {\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
{\fonttbl} {\fonttbl}
{\colortbl;\red255\green255\blue255;} {\colortbl;\red255\green255\blue255;}
} }

14
DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/ineptpdf.py
View file

@ -57,7 +57,6 @@ from __future__ import with_statement
# 8.0.2 - Add additional check on DER file sanity # 8.0.2 - Add additional check on DER file sanity
# 8.0.3 - Remove erroneous 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.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' __license__ = 'GPL v3'
__version__ = "8.0.5" __version__ = "8.0.4"
import sys import sys
import os import os
@ -1469,7 +1468,6 @@ class PDFDocument(object):
if not self.encryption: if not self.encryption:
self.is_printable = self.is_modifiable = self.is_extractable = True self.is_printable = self.is_modifiable = self.is_extractable = True
self.ready = True self.ready = True
raise PDFEncryptionError('Document is not encrypted.')
return return
(docid, param) = self.encryption (docid, param) = self.encryption
type = literal_name(param['Filter']) type = literal_name(param['Filter'])
@ -2182,11 +2180,11 @@ def decryptBook(userkey, inpath, outpath):
if RSA is None: if RSA is None:
raise ADEPTError(u"PyCrypto or OpenSSL must be installed.") raise ADEPTError(u"PyCrypto or OpenSSL must be installed.")
with open(inpath, 'rb') as inf: with open(inpath, 'rb') as inf:
#try: try:
serializer = PDFSerializer(inf, userkey) serializer = PDFSerializer(inf, userkey)
#except: except:
# print u"Error serializing pdf {0}. Probably wrong key.".format(os.path.basename(inpath)) print u"Error serializing pdf {0}. Probably wrong key.".format(os.path.basename(inpath))
# return 2 return 2
# hope this will fix the 'bad file descriptor' problem # hope this will fix the 'bad file descriptor' problem
with open(outpath, 'wb') as outf: with open(outpath, 'wb') as outf:
# help construct to make sure the method runs to the end # help construct to make sure the method runs to the end