mirrors/DeDRM_tools
mirrors/DeDRM_tools
1
0
Fork 0
mirror of https://github.com/noDRM/DeDRM_tools.git synced 2024-11-05 13:36:10 +06:00
Code Issues Projects Releases Wiki Activity
432 Commits 2 Branches 94 Tags 26 MiB
a1703e15d4
Commit Graph

432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Lazar Miljenovic
a1703e15d4 PyCrypto requires RSA values to be long 
This is at least true for PyCrypto 2.6.1
 2020-11-11 20:51:19 +08:00
Apprentice Harper
e2e19fb50f
Merge pull request #1348 from fireattack/master 
Convert all to bytes first before concat (fix for Windows routine)
 2020-11-05 10:51:56 +00:00
fireattack
4a319a3522 Convert all to bytes first before concat 2020-11-02 02:09:52 -06:00
Apprentice Harper
f1ef1b8ecd
Merge pull request #1340 from ableeker/python3 
Python 3 fixes config.py alfcrypto.py
 2020-10-29 14:09:28 +00:00
Apprentice Harper
af0acf31a3
Merge pull request #1338 from ivan-m/wine_pythonpath 
Set PYTHONPATH="" when running through wine
 2020-10-29 14:06:53 +00:00
Aldo
6dd022e6a0 Python 3 fixes config.py alfcrypto.py 2020-10-28 18:54:33 +01:00
Ivan Lazar Miljenovic
ef59e112c1 Set PYTHONPATH="" when running through wine 
Without this, it's possible for the Linux PYTHONPATH to leak through
and mixing up the PyCrypto libraries being called (or possibly
exceeding the allowed length of the PYTHONPATH in wine).
 2020-10-27 13:34:16 +08:00
Apprentice Harper
019abecd05
Merge pull request #1333 from jpwhiting/fixwinreg 
Fixwinreg - thanks, these all look useful and good.
 2020-10-22 13:56:05 +01:00
Apprentice Harper
7b3bbbd008
Merge pull request #1331 from koumaza/koumaza/issue-template 
Create Question Issue Template
 2020-10-22 13:54:11 +01:00
Apprentice Harper
32968b1328
Merge pull request #1329 from koumaza/koumaza/readme-wiki-how-to-remove 
Add link to Wiki Page `How to remove DRM` in README.md
 2020-10-22 13:53:01 +01:00
Jeremy Whiting
e0ec691dd6 Fix another exception thrown when unable to find kindle keys. 2020-10-21 10:56:58 -06:00
Jeremy Whiting
0add3646d9 _winreg in python3 has been changed to winreg. Update imports. 2020-10-21 10:56:50 -06:00
shanghai yakisoba chan!
16024ee972
Update README.md 
Change Wiki Link
 2020-10-21 09:00:04 +09:00
shanghai yakisoba chan!
9cfe09e507
Create QUESTION.md 2020-10-21 02:26:26 +09:00
shanghai yakisoba chan!
4a58d6f7dc
Update README.md 
Add Wiki Page Link
 2020-10-21 01:29:35 +09:00
Apprentice Harper
c4c20eb07e
Merge pull request #1318 from task-hazy/kindle_fetch 
Get working kindlekey.py on Python 3.8.6
 2020-10-20 16:21:36 +01:00
Task Hazy
cc33f40ecc Get working kindlekey.py on Python 3.8.6 2020-10-16 12:07:34 -06:00
Apprentice Harper
939cdbb0c9 More fixes for Amazon books, fixing identity checks, started on Topaz. 2020-10-16 13:58:59 +01:00
Apprentice Harper
dc27c36761 test file type correctly 2020-10-16 13:22:19 +01:00
Apprentice Harper
7262264b95
Update README.md 2020-10-14 16:34:27 +01:00
Apprentice Harper
4b160132a5 Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools 2020-10-14 16:33:14 +01:00
Apprentice Harper
85fb4ff729
Merge pull request #1297 from PetraOleum/patch-1 
Update doc link for preferences code
 2020-10-14 16:25:01 +01:00
Apprentice Harper
608bd400ee
Merge pull request #1296 from tartley/lint-fixes 
Fix CI lint failures
 2020-10-14 16:24:16 +01:00
Apprentice Harper
781268e17e More general changes, and get mobidedrm and kindlekey to work on Mac. 2020-10-14 16:23:49 +01:00
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!
 2020-10-09 22:25:01 +13:00
Jonathan Hartley
83139bc590 Remove unused fns in make_release.py 2020-10-08 14:37:04 -05:00
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. 2020-10-04 20:36:12 +01:00
Apprentice Harper
2eb31c8fb5
Merge pull request #1275 from jpwhiting/python3fixes 
Python3fixes
 2020-10-04 20:07:37 +01:00
Apprentice Harper
a3c7bad67e
Merge pull request #1265 from heindevries/master 
Some changes in obok.py to make it work on windows
 2020-10-04 20:04:32 +01:00
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.
 2020-10-03 22:36:35 -06:00
Jeremy Whiting
62e0a69089 Fix launching help link from customization dialog. 
To fix error with python3 when launching help link open files in binary
mode.
 2020-10-03 22:36:35 -06:00
Jeremy Whiting
9df1563492 Use open instead of file() to export keys to file. 
Fixes export of Kindle keys in calibre 5.0.1 here.
 2020-10-03 22:36:27 -06:00
HdV
f55420bbf4 Merge branch 'master' of https://github.com/heindevries/DeDRM_tools 
merging
 2020-09-30 16:56:14 +02:00
HdV
7f758566d3 Changes to make obok work on win 
_winreg renamed to winreg in python 3
os.popen3() replaced by subprocess.Popen()
 2020-09-30 16:47:27 +02:00
Apprentice Harper
ff8d44492e Fix problem on Mac with byte arrays. 2020-09-30 13:25:32 +01:00
Apprentice Harper
21d4811bfe
Merge pull request #1255 from cclauss/patch-2 
GitHub Action test on both Python 2 and Python 3
 2020-09-30 11:45:50 +01:00
Christian Clauss
558efebbff
Update genbook.py 2020-09-28 01:03:30 +02:00
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.
 2020-09-28 01:00:21 +02:00
Christian Clauss
3f644ddfd6
print() is a function in Python since 1/1/2020 2020-09-28 00:49:21 +02:00
Christian Clauss
08bdacf476
Fix Python syntax error: add a comma 
Discovered by flake8 running in our GitHub Action
 2020-09-28 00:39:57 +02:00
Christian Clauss
109261bdc0
GitHub Action test on both Python 2 and Python 3 2020-09-28 00:36:25 +02:00
Apprentice Harper
de50a02af9 More generic 3.0 changes, to be tested. 2020-09-27 11:54:49 +01:00
Apprentice Harper
6920f79a26
Merge pull request #1248 from kubik147/adobekey 
Make adobekey.py work in Python 3
 2020-09-27 10:11:37 +01:00
kubik147
2800f7cd80 Remove the u string prefixes 2020-09-27 00:57:53 +02:00
kubik147
61c5096da0 Make adobekey.py work in Python 3 2020-09-27 00:54:40 +02:00
Apprentice Harper
9118ce77ab
Merge pull request #1170 from Dr-Willy/master 
Fix path in make_release.py
 2020-09-26 21:19:48 +01:00
Apprentice Harper
c3aa1b62bb
Merge pull request #1241 from erikbrinkman/patch-1 
Support ebook-convert
 2020-09-26 21:19:17 +01:00
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
 2020-09-26 21:22:47 +01:00
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".
 2020-09-20 16:43:23 -04:00
Dr-Willy
e76bb408a3 Fix path in make_release.py 2020-07-20 21:07:20 +12:00