mirrors/DeDRM_tools
mirrors/DeDRM_tools
1
0
Fork 0
mirror of https://github.com/noDRM/DeDRM_tools.git synced 2025-01-12 11:24:43 +06:00
Code Issues Projects Releases Wiki Activity

DeDRM plugin 6.0.6

Browse Source 
(Only the plugin seems to have been updated for the 6.0.6 release.)
This commit is contained in:
Apprentice Alf 2013-05-18 19:37:05 +01:00
parent a399d3b7bd
commit 5a502dbce3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DeDRM_calibre_plugin/DeDRM_plugin.zip
View File

Binary file not shown.

9
DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
View File

@ -31,13 +31,14 @@ __docformat__ = 'restructuredtext en'
# 6.0.3 - Fixes for Kindle for Mac and Windows non-ascii user names # 6.0.3 - Fixes for Kindle for Mac and Windows non-ascii user names
# 6.0.4 - Fixes for stand-alone scripts and applications # 6.0.4 - Fixes for stand-alone scripts and applications
# and pdb files in plugin and initial conversion of prefs. # and pdb files in plugin and initial conversion of prefs.
# 6.0.6 - Fix up an incorrect function call
""" """
Decrypt DRMed ebooks. Decrypt DRMed ebooks.
""" """
PLUGIN_NAME = u"DeDRM" PLUGIN_NAME = u"DeDRM"
PLUGIN_VERSION_TUPLE = (6, 0, 5) PLUGIN_VERSION_TUPLE = (6, 0, 6)
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'
@ -216,7 +217,7 @@ class DeDRM(FileTypePlugin):
else: # linux else: # linux
from wineutils import WineGetKeys from wineutils import WineGetKeys
scriptpath = os.join(self.alfdir,u"adobekey.py") scriptpath = os.path.join(self.alfdir,u"adobekey.py")
defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix']) defaultkeys = WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
self.default_key = default_keys[0] self.default_key = default_keys[0]
@ -311,7 +312,7 @@ class DeDRM(FileTypePlugin):
try: try:
from wineutils import WineGetKeys from wineutils import WineGetKeys
scriptpath = os.join(self.alfdir,u"adobekey.py") scriptpath = os.path.join(self.alfdir,u"adobekey.py")
defaultkeys = self.WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix']) defaultkeys = self.WineGetKeys(scriptpath, u".der",dedrmprefs['adobewineprefix'])
except: except:
pass pass
@ -389,7 +390,7 @@ class DeDRM(FileTypePlugin):
else: # linux else: # linux
from wineutils import WineGetKeys from wineutils import WineGetKeys
scriptpath = os.join(self.alfdir,u"kindlekey.py") scriptpath = os.path.join(self.alfdir,u"kindlekey.py")
defaultkeys = self.WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix']) defaultkeys = self.WineGetKeys(scriptpath, u".k4i",dedrmprefs['kindlewineprefix'])
except: except:
pass pass