francois/DeDRM_tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for another unknown Topaz token.

Browse Source
This commit is contained in:
Apprentice Harper
2016-08-05 17:24:44 +01:00
parent 6feeb352fc
commit 4d7556e919
12 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw
View File

@@ -25,8 +25,9 @@
# 6.4.1 - Fix for new tags in Topaz ebooks
# 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.4.4 - Fix for some new tags in Topaz ebooks
__version__ = '6.4.3'
__version__ = '6.4.4'
import sys
import os, os.path

4
DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py
View File

@@ -51,6 +51,8 @@ __docformat__ = 'restructuredtext en'
# 6.4.2 - Fix for more new tags in Topaz ebooks and very small Topaz ebooks
# 6.4.3 - Fix for error that only appears when not in debug mode
# Also includes fix for Macs with bonded ethernet ports
# 6.4.4 - Fix for some more 'new' tags in Topaz ebooks.
# Also fix an error in wineutils.py
"""
@@ -58,7 +60,7 @@ Decrypt DRMed ebooks.
"""
PLUGIN_NAME = u"DeDRM"
PLUGIN_VERSION_TUPLE = (6, 4, 3)
PLUGIN_VERSION_TUPLE = (6, 4, 4)
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'

12
DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/convert2xml.py
View File

@@ -391,6 +391,18 @@ class PageParser(object):
'startID' : (0, 'number', 1, 1),
'startID.page' : (1, 'number', 0, 0),
'startID.id' : (1, 'number', 0, 0),
'median_d' : (1, 'number', 0, 0),
'median_h' : (1, 'number', 0, 0),
'median_firsty' : (1, 'number', 0, 0),
'median_lasty' : (1, 'number', 0, 0),
'num_footers_maybe' : (1, 'number', 0, 0),
'num_footers_yes' : (1, 'number', 0, 0),
'num_headers_maybe' : (1, 'number', 0, 0),
'num_headers_yes' : (1, 'number', 0, 0),
'tracking' : (1, 'number', 0, 0),
}

2
DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/wineutils.py
View File

@@ -31,7 +31,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
else:
cmdline = u"wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath)
print u"{0} v{1}: Command line: “{2}”".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
print u"{0} v{1}: Command line: '{2}'".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
try:
cmdline = cmdline.encode(sys.getfilesystemencoding())