Mirrors
/
DeDRM_tools
mirror of https://github.com/noDRM/DeDRM_tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Kindlekey fix for complex mac disk setups.

This commit is contained in:
Apprentice Harper 2017-06-27 17:22:23 +01:00
parent 2042354788
commit a252dd0da6
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py
View File

@ -23,6 +23,7 @@ from __future__ import with_statement
# 2.2 - Fixes for Macs with bonded ethernet ports # 2.2 - Fixes for Macs with bonded ethernet ports
# Also removed old .kinfo file support (pre-2011) # Also removed old .kinfo file support (pre-2011)
# 2.3 - Added more field names thanks to concavegit's KFX code. # 2.3 - Added more field names thanks to concavegit's KFX code.
# 2.4 - Fix for complex Mac disk setups, thanks to Tibs
""" """
@ -30,7 +31,7 @@ Retrieve Kindle for PC/Mac user key.
""" """
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = '2.3' __version__ = '2.4'
import sys, os, re import sys, os, re
from struct import pack, unpack, unpack_from from struct import pack, unpack, unpack_from
@ -1267,7 +1268,7 @@ elif isosx:
for j in xrange(cnt): for j in xrange(cnt):
resline = reslst[j] resline = reslst[j]
if resline.startswith('/dev'): if resline.startswith('/dev'):
(devpart, mpath) = resline.split(' on ') (devpart, mpath) = resline.split(' on ')[:2]
dpart = devpart[5:] dpart = devpart[5:]
names.append(dpart) names.append(dpart)
return names return names

5
DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py
View File

@ -23,6 +23,7 @@ from __future__ import with_statement
# 2.2 - Fixes for Macs with bonded ethernet ports # 2.2 - Fixes for Macs with bonded ethernet ports
# Also removed old .kinfo file support (pre-2011) # Also removed old .kinfo file support (pre-2011)
# 2.3 - Added more field names thanks to concavegit's KFX code. # 2.3 - Added more field names thanks to concavegit's KFX code.
# 2.4 - Fix for complex Mac disk setups, thanks to Tibs
""" """
@ -30,7 +31,7 @@ Retrieve Kindle for PC/Mac user key.
""" """
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = '2.3' __version__ = '2.4'
import sys, os, re import sys, os, re
from struct import pack, unpack, unpack_from from struct import pack, unpack, unpack_from
@ -1267,7 +1268,7 @@ elif isosx:
for j in xrange(cnt): for j in xrange(cnt):
resline = reslst[j] resline = reslst[j]
if resline.startswith('/dev'): if resline.startswith('/dev'):
(devpart, mpath) = resline.split(' on ') (devpart, mpath) = resline.split(' on ')[:2]
dpart = devpart[5:] dpart = devpart[5:]
names.append(dpart) names.append(dpart)
return names return names

BIN
DeDRM_calibre_plugin/DeDRM_plugin.zip
View File

Binary file not shown.

5
DeDRM_calibre_plugin/DeDRM_plugin/kindlekey.py
View File

@ -23,6 +23,7 @@ from __future__ import with_statement
# 2.2 - Fixes for Macs with bonded ethernet ports # 2.2 - Fixes for Macs with bonded ethernet ports
# Also removed old .kinfo file support (pre-2011) # Also removed old .kinfo file support (pre-2011)
# 2.3 - Added more field names thanks to concavegit's KFX code. # 2.3 - Added more field names thanks to concavegit's KFX code.
# 2.4 - Fix for complex Mac disk setups, thanks to Tibs
""" """
@ -30,7 +31,7 @@ Retrieve Kindle for PC/Mac user key.
""" """
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = '2.3' __version__ = '2.4'
import sys, os, re import sys, os, re
from struct import pack, unpack, unpack_from from struct import pack, unpack, unpack_from
@ -1267,7 +1268,7 @@ elif isosx:
for j in xrange(cnt): for j in xrange(cnt):
resline = reslst[j] resline = reslst[j]
if resline.startswith('/dev'): if resline.startswith('/dev'):
(devpart, mpath) = resline.split(' on ') (devpart, mpath) = resline.split(' on ')[:2]
dpart = devpart[5:] dpart = devpart[5:]
names.append(dpart) names.append(dpart)
return names return names

5
Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
View File

@ -23,6 +23,7 @@ from __future__ import with_statement
# 2.2 - Fixes for Macs with bonded ethernet ports # 2.2 - Fixes for Macs with bonded ethernet ports
# Also removed old .kinfo file support (pre-2011) # Also removed old .kinfo file support (pre-2011)
# 2.3 - Added more field names thanks to concavegit's KFX code. # 2.3 - Added more field names thanks to concavegit's KFX code.
# 2.4 - Fix for complex Mac disk setups, thanks to Tibs
""" """
@ -30,7 +31,7 @@ Retrieve Kindle for PC/Mac user key.
""" """
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = '2.3' __version__ = '2.4'
import sys, os, re import sys, os, re
from struct import pack, unpack, unpack_from from struct import pack, unpack, unpack_from
@ -1267,7 +1268,7 @@ elif isosx:
for j in xrange(cnt): for j in xrange(cnt):
resline = reslst[j] resline = reslst[j]
if resline.startswith('/dev'): if resline.startswith('/dev'):
(devpart, mpath) = resline.split(' on ') (devpart, mpath) = resline.split(' on ')[:2]
dpart = devpart[5:] dpart = devpart[5:]
names.append(dpart) names.append(dpart)
return names return names