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

Merge pull request #75 from directionless/errormessages

Browse Source 
Error Messages - one fix, one adddition
This commit is contained in:
Apprentice Harper 2016-03-08 07:00:22 +00:00
commit d67e05cf04
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/mobidedrm.py
View File

@ -448,6 +448,8 @@ class MobiBook:
goodpids.append(pid[0:-2]) goodpids.append(pid[0:-2])
elif len(pid)==8: elif len(pid)==8:
goodpids.append(pid) goodpids.append(pid)
else:
print u"Warning: PID {0} has wrong number of digits".format(pid)
if self.crypto_type == 1: if self.crypto_type == 1:
t1_keyvec = 'QDCVEPMU675RUBSZ' t1_keyvec = 'QDCVEPMU675RUBSZ'
@ -530,7 +532,7 @@ def cli_main():
stripped_file = getUnencryptedBook(infile, pidlist) stripped_file = getUnencryptedBook(infile, pidlist)
file(outfile, 'wb').write(stripped_file) file(outfile, 'wb').write(stripped_file)
except DrmException, e: except DrmException, e:
print u"MobiDeDRM v{0} Error: {0:s}".format(__version__,e.args[0]) print u"MobiDeDRM v{0} Error: {1:s}".format(__version__,e.args[0])
return 1 return 1
return 0 return 0

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

@ -448,6 +448,8 @@ class MobiBook:
goodpids.append(pid[0:-2]) goodpids.append(pid[0:-2])
elif len(pid)==8: elif len(pid)==8:
goodpids.append(pid) goodpids.append(pid)
else:
print u"Warning: PID {0} has wrong number of digits".format(pid)
if self.crypto_type == 1: if self.crypto_type == 1:
t1_keyvec = 'QDCVEPMU675RUBSZ' t1_keyvec = 'QDCVEPMU675RUBSZ'
@ -530,7 +532,7 @@ def cli_main():
stripped_file = getUnencryptedBook(infile, pidlist) stripped_file = getUnencryptedBook(infile, pidlist)
file(outfile, 'wb').write(stripped_file) file(outfile, 'wb').write(stripped_file)
except DrmException, e: except DrmException, e:
print u"MobiDeDRM v{0} Error: {0:s}".format(__version__,e.args[0]) print u"MobiDeDRM v{0} Error: {1:s}".format(__version__,e.args[0])
return 1 return 1
return 0 return 0

4
DeDRM_calibre_plugin/DeDRM_plugin/mobidedrm.py
View File

@ -448,6 +448,8 @@ class MobiBook:
goodpids.append(pid[0:-2]) goodpids.append(pid[0:-2])
elif len(pid)==8: elif len(pid)==8:
goodpids.append(pid) goodpids.append(pid)
else:
print u"Warning: PID {0} has wrong number of digits".format(pid)
if self.crypto_type == 1: if self.crypto_type == 1:
t1_keyvec = 'QDCVEPMU675RUBSZ' t1_keyvec = 'QDCVEPMU675RUBSZ'
@ -530,7 +532,7 @@ def cli_main():
stripped_file = getUnencryptedBook(infile, pidlist) stripped_file = getUnencryptedBook(infile, pidlist)
file(outfile, 'wb').write(stripped_file) file(outfile, 'wb').write(stripped_file)
except DrmException, e: except DrmException, e:
print u"MobiDeDRM v{0} Error: {0:s}".format(__version__,e.args[0]) print u"MobiDeDRM v{0} Error: {1:s}".format(__version__,e.args[0])
return 1 return 1
return 0 return 0