diff options
| author | Apprentice Harper <[email protected]> | 2016-08-05 17:24:44 +0100 |
|---|---|---|
| committer | Apprentice Harper <[email protected]> | 2016-08-05 17:24:44 +0100 |
| commit | 4d7556e919c2cec6b71ff9a12f217c2b834c46f0 (patch) | |
| tree | b8d693845944370d94dc8afe0a83039e0f44ff08 /DeDRM_Windows_Application | |
| parent | 6feeb352fc2a5ffd2358782852acd32cdf667f1a (diff) | |
Fix for another unknown Topaz token.
Diffstat (limited to 'DeDRM_Windows_Application')
4 files changed, 18 insertions, 3 deletions
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 3221ecf..18c9da3 100644 --- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw +++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw @@ -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 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 7908e6b..cde2673 100644 --- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py +++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py @@ -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' diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/convert2xml.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/convert2xml.py index 443dd82..3413eda 100644 --- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/convert2xml.py +++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/convert2xml.py @@ -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), } diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/wineutils.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/wineutils.py index fff8016..0485e5e 100644 --- a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/wineutils.py +++ b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/wineutils.py @@ -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()) |