Commit Graph

407 Commits (41d3da12ecf289ced73b3931df1d079a530bcbc6)
 

Author SHA1 Message Date
Petra Lamborn 41d3da12ec
Update doc link for preferences code
This should really be properly explained, but at least it's not a dead link now!
4 years ago
Apprentice Harper e31752e334 Mostly Mac fixes. mobidedrm.py now works, and k4mobidedrm for at least some input. kindlekey.py should be working too. But lots more changes and testing to do. 4 years ago
Apprentice Harper 2eb31c8fb5
Merge pull request #1275 from jpwhiting/python3fixes
Python3fixes
4 years ago
Apprentice Harper a3c7bad67e
Merge pull request #1265 from heindevries/master
Some changes in obok.py to make it work on windows
4 years ago
Jeremy Whiting dca0cf7d00 Fix kgenpids string vs bytes usage for python3 for calibre 5.1.
In order to properly get pids etc. we need to pass bytes to MD5 and SHA1
instead of unicode strings. Also ord() is no longer needed since
data is bytes value gets int and we need chr() to get characters from
the mapping bytearrays.
4 years ago
Jeremy Whiting 62e0a69089 Fix launching help link from customization dialog.
To fix error with python3 when launching help link open files in binary
mode.
4 years ago
Jeremy Whiting 9df1563492 Use open instead of file() to export keys to file.
Fixes export of Kindle keys in calibre 5.0.1 here.
4 years ago
HdV f55420bbf4 Merge branch 'master' of https://github.com/heindevries/DeDRM_tools
merging
4 years ago
HdV 7f758566d3 Changes to make obok work on win
_winreg renamed to winreg in python 3
os.popen3() replaced by subprocess.Popen()
4 years ago
Apprentice Harper ff8d44492e Fix problem on Mac with byte arrays. 4 years ago
Apprentice Harper 21d4811bfe
Merge pull request #1255 from cclauss/patch-2
GitHub Action test on both Python 2 and Python 3
4 years ago
Christian Clauss 558efebbff
Update genbook.py 4 years ago
Christian Clauss 1eaee6a0a8
Old style exceptions are syntax errors in Python 3
Switch to new style exceptions which work on both Python 2 and Python 3.
4 years ago
Christian Clauss 3f644ddfd6
print() is a function in Python since 1/1/2020 4 years ago
Christian Clauss 08bdacf476
Fix Python syntax error: add a comma
Discovered by flake8 running in our GitHub Action
4 years ago
Christian Clauss 109261bdc0
GitHub Action test on both Python 2 and Python 3 4 years ago
Apprentice Harper de50a02af9 More generic 3.0 changes, to be tested. 4 years ago
Apprentice Harper 6920f79a26
Merge pull request #1248 from kubik147/adobekey
Make adobekey.py work in Python 3
4 years ago
kubik147 2800f7cd80 Remove the u string prefixes 4 years ago
kubik147 61c5096da0 Make adobekey.py work in Python 3 4 years ago
Apprentice Harper 9118ce77ab
Merge pull request #1170 from Dr-Willy/master
Fix path in make_release.py
4 years ago
Apprentice Harper c3aa1b62bb
Merge pull request #1241 from erikbrinkman/patch-1
Support ebook-convert
4 years ago
Apprentice Harper afa4ac5716 Starting on Version 7.0 using the work done by others. Completely untested. I will be testing things, but I thought I'd get this base version up for others to give pull requests.
THIS IS ON THE MASTER BRANCH. The Master branch will be Python 3.0 from now on. While Python 2.7 support will not be deliberately broken, all efforts should now focus on Python 3.0 compatibility.

I can see a lot of work has been done. There's more to do. I've bumped the version number of everything I came across to the next major number for Python 3.0 compatibility indication.

Thanks everyone. I hope to update here at least once a week until we have a stable 7.0 release for calibre 5.0
4 years ago
Erik Brinkman c516306858
Support ebook-convert
`ebook-convert`  converts ebooks without adding them to the calibre library, and so dedrm_tools fails to run and convert books that are processed in this way. Adding on_preprocess means that it will also run on any preprocessing allowing these tools to be used by the cli tools.

As far as I'm aware, there's nothing wrong with having this run in both instances, and it still seems to allow conversion in the "standard way".
4 years ago
Dr-Willy e76bb408a3 Fix path in make_release.py 4 years ago
Apprentice Harper 4868a7460e Updates to FAQs and ReadMes 4 years ago
Apprentice Harper 0859f197fc Update init file, update versions in files, update comments in files 4 years ago
Apprentice Harper da85d4ffac
Merge pull request #1095 from fondfire/patch-1
Create ignoblepdf.py
4 years ago
Apprentice Harper 6fd5535072
Merge pull request #1091 from vanicat/inetepub-python3
Inetepub python3
4 years ago
Apprentice Harper 885ef5e890
Merge pull request #1037 from apprenticesakuya/master
Finish .kinf2018 support and add KFX v2/v3 support
4 years ago
apprenticesakuya 22d2b37e04
Support KFX VoucherEnvelope versions 2 and 3 4 years ago
apprenticesakuya 837562db66
Support .kinf2018 on Mac 4 years ago
fondfire 3dcf3a5483
Create ignoblepdf.py
New Python 2 program to decrypt Barnes & Noble encrypted PDF files.
4 years ago
Rémi Vanicat f7b4efc3e1 More handling of difference between python2 and python3
Place where python3 use bytes/int and python2 str/str
4 years ago
Rémi Vanicat 2fbf2c1c5f decoding from base64 in a portable way 4 years ago
Rémi Vanicat 3166273622 modernizing ineptepub.
decrypting as python2 work
failing with python3:
  File "ineptepub.py", line 424, in decryptBook
    bookkey = rsa.decrypt(bookkey.decode('base64'))
AttributeError: 'str' object has no attribute 'decode'
4 years ago
apprenticesakuya ea916d85fc
Finish .kinf2018 support 4 years ago
Apprentice Harper 2bb73584f2 merge of translations 4 years ago
Apprentice Harper 8495ebe36d Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools 4 years ago
Apprentice Harper 92bf51bc8f Remove stand-alone apps. Only support the two plugins. 4 years ago
Apprentice Harper e15ff385ca
Merge pull request #989 from jony0008/master
New translation for obok plug-in: Swedish
4 years ago
Apprentice Harper d48f4b86cf
Merge pull request #988 from ZolaLa9/Update-FAQs-for-Kindle-for-Mac-and-Catalina
Update FAQs.md for K4Mac and Catalina
4 years ago
Jony 2ef5c59ebe
New translation: Swedish
I have finished the Swedish translation. Please merge it.
4 years ago
ZolaLa d2995539f0
Update FAQs.md 4 years ago
Apprentice Harper ef3c7f261c
Merge pull request #859 from HansChua/linux_handling
Allow users to specify Kobo directory and add 'ip' command for linux
4 years ago
Apprentice Harper 778ce4782e
Merge branch 'master' into linux_handling 4 years ago
Apprentice Harper 69ac9b7399
Merge pull request #848 from sretlawd/kfx_dsn_fix
Allow decryption with DSN only.
4 years ago
Apprentice Harper 423dec0309
Merge pull request #847 from aplaice/linux_documentation
Improve documentation for using Kindle for PC with Linux in Wine
4 years ago
Apprentice Harper 582479c1f4
Merge pull request #845 from aplaice/fix_default_winepath
Fix automatic import of decryption keys on Linux with wine
4 years ago
Apprentice Harper c1ece2f288
Merge pull request #850 from cclauss/modernize-Python-2-codes
Use print() function in both Python 2 and Python 3
4 years ago