]>
xmof Git - DeDRM.git/log
Aldo [Wed, 28 Oct 2020 17:54:33 +0000 (18:54 +0100)]
Python 3 fixes config.py alfcrypto.py
Apprentice Harper [Thu, 22 Oct 2020 12:56:05 +0000 (13:56 +0100)]
Merge pull request #1333 from jpwhiting/fixwinreg
Fixwinreg - thanks, these all look useful and good.
Apprentice Harper [Thu, 22 Oct 2020 12:54:11 +0000 (13:54 +0100)]
Merge pull request #1331 from koumaza/koumaza/issue-template
Create Question Issue Template
Apprentice Harper [Thu, 22 Oct 2020 12:53:01 +0000 (13:53 +0100)]
Merge pull request #1329 from koumaza/koumaza/readme-wiki-how-to-remove
Add link to Wiki Page `How to remove DRM` in README.md
Jeremy Whiting [Wed, 21 Oct 2020 16:56:58 +0000 (10:56 -0600)]
Fix another exception thrown when unable to find kindle keys.
Jeremy Whiting [Wed, 21 Oct 2020 16:43:54 +0000 (10:43 -0600)]
_winreg in python3 has been changed to winreg. Update imports.
shanghai yakisoba chan! [Wed, 21 Oct 2020 00:00:04 +0000 (09:00 +0900)]
Update README.md
Change Wiki Link
shanghai yakisoba chan! [Tue, 20 Oct 2020 17:26:26 +0000 (02:26 +0900)]
Create QUESTION.md
shanghai yakisoba chan! [Tue, 20 Oct 2020 16:29:35 +0000 (01:29 +0900)]
Update README.md
Add Wiki Page Link
Apprentice Harper [Tue, 20 Oct 2020 15:21:36 +0000 (16:21 +0100)]
Merge pull request #1318 from task-hazy/kindle_fetch
Get working kindlekey.py on Python 3.8.6
Task Hazy [Wed, 14 Oct 2020 19:44:12 +0000 (13:44 -0600)]
Get working kindlekey.py on Python 3.8.6
Apprentice Harper [Fri, 16 Oct 2020 12:58:59 +0000 (13:58 +0100)]
More fixes for Amazon books, fixing identity checks, started on Topaz.
Apprentice Harper [Fri, 16 Oct 2020 12:22:19 +0000 (13:22 +0100)]
test file type correctly
Apprentice Harper [Wed, 14 Oct 2020 15:34:27 +0000 (16:34 +0100)]
Update README.md
Apprentice Harper [Wed, 14 Oct 2020 15:33:14 +0000 (16:33 +0100)]
Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools
Apprentice Harper [Wed, 14 Oct 2020 15:25:01 +0000 (16:25 +0100)]
Merge pull request #1297 from PetraOleum/patch-1
Update doc link for preferences code
Apprentice Harper [Wed, 14 Oct 2020 15:24:16 +0000 (16:24 +0100)]
Merge pull request #1296 from tartley/lint-fixes
Fix CI lint failures
Apprentice Harper [Wed, 14 Oct 2020 15:23:49 +0000 (16:23 +0100)]
More general changes, and get mobidedrm and kindlekey to work on Mac.
Petra Lamborn [Fri, 9 Oct 2020 09:25:01 +0000 (22:25 +1300)]
Update doc link for preferences code
This should really be properly explained, but at least it's not a dead link now!
Jonathan Hartley [Thu, 8 Oct 2020 19:37:04 +0000 (14:37 -0500)]
Remove unused fns in make_release.py
Apprentice Harper [Sun, 4 Oct 2020 19:36:12 +0000 (20:36 +0100)]
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.
Apprentice Harper [Sun, 4 Oct 2020 19:07:37 +0000 (20:07 +0100)]
Merge pull request #1275 from jpwhiting/python3fixes
Python3fixes
Apprentice Harper [Sun, 4 Oct 2020 19:04:32 +0000 (20:04 +0100)]
Merge pull request #1265 from heindevries/master
Some changes in obok.py to make it work on windows
Jeremy Whiting [Fri, 2 Oct 2020 06:19:49 +0000 (00:19 -0600)]
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.
Jeremy Whiting [Fri, 2 Oct 2020 06:17:47 +0000 (00:17 -0600)]
Fix launching help link from customization dialog.
To fix error with python3 when launching help link open files in binary
mode.
Jeremy Whiting [Fri, 2 Oct 2020 04:41:57 +0000 (22:41 -0600)]
Use open instead of file() to export keys to file.
Fixes export of Kindle keys in calibre 5.0.1 here.
HdV [Wed, 30 Sep 2020 14:56:14 +0000 (16:56 +0200)]
Merge branch 'master' of https://github.com/heindevries/DeDRM_tools
merging
HdV [Wed, 30 Sep 2020 12:25:32 +0000 (13:25 +0100)]
Changes to make obok work on win
_winreg renamed to winreg in python 3
os.popen3() replaced by subprocess.Popen()
Apprentice Harper [Wed, 30 Sep 2020 12:25:32 +0000 (13:25 +0100)]
Fix problem on Mac with byte arrays.
Apprentice Harper [Wed, 30 Sep 2020 10:45:50 +0000 (11:45 +0100)]
Merge pull request #1255 from cclauss/patch-2
GitHub Action test on both Python 2 and Python 3
Christian Clauss [Sun, 27 Sep 2020 23:03:30 +0000 (01:03 +0200)]
Update genbook.py
Christian Clauss [Sun, 27 Sep 2020 23:00:21 +0000 (01:00 +0200)]
Old style exceptions are syntax errors in Python 3
Switch to new style exceptions which work on both Python 2 and Python 3.
Christian Clauss [Sun, 27 Sep 2020 22:49:21 +0000 (00:49 +0200)]
print() is a function in Python since 1/1/2020
Christian Clauss [Sun, 27 Sep 2020 22:39:57 +0000 (00:39 +0200)]
Fix Python syntax error: add a comma
Discovered by flake8 running in our GitHub Action
Christian Clauss [Sun, 27 Sep 2020 22:36:25 +0000 (00:36 +0200)]
GitHub Action test on both Python 2 and Python 3
Apprentice Harper [Sun, 27 Sep 2020 10:54:49 +0000 (11:54 +0100)]
More generic 3.0 changes, to be tested.
Apprentice Harper [Sun, 27 Sep 2020 09:11:37 +0000 (10:11 +0100)]
Merge pull request #1248 from kubik147/adobekey
Make adobekey.py work in Python 3
kubik147 [Sat, 26 Sep 2020 22:57:53 +0000 (00:57 +0200)]
Remove the u string prefixes
kubik147 [Sat, 26 Sep 2020 22:46:32 +0000 (00:46 +0200)]
Make adobekey.py work in Python 3
Apprentice Harper [Sat, 26 Sep 2020 20:19:48 +0000 (21:19 +0100)]
Merge pull request #1170 from Dr-Willy/master
Fix path in make_release.py
Apprentice Harper [Sat, 26 Sep 2020 20:19:17 +0000 (21:19 +0100)]
Merge pull request #1241 from erikbrinkman/patch-1
Support ebook-convert
Apprentice Harper [Sat, 26 Sep 2020 20:22:47 +0000 (21:22 +0100)]
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
Erik Brinkman [Sun, 20 Sep 2020 20:43:23 +0000 (16:43 -0400)]
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".
Dr-Willy [Mon, 20 Jul 2020 09:07:20 +0000 (21:07 +1200)]
Fix path in make_release.py
Apprentice Harper [Thu, 18 Jun 2020 07:03:20 +0000 (08:03 +0100)]
Updates to FAQs and ReadMes
Apprentice Harper [Thu, 18 Jun 2020 06:42:41 +0000 (07:42 +0100)]
Update init file, update versions in files, update comments in files
Apprentice Harper [Wed, 17 Jun 2020 15:04:41 +0000 (16:04 +0100)]
Merge pull request #1095 from fondfire/patch-1
Create ignoblepdf.py
Apprentice Harper [Wed, 17 Jun 2020 14:57:27 +0000 (15:57 +0100)]
Merge pull request #1091 from vanicat/inetepub-python3
Inetepub python3
Apprentice Harper [Wed, 17 Jun 2020 14:56:37 +0000 (15:56 +0100)]
Merge pull request #1037 from apprenticesakuya/master
Finish .kinf2018 support and add KFX v2/v3 support
apprenticesakuya [Tue, 16 Jun 2020 01:19:15 +0000 (01:19 +0000)]
Support KFX VoucherEnvelope versions 2 and 3
apprenticesakuya [Thu, 11 Jun 2020 17:26:36 +0000 (17:26 +0000)]
Support .kinf2018 on Mac
fondfire [Sat, 16 May 2020 03:08:30 +0000 (22:08 -0500)]
Create ignoblepdf.py
New Python 2 program to decrypt Barnes & Noble encrypted PDF files.
Rémi Vanicat [Fri, 8 May 2020 15:57:28 +0000 (17:57 +0200)]
More handling of difference between python2 and python3
Place where python3 use bytes/int and python2 str/str
Rémi Vanicat [Fri, 8 May 2020 15:51:40 +0000 (17:51 +0200)]
decoding from base64 in a portable way
Rémi Vanicat [Fri, 8 May 2020 15:35:01 +0000 (17:35 +0200)]
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'
apprenticesakuya [Fri, 27 Mar 2020 20:01:09 +0000 (13:01 -0700)]
Finish .kinf2018 support
Apprentice Harper [Mon, 17 Feb 2020 12:07:35 +0000 (12:07 +0000)]
merge of translations
Apprentice Harper [Mon, 17 Feb 2020 12:06:23 +0000 (12:06 +0000)]
Merge branch 'master' of https://github.com/apprenticeharper/DeDRM_tools
Apprentice Harper [Sun, 16 Feb 2020 10:12:25 +0000 (10:12 +0000)]
Remove stand-alone apps. Only support the two plugins.
Apprentice Harper [Thu, 6 Feb 2020 12:01:44 +0000 (12:01 +0000)]
Merge pull request #989 from jony0008/master
New translation for obok plug-in: Swedish
Apprentice Harper [Thu, 6 Feb 2020 11:59:15 +0000 (11:59 +0000)]
Merge pull request #988 from ZolaLa9/Update-FAQs-for-Kindle-for-Mac-and-Catalina
Update FAQs.md for K4Mac and Catalina
Jony [Sun, 2 Feb 2020 08:20:52 +0000 (09:20 +0100)]
New translation: Swedish
I have finished the Swedish translation. Please merge it.
ZolaLa [Sat, 1 Feb 2020 05:22:56 +0000 (05:22 +0000)]
Update FAQs.md
Apprentice Harper [Thu, 30 Jan 2020 12:08:45 +0000 (12:08 +0000)]
Merge pull request #859 from HansChua/linux_handling
Allow users to specify Kobo directory and add 'ip' command for linux
Apprentice Harper [Thu, 30 Jan 2020 12:06:38 +0000 (12:06 +0000)]
Merge branch 'master' into linux_handling
Apprentice Harper [Thu, 30 Jan 2020 12:04:00 +0000 (12:04 +0000)]
Merge pull request #848 from sretlawd/kfx_dsn_fix
Allow decryption with DSN only.
Apprentice Harper [Thu, 30 Jan 2020 12:03:08 +0000 (12:03 +0000)]
Merge pull request #847 from aplaice/linux_documentation
Improve documentation for using Kindle for PC with Linux in Wine
Apprentice Harper [Thu, 30 Jan 2020 12:02:15 +0000 (12:02 +0000)]
Merge pull request #845 from aplaice/fix_default_winepath
Fix automatic import of decryption keys on Linux with wine
Apprentice Harper [Thu, 30 Jan 2020 12:00:02 +0000 (12:00 +0000)]
Merge pull request #850 from cclauss/modernize-Python-2-codes
Use print() function in both Python 2 and Python 3
Apprentice Harper [Thu, 30 Jan 2020 11:58:50 +0000 (11:58 +0000)]
Merge branch 'master' into modernize-Python-2-codes
Apprentice Harper [Thu, 30 Jan 2020 11:57:21 +0000 (11:57 +0000)]
Merge pull request #983 from cclauss/patch-1
GitHub Action: There is no requirements.txt
Christian Clauss [Thu, 23 Jan 2020 12:24:45 +0000 (13:24 +0100)]
Remove the unused rename_key() method
Apprentice Harper [Thu, 23 Jan 2020 12:11:24 +0000 (12:11 +0000)]
Merge pull request #863 from taroxd/patch-2
Fix typos - thanks.
Apprentice Harper [Thu, 23 Jan 2020 12:10:34 +0000 (12:10 +0000)]
Merge pull request #895 from adrw/patch-1
Update link - thanks.
Apprentice Harper [Thu, 23 Jan 2020 12:09:31 +0000 (12:09 +0000)]
Merge pull request #910 from corysolovewicz/patch-2
Update FAQs.md
Apprentice Harper [Thu, 23 Jan 2020 12:14:19 +0000 (12:14 +0000)]
Allow Kindle serial numbers to have spaces, allowing copy/paste from Amazon web site (thanks to jakemarsden)
Christian Clauss [Mon, 20 Jan 2020 14:23:19 +0000 (15:23 +0100)]
Focus only on legacy Python for now
Christian Clauss [Mon, 20 Jan 2020 14:17:06 +0000 (15:17 +0100)]
Undefined name: from ignoblekeygen import generate_key
Christian Clauss [Mon, 20 Jan 2020 14:11:14 +0000 (15:11 +0100)]
Undefined name: strip(uuidnum) --> uuidnum.strip()
Christian Clauss [Mon, 20 Jan 2020 13:58:03 +0000 (14:58 +0100)]
Undefined name: errlog = ''
Christian Clauss [Mon, 20 Jan 2020 13:55:42 +0000 (14:55 +0100)]
Undefined name: errlog = ''
Christian Clauss [Mon, 20 Jan 2020 13:47:04 +0000 (14:47 +0100)]
Undefined name: import zipfix
Christian Clauss [Mon, 20 Jan 2020 13:41:29 +0000 (14:41 +0100)]
Undefined name: Define RegError
Christian Clauss [Mon, 20 Jan 2020 13:34:56 +0000 (14:34 +0100)]
Undefined name: Error() --> ValueError()
Christian Clauss [Mon, 20 Jan 2020 13:33:16 +0000 (14:33 +0100)]
import erdr2pml, ineptpdf, k4mobidedrm
Christian Clauss [Mon, 20 Jan 2020 13:29:03 +0000 (14:29 +0100)]
Undefined name: from .convert2xml import encodeNumber
Christian Clauss [Mon, 20 Jan 2020 12:54:20 +0000 (13:54 +0100)]
Identity is not the same thing as equality in Python
Christian Clauss [Mon, 20 Jan 2020 12:52:54 +0000 (13:52 +0100)]
Undefined name: import traceback for line 70
Christian Clauss [Mon, 20 Jan 2020 12:49:02 +0000 (13:49 +0100)]
Undefined name: import traceback
Christian Clauss [Mon, 20 Jan 2020 12:46:20 +0000 (13:46 +0100)]
flake8 . --builtins=_,I
Christian Clauss [Mon, 20 Jan 2020 12:45:36 +0000 (13:45 +0100)]
Undefined name: from datetime import datetime
Christian Clauss [Mon, 20 Jan 2020 12:41:14 +0000 (13:41 +0100)]
flake8 . --builtins=_
Christian Clauss [Mon, 20 Jan 2020 12:39:27 +0000 (13:39 +0100)]
builtins=_
Christian Clauss [Mon, 20 Jan 2020 12:35:10 +0000 (13:35 +0100)]
GitHub Action: There is no requirements.txt
Apprentice Harper [Mon, 20 Jan 2020 12:32:28 +0000 (12:32 +0000)]
Merge pull request #957 from cclauss/patch-1
GitHub Actions: Lint and test our Python code
Apprentice Harper [Mon, 20 Jan 2020 12:28:26 +0000 (12:28 +0000)]
Merge pull request #965 from jakemarsden/patch-1
Fix very minor typo in contrib README
Apprentice Harper [Sun, 19 Jan 2020 14:48:20 +0000 (14:48 +0000)]
Merge pull request #971 from cgaspar/master
Update lzma import to include calibre >= 4.6.0
Carson Gaspar [Sat, 4 Jan 2020 13:20:16 +0000 (05:20 -0800)]
Update lzma import to include calibre >= 4.6.0
Jake Marsden [Sun, 29 Dec 2019 10:30:29 +0000 (23:30 +1300)]
Fix very minor typo in contrib README
Christian Clauss [Tue, 17 Dec 2019 07:51:25 +0000 (08:51 +0100)]
GitHub Actions: Lint and test our Python code